various miscellany related to versions, gtk2 build and packaging

6 files changed, 13 insertions, 23 deletions

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 0cd0f338fb..a9dc2ceff7 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -386,7 +386,7 @@ def build(bld):
                              'libgtk2_ardour',
                              'libgtkmm2ext',
                              'libtaglib']
-        obj.target = 'ardour-3.0-vst.exe.so'
+        obj.target = 'ardour-' + bld.env['VERSION'] + '-vst.exe.so'
         obj.includes  = [ '../libs/fst', '.' ]
         obj.linkflags = ['-mwindows', '-Wl,--export-dynamic']
         obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX']
@@ -403,7 +403,7 @@ def build(bld):
         # just the normal executable version of the GTK GUI
         obj = bld(features = 'cxx c cxxprogram')
         obj.source    = gtk2_ardour_sources
-        obj.target = 'ardour-3.0'
+        obj.target = 'ardour-' + bld.env['VERSION']
         obj.includes = ['.']
 
     # continue with setup of obj, which could be a shared library
@@ -476,8 +476,8 @@ def build(bld):
             'DATADIR'        : os.path.normpath(bld.env['DATADIR']),
             'SYSCONFDIR'     : os.path.normpath(bld.env['SYSCONFDIR']),
             'LIBS'           : 'build/libs',
-            'VERSION'        : '3.0',
-            'EXECUTABLE'     : 'build/gtk2_ardour/ardour-3.0'
+            'VERSION'        : bld.env['VERSION'],
+            'EXECUTABLE'     : 'build/gtk2_ardour/ardour-' + bld.env['VERSION']
     }
 
     def set_subst_dict(obj, dict):
diff --git a/tools/linux_packaging/define_versions.sh b/tools/define_versions.sh
index def50ec079..860414e0a6 100644
--- a/tools/linux_packaging/define_versions.sh
+++ b/tools/define_versions.sh
@@ -1,8 +1,8 @@
 # 
-# this is sourced by build and package, and executed from within build/linux_packaging
+# this is sourced by build and package, and executed from within build/{osx,linux}_packaging
 #
 
-release_version=`grep -m 1 '[^A-Za-z_]LINUX_VERSION = ' ../../wscript | awk '{print $3}' | sed "s/'//g"`
+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-//"`
 if echo $r | grep -q -e - ; then
     revcount=`echo $r | cut -d- -f1`
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 9f70f95eb2..26c509a1dc 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -89,7 +89,7 @@ if test x$STRIP != xall -a x$STRIP != xnone -a x$STRIP != xsome ; then
     exit 1
 fi
 
-. ./define_versions.sh
+. ../define_versions.sh
 
 echo "Version is $version / $commit"
 info_string="$version ($commit) built on `hostname` by `whoami` on `date`"
diff --git a/tools/linux_packaging/package b/tools/linux_packaging/package
index ea50ce4b98..259a2a22da 100755
--- a/tools/linux_packaging/package
+++ b/tools/linux_packaging/package
@@ -50,7 +50,7 @@ while [ $# -gt 0 ] ; do
 	esac
 done
 
-. ./define_versions.sh
+. ../define_versions.sh
 
 if [ x$DEBUG = xT ]; then
 	BUILDTYPE="dbg"
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index 66f3f791e7..5b3248e1c1 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -67,10 +67,9 @@ if test -z "$PRODUCT_PKG_DIR" -o -z "$APPNAME"; then
 	exit 1
 fi
 
-release_version=`grep -m 1 '[^A-Za-z_]OSX_VERSION = ' ../../wscript | cut -d"'" -f2`
-revision=`grep -m 1 'revision =' ../../libs/ardour/revision.cc | cut -d'"' -f 2 | sed 's/^.*-//g'`
+. ../define_versions.sh
 echo "Version is $release_version / $revision"
-info_string="$release_version/$revision built on `hostname` by `whoami` on `date`"
+info_string="$version built on `hostname` by `whoami` on `date`"
 echo "Info string is $info_string"
 
 # setup directory structure
@@ -502,8 +501,8 @@ echo "Building DMG ..."
 
 # UC_DMG=$APPNAME-${release_version}-${revision}-UC.dmg
 # FINAL_DMG=$APPNAME-${release_version}-${revision}.dmg
-UC_DMG=$APPNAME-${release_version}-${revision}.dmg
-VOLNAME=$APPNAME-$release_version
+UC_DMG=$APPNAME-$version.dmg
+VOLNAME=$APPNAME-$version
 
 # TODO use mktemp
 export TMPDIR=`pwd`
diff --git a/wscript b/wscript
index 302b8fe069..93f2912edb 100644
--- a/wscript
+++ b/wscript
@@ -7,16 +7,7 @@ import string
 import subprocess
 import sys
 
-#
-# build scripts need to find the right platform specific version
-# 
-
-if sys.platform == 'darwin':
-    OSX_VERSION = '3.0'
-    VERSION = '3.0beta6'
-else:
-    LINUX_VERSION = '3.1'
-    VERSION = '3.1'
+VERSION = '3.1'
 
 APPNAME = 'Ardour3'