From 9126dbb504a80e2fdff9619eb0f75696d3e0ee5a Mon Sep 17 00:00:00 2001 From: strange Date: Thu, 24 Dec 2009 14:55:59 -0800 Subject: [PATCH] Added automated system for determing aesalon version, based off of git tags. Basically, the most recent tag with the name of "version_X.Y.Z" will become aesalon version X.Y.Z. Now, back to the ptrace system. --- .gitignore | 1 + CMakeLists.txt | 4 +++- src/CMakeLists.txt | 2 -- src/version_info | 3 --- version_info.sh | 4 ++++ 5 files changed, 8 insertions(+), 6 deletions(-) delete mode 100644 src/version_info create mode 100755 version_info.sh diff --git a/.gitignore b/.gitignore index 7d0ed0a..a8f6f13 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ CMakeFiles CMakeCache.txt cmake_install.cmake Makefile +version_info # IDE (KDevelop 4) ignores *kdev* diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ccd4ce..daf60fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.4) +cmake_minimum_required(VERSION 2.6) if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) @@ -10,6 +10,8 @@ enable_language(C) project(aesalon) include(build.config) +execute_process(COMMAND ./version_info.sh) +include(version_info) add_subdirectory(src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f68df48..5e9a16b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,3 @@ -include(version_info) - add_definitions(-std=c++0x -W -Wall -ansi -pedantic -Wno-unused-parameter -Wno-long-long -g -pthread) add_definitions(-DAESALON_MAJOR_VERSION=${AESALON_MAJOR_VERSION} -DAESALON_MINOR_VERSION=${AESALON_MINOR_VERSION} -DAESALON_PATCHLEVEL=${AESALON_PATCHLEVEL} -DAESALON_PLATFORM=${AESALON_PLATFORM}) add_definitions(-DAESALON_PLATFORM_x86=0 -DAESALON_PLATFORM_x86_64=1) diff --git a/src/version_info b/src/version_info deleted file mode 100644 index 0c8f96c..0000000 --- a/src/version_info +++ /dev/null @@ -1,3 +0,0 @@ -set(AESALON_MAJOR_VERSION 0) -set(AESALON_MINOR_VERSION 1) -set(AESALON_PATCHLEVEL 0) diff --git a/version_info.sh b/version_info.sh new file mode 100755 index 0000000..91322c8 --- /dev/null +++ b/version_info.sh @@ -0,0 +1,4 @@ +#!/bin/sh +echo "# Automatically generated on " $(date) > version_info +git tag -l 'version_*'|sort -r | head -n 1 | awk -F '_' '{print $2}' | awk -F '.' '{ print "set(AESALON_MAJOR_VERSION " $1 ")\nset(AESALON_MINOR_VERSION " $2 ")\nset(AESALON_PATCHLEVEL " $3 ")" }' >> version_info + -- 2.11.4.GIT