[build/osx] Get bundle version number from avidemuxVersion.cmake dire…

…ctly
szlldm · Apr 24, 2017 · 43adb26 · 43adb26
1 parent 38fe566
commit 43adb26
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/bootStrapOsx_Sierra.bash b/bootStrapOsx_Sierra.bash
@@ -3,7 +3,8 @@
 # (c) Mean 2009
 export MYQT=/usr/local/Cellar/qt5/5.6.1-1/
 export PATH=$PATH:$MYQT/bin/:/usr/local/bin:/opt//local/libexec/qt5/bin/ # Both brew and macport
-export API_VERSION=2.7
+export MINOR=`cat cmake/avidemuxVersion.cmake | grep "VERSION_MINOR " | sed 's/..$//g' | sed 's/^.*"//g'`
+export API_VERSION=2.$MINOR
 # Specify the the directory where you want to install avidemux (a.k.a. the cmake_install_prefix)
 # like export BASE_INSTALL_DIR="<full_path_to_installation>". This can be /usr/local or /opt/local (macports) or /sw (Fink)
 export DAT=`date +"%Y_%m_%d"`

diff --git a/cmake/osx_libs_copyLibsSierra.py b/cmake/osx_libs_copyLibsSierra.py
@@ -4,9 +4,10 @@
 import re
 import subprocess
 import os
-home=os.getenv("HOME")
-print "Preparing independant bundle, home="+home+"..."
-rootFolder=home+"/Avidemux2.7.app/Contents/Resources" # FIXME
+home=os.getenv['HOME']
+api_version=os.getenv("API_VERSION")
+print "Preparing independant bundle, home="+home+"..., version ) "+str(api_version)
+rootFolder=home+"/Avidemux"+str(api_version)+".app/Contents/Resources" 
 libFolder=rootFolder+"/lib"
 binFolder=rootFolder+"/bin"
 frameWorkFolder=rootFolder+"/../Frameworks"

diff --git a/cmake/osx_libs_remap.py b/cmake/osx_libs_remap.py
@@ -5,8 +5,9 @@
 import subprocess
 import os
 home=os.getenv("HOME")
-print "Preparing independant bundle, home="+home+"..."
-rootFolder=home+"/Avidemux2.7.app/Contents/Resources"
+api_version=os.getenv("API_VERSION")
+print "Preparing independant bundle, home="+home+"..., version ) "+str(api_version)
+rootFolder=home+"/Avidemux"+str(api_version)+".app/Contents/Resources"
 libFolder=rootFolder+"/lib"
 binFolder=rootFolder+"/bin"
 frameWorkFolder=rootFolder+"/../Frameworks"