adjust the way version and revision info are gathered, defined and used

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index c25338a343f4c4a20aa073628f07992c0d27bf75..bba65c8c0afd27b1c72bfbbed74675f9638c7aa4 100644 (file)
--- 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 860414e0a6233af2b066afdefa7662d57b565202..6f5c17773cbdcaec32c404e89b054fcedd11fd89 100644 (file)
--- 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