diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-06-11 10:58:24 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-06-11 10:58:24 -0400 |
| commit | ef6366a7cd56157c6468a6c0d87a3e37f6d7c7af (patch) | |
| tree | abae5a9ea4bae4c9f4100c8b21a1faa432ce9e55 | |
| parent | 61e302c6bb9b5a92a2fe6b4f953022e95e794f72 (diff) | |
adjust the way version and revision info are gathered, defined and used
| -rw-r--r-- | gtk2_ardour/wscript | 10 | ||||
| -rw-r--r-- | tools/define_versions.sh | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index c25338a343..bba65c8c0a 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -10,13 +10,10 @@ from waflib.Task import Task # Version of this package (even if built as a child) MAJOR = '3' -MINOR = '0' -MICRO = '0' -GTK2_ARDOUR_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO) +MINOR = '2' # Variables for 'waf dist' -APPNAME = 'gtk2_ardour3' -VERSION = GTK2_ARDOUR_VERSION +VERSION = "%s.%s" % (MAJOR, MINOR) I18N_PACKAGE = 'gtk2_ardour3' # Mandatory variables @@ -265,10 +262,11 @@ def options(opt): def configure(conf): conf.load('misc') conf.load('compiler_cxx') + # we don't use hard-coded micro versions with ardour, so hard code it to zero autowaf.build_version_files( path_prefix + 'version.h', path_prefix + 'version.cc', - 'gtk2_ardour', MAJOR, MINOR, MICRO) + 'gtk2_ardour', MAJOR, MINOR, 0) autowaf.configure(conf) if re.search ("linux", sys.platform) != None: diff --git a/tools/define_versions.sh b/tools/define_versions.sh index 860414e0a6..6f5c17773c 100644 --- a/tools/define_versions.sh +++ b/tools/define_versions.sh @@ -2,8 +2,10 @@ # this is sourced by build and package, and executed from within build/{osx,linux}_packaging # -release_version=`grep -m 1 '^VERSION = ' ../../wscript | awk '{print $3}' | sed "s/'//g"` -r=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed -e 1d -e "s/$release_version-//"` +major_version=`grep -m 1 '^MAJOR = ' ../../wscript | awk '{print $3}' | sed "s/'//g"` +minor_version=`grep -m 1 '^MINOR = ' ../../wscript | awk '{print $3}' | sed "s/'//g"` +release_version=${major_version}.${minor_version} +r=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed -e 1d -e "s/[0-9][0-9]*\.[0-9][0-9]*-//"` if echo $r | grep -q -e - ; then revcount=`echo $r | cut -d- -f1` fi |