diff options
| author | Julien de Kozak <jdekozak@hotmail.com> | 2013-03-17 14:53:30 +0100 |
|---|---|---|
| committer | Julien de Kozak <jdekozak@hotmail.com> | 2013-03-18 20:13:05 +0100 |
| commit | eb7a85b8f992d0e2783c40c4809d81b17e80436c (patch) | |
| tree | a461828941636a1e7e09202ab1a40065ca6f93c8 /tools/osx_packaging | |
| parent | 62f1ed054b655bb45b82afa2ea6a7787a988b4f9 (diff) | |
Set the revision mechanism independent from the VCS name
Diffstat (limited to 'tools/osx_packaging')
| -rwxr-xr-x | tools/osx_packaging/osx_build | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index b90ce1b334..bd504a5579 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -64,9 +64,9 @@ done #release_version=`grep -m 1 '[^A-Za-z_]OSX_VERSION = ' ../../wscript | cut -d' ' -f 3 | sed "s/'//g"` release_version=3.0 -svn_version=`grep -m 1 'svn_revision =' ../../libs/ardour/svn_revision.cc | cut -d' ' -f 8 | sed 's/[^0-9]//g'` -echo "Version is $release_version / $svn_version" -info_string="$release_version/$svn_version built on `hostname` by `whoami` on `date`" +revision=`grep -m 1 'revision =' ../../libs/ardour/revision.cc | cut -d' ' -f 8 | sed 's/[^0-9]//g'` +echo "Version is $release_version / $revision" +info_string="$release_version/$revision built on `hostname` by `whoami` on `date`" echo "Info string is $info_string" # setup directory structure @@ -166,12 +166,12 @@ env="<key>LSEnvironment</key><dict>$env<key>ARDOUR_BUNDLED</key><string>true</st # edit plist sed -e "s?@ENV@?$env?g" \ - -e "s?@VERSION@?$release_version/$svn_version?g" \ + -e "s?@VERSION@?$release_version/$revision?g" \ -e "s?@INFOSTRING@?$info_string?g" < Info.plist.in > Info.plist # and plist strings sed -e "s?@APPNAME@?$appname?" \ -e "s?@ENV@?$env?g" \ - -e "s?@VERSION@?$release_version/$svn_version?g" \ + -e "s?@VERSION@?$release_version/$revision?g" \ -e "s?@INFOSTRING@?$info_string?g" < InfoPlist.strings.in > Resources/InfoPlist.strings || exit 1 # copy static files @@ -497,9 +497,9 @@ fi echo "Building DMG ..." -# UC_DMG=$APPNAME-${release_version}-${svn_version}-UC.dmg -# FINAL_DMG=$APPNAME-${release_version}-${svn_version}.dmg -UC_DMG=$APPNAME-${release_version}-${svn_version}.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 # TODO use mktemp |