various miscellany related to versions, gtk2 build and packaging
This commit is contained in:
parent
4cd27e4733
commit
cadfc2aee1
|
@ -386,7 +386,7 @@ def build(bld):
|
||||||
'libgtk2_ardour',
|
'libgtk2_ardour',
|
||||||
'libgtkmm2ext',
|
'libgtkmm2ext',
|
||||||
'libtaglib']
|
'libtaglib']
|
||||||
obj.target = 'ardour-3.0-vst.exe.so'
|
obj.target = 'ardour-' + bld.env['VERSION'] + '-vst.exe.so'
|
||||||
obj.includes = [ '../libs/fst', '.' ]
|
obj.includes = [ '../libs/fst', '.' ]
|
||||||
obj.linkflags = ['-mwindows', '-Wl,--export-dynamic']
|
obj.linkflags = ['-mwindows', '-Wl,--export-dynamic']
|
||||||
obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX']
|
obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX']
|
||||||
|
@ -403,7 +403,7 @@ def build(bld):
|
||||||
# just the normal executable version of the GTK GUI
|
# just the normal executable version of the GTK GUI
|
||||||
obj = bld(features = 'cxx c cxxprogram')
|
obj = bld(features = 'cxx c cxxprogram')
|
||||||
obj.source = gtk2_ardour_sources
|
obj.source = gtk2_ardour_sources
|
||||||
obj.target = 'ardour-3.0'
|
obj.target = 'ardour-' + bld.env['VERSION']
|
||||||
obj.includes = ['.']
|
obj.includes = ['.']
|
||||||
|
|
||||||
# continue with setup of obj, which could be a shared library
|
# 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']),
|
'DATADIR' : os.path.normpath(bld.env['DATADIR']),
|
||||||
'SYSCONFDIR' : os.path.normpath(bld.env['SYSCONFDIR']),
|
'SYSCONFDIR' : os.path.normpath(bld.env['SYSCONFDIR']),
|
||||||
'LIBS' : 'build/libs',
|
'LIBS' : 'build/libs',
|
||||||
'VERSION' : '3.0',
|
'VERSION' : bld.env['VERSION'],
|
||||||
'EXECUTABLE' : 'build/gtk2_ardour/ardour-3.0'
|
'EXECUTABLE' : 'build/gtk2_ardour/ardour-' + bld.env['VERSION']
|
||||||
}
|
}
|
||||||
|
|
||||||
def set_subst_dict(obj, dict):
|
def set_subst_dict(obj, dict):
|
||||||
|
|
|
@ -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-//"`
|
r=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed -e 1d -e "s/$release_version-//"`
|
||||||
if echo $r | grep -q -e - ; then
|
if echo $r | grep -q -e - ; then
|
||||||
revcount=`echo $r | cut -d- -f1`
|
revcount=`echo $r | cut -d- -f1`
|
|
@ -89,7 +89,7 @@ if test x$STRIP != xall -a x$STRIP != xnone -a x$STRIP != xsome ; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
. ./define_versions.sh
|
. ../define_versions.sh
|
||||||
|
|
||||||
echo "Version is $version / $commit"
|
echo "Version is $version / $commit"
|
||||||
info_string="$version ($commit) built on `hostname` by `whoami` on `date`"
|
info_string="$version ($commit) built on `hostname` by `whoami` on `date`"
|
||||||
|
|
|
@ -50,7 +50,7 @@ while [ $# -gt 0 ] ; do
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
. ./define_versions.sh
|
. ../define_versions.sh
|
||||||
|
|
||||||
if [ x$DEBUG = xT ]; then
|
if [ x$DEBUG = xT ]; then
|
||||||
BUILDTYPE="dbg"
|
BUILDTYPE="dbg"
|
||||||
|
|
|
@ -67,10 +67,9 @@ if test -z "$PRODUCT_PKG_DIR" -o -z "$APPNAME"; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
release_version=`grep -m 1 '[^A-Za-z_]OSX_VERSION = ' ../../wscript | cut -d"'" -f2`
|
. ../define_versions.sh
|
||||||
revision=`grep -m 1 'revision =' ../../libs/ardour/revision.cc | cut -d'"' -f 2 | sed 's/^.*-//g'`
|
|
||||||
echo "Version is $release_version / $revision"
|
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"
|
echo "Info string is $info_string"
|
||||||
|
|
||||||
# setup directory structure
|
# setup directory structure
|
||||||
|
@ -502,8 +501,8 @@ echo "Building DMG ..."
|
||||||
|
|
||||||
# UC_DMG=$APPNAME-${release_version}-${revision}-UC.dmg
|
# UC_DMG=$APPNAME-${release_version}-${revision}-UC.dmg
|
||||||
# FINAL_DMG=$APPNAME-${release_version}-${revision}.dmg
|
# FINAL_DMG=$APPNAME-${release_version}-${revision}.dmg
|
||||||
UC_DMG=$APPNAME-${release_version}-${revision}.dmg
|
UC_DMG=$APPNAME-$version.dmg
|
||||||
VOLNAME=$APPNAME-$release_version
|
VOLNAME=$APPNAME-$version
|
||||||
|
|
||||||
# TODO use mktemp
|
# TODO use mktemp
|
||||||
export TMPDIR=`pwd`
|
export TMPDIR=`pwd`
|
||||||
|
|
11
wscript
11
wscript
|
@ -7,16 +7,7 @@ import string
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
#
|
VERSION = '3.1'
|
||||||
# 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'
|
|
||||||
|
|
||||||
APPNAME = 'Ardour3'
|
APPNAME = 'Ardour3'
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user