various miscellany related to versions, gtk2 build and packaging

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 0cd0f338fb3d861ba1614421ff9b4e665213fb49..a9dc2ceff720fbbe1718ecfadb3b4cd5d40f46ed 100644 (file)
--- 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/define_versions.sh b/tools/define_versions.sh
new file mode 100644 (file)
index 0000000..860414e
--- /dev/null
+++ b/tools/define_versions.sh
@@ -0,0 +1,23 @@
+# 
+# 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-//"`
+if echo $r | grep -q -e - ; then
+    revcount=`echo $r | cut -d- -f1`
+fi
+commit=`echo $r | cut -d- -f2`
+version=${release_version}${revcount:+.$revcount}
+
+#
+# Figure out the Build Type
+#
+# Note that the name of the cache file may vary from to time
+#
+
+if grep -q "DEBUG = True" ../../build/c4che/_cache.py; then
+       DEBUG="T"
+else
+       DEBUG="F"
+fi

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 9f70f95eb227db40f2e3e3baa74ba7739e6a80a7..26c509a1dc7395a8dd1e05c9a43bd2078d040a21 100755 (executable)
--- 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/define_versions.sh b/tools/linux_packaging/define_versions.sh
deleted file mode 100644 (file)
index def50ec..0000000
--- a/tools/linux_packaging/define_versions.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-# 
-# this is sourced by build and package, and executed from within build/linux_packaging
-#
-
-release_version=`grep -m 1 '[^A-Za-z_]LINUX_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`
-fi
-commit=`echo $r | cut -d- -f2`
-version=${release_version}${revcount:+.$revcount}
-
-#
-# Figure out the Build Type
-#
-# Note that the name of the cache file may vary from to time
-#
-
-if grep -q "DEBUG = True" ../../build/c4che/_cache.py; then
-       DEBUG="T"
-else
-       DEBUG="F"
-fi

diff --git a/tools/linux_packaging/package b/tools/linux_packaging/package
index ea50ce4b981d6b6c76fa052387801117aa8aa599..259a2a22daf622de08c2dc7585daf94fc320eb79 100755 (executable)
--- 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 66f3f791e784a62e9e033fa1d9ff9c8cd407fcab..5b3248e1c1848295722c6723683e4fa5fcf2095d 100755 (executable)
--- 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 302b8fe0699e461d8960b1f8faf0d81e01d0b6bc..93f2912edb9beaae81f23bb62f8777b421faae62 100644 (file)
--- 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'