X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=tools%2Fosx_packaging%2Fosx_build;h=54dac91f996989312c78d824133d7841743641be;hb=455d4683f658c8b85e8a6f09f87a2e977d72cb4a;hp=a18cc71f5f3e34bde2164ea6e4d209106fe30f70;hpb=674e7271213e629327c3c3064dad11e5311336f9;p=ardour.git
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index a18cc71f5f..54dac91f99 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -16,6 +16,7 @@ mkdir -p "$CACHEDIR"
SAE=
MIXBUS=
+MIXBUS32C=
WITH_HARVID=1
WITH_HARRISON_LV2=
WITH_X42_LV2=
@@ -24,6 +25,10 @@ STRIP=1
PRINT_SYSDEPS=
WITH_NLS=
+: ${HARRISONCHANNELSTRIP=harrison_channelstrip}
+
+. ../define_versions.sh
+
while [ $# -gt 0 ] ; do
echo "arg = $1"
case $1 in
@@ -32,35 +37,46 @@ while [ $# -gt 0 ] ; do
# top level build targets
#
- --sae) WITH_NLS= ;
- SAE=1 ;
- WITH_LADSPA=1;
- STRIP= ;
- PRODUCT_PKG_DIR=ArdourSAE ;
- APPNAME=Ardour ;
- shift ;;
- --mixbus) MIXBUS=1;
- WITH_HARRISON_LV2=1 ;
- WITH_X42_LV2=1 ;
- WITH_NLS=1 ;
- SAE= ;
- WITH_LADSPA=;
- STRIP= ;
- PRODUCT_PKG_DIR=Mixbus;
- APPNAME=Mixbus ;
- shift ;;
- --public) WITH_NLS= ;
- SAE= ;
- WITH_LADSPA=1;
- PRODUCT_PKG_DIR=Ardour;
- APPNAME=Ardour ;
- shift ;;
- --allinone) SAE= ;
- WITH_NLS= ;
- WITH_LADSPA=1;
- STRIP= ;
- PRODUCT_PKG_DIR=Ardour ;
- shift ;;
+ --sae)
+ SAE=1 ;
+ WITH_LADSPA=1;
+ STRIP= ;
+ PRODUCT_PKG_DIR=ArdourSAE ;
+ APPNAME=Ardour ;
+ shift ;;
+ --mixbus) MIXBUS=1;
+ WITH_HARRISON_LV2=1 ;
+ WITH_X42_LV2=1 ;
+ WITH_NLS=1 ;
+ SAE= ;
+ WITH_LADSPA=;
+ STRIP= ;
+ PRODUCT_PKG_DIR=Mixbus;
+ APPNAME=Mixbus ;
+ shift ;;
+ --mixbus32c) MIXBUS=1;
+ MIXBUS32C=1;
+ WITH_HARRISON_LV2=1 ;
+ WITH_X42_LV2=1 ;
+ WITH_NLS=1 ;
+ SAE= ;
+ WITH_LADSPA=;
+ STRIP= ;
+ PRODUCT_PKG_DIR=Mixbus32C;
+ APPNAME=Mixbus32C-${major_version} ;
+ major_version=""
+ shift ;;
+ --public)
+ SAE= ;
+ WITH_LADSPA=1;
+ PRODUCT_PKG_DIR=Ardour;
+ APPNAME=Ardour ;
+ shift ;;
+ --allinone) SAE= ;
+ WITH_LADSPA=1;
+ STRIP= ;
+ PRODUCT_PKG_DIR=Ardour ;
+ shift ;;
--test) SAE= ; WITH_LADSPA=; STRIP= ; shift ;;
#
@@ -72,6 +88,7 @@ while [ $# -gt 0 ] ; do
--nostrip) STRIP= ; shift ;;
--sysdeps) PRINT_SYSDEPS=1; shift ;;
--nls) WITH_NLS=1 ; shift ;;
+ --chanstrip) HARRISONCHANNELSTRIP=$2 ; shift; shift ;;
esac
done
@@ -80,7 +97,6 @@ if test -z "$PRODUCT_PKG_DIR" -o -z "$APPNAME"; then
exit 1
fi
-. ../define_versions.sh
echo "Version is $release_version"
if [ "x$commit" != "x" ] ; then
info_string="$release_version ($commit) built on `hostname` by `whoami` on `date`"
@@ -125,6 +141,7 @@ MidiMaps=$Shared/midi_maps
ExportFormats=$Shared/export
Templates=$Shared/templates
PatchFiles=$Shared/patchfiles
+LuaScripts=$Shared/scripts
MackieControl=$Shared/mcp
if [ x$PRINT_SYSDEPS != x ] ; then
@@ -162,6 +179,7 @@ mkdir -p $Frameworks/modules
mkdir -p $Etc
mkdir -p $MackieControl
mkdir -p $PatchFiles
+mkdir -p $LuaScripts
# maybe set variables
env=""
@@ -175,7 +193,7 @@ if test x$SAE != x ; then
env="$envARDOUR_KEYBOARD_LAYOUTde-nokeypad"
env="$envARDOUR_UI_CONFardour3_ui_sae.conf"
elif test x$MIXBUS != x ; then
- appname="Mixbus"
+ appname=$APPNAME
EXECUTABLE=${appname}${major_version}
env="$envARDOUR_MIXBUStrue"
#
@@ -204,6 +222,7 @@ sed -e "s?@ENV@?$env?g" \
-e "s?@VERSION@?$release_version?g" \
-e "s?@INFOSTRING@?$info_string?g" \
-e "s?@IDSUFFIX@?$EXECUTABLE?g" \
+ -e "s?@BUNDLENAME@?${APPNAME}${major_version}?g" \
-e "s?@EXECUTABLE@?$EXECUTABLE?g" < Info.plist.in > Info.plist
# and plist strings
sed -e "s?@APPNAME@?$appname?" \
@@ -236,6 +255,8 @@ cp $BUILD_ROOT/gtk2_ardour/ardour-$release_version $APPROOT/MacOS/$MAIN_EXECUTAB
if test x$SAE != x ; then
# cp $BUILD_ROOT/gtk2_ardour/evtest $APPROOT/MacOS/gtkevents
cp Ardour3-SAE.icns $Resources/appIcon.icns
+elif test x$MIXBUS32C != x ; then
+ cp Mixbus32C.icns $Resources/appIcon.icns
elif test x$MIXBUS != x ; then
cp Mixbus.icns $Resources/appIcon.icns
else
@@ -373,6 +394,12 @@ for x in $BUILD_ROOT/../patchfiles/*.midnam ; do
cp "$x" $PatchFiles
done
+# Lua Script Files
+# got to be careful with names here
+for x in $BUILD_ROOT/../scripts/*.lua ; do
+ cp "$x" $LuaScripts
+done
+
# MackieControl data
# got to be careful with names here
for x in $BUILD_ROOT/../mcp/*.device $BUILD_ROOT/../mcp/*.profile ; do
@@ -403,6 +430,12 @@ if test -f $BUILD_ROOT/libs/vfork/ardour-exec-wrapper ; then
cp $BUILD_ROOT/libs/vfork/ardour-exec-wrapper $Frameworks/
fi
+# TODO check if this is still needed, even when building on 10.5
+if file $BUILD_ROOT/gtk2_ardour/ardour-$release_version | grep -q ppc; then
+STDCPP='|libstdc\+\+'
+else
+STDCPP=
+fi
while [ true ] ; do
missing=false
@@ -419,7 +452,7 @@ while [ true ] ; do
strip -u -r -arch all $file &>/dev/null
fi
- deps=`otool -L $file | awk '{print $1}' | egrep "($GTKSTACK_ROOT|$ARDOURSTACK_ROOT|/opt/|/local/|libs/|libstdc\+\+)" | grep -v 'libjack\.' | grep -v "$(basename $file)"`
+ deps=`otool -L $file | awk '{print $1}' | egrep "($GTKSTACK_ROOT|$ARDOURSTACK_ROOT|/opt/|/local/|libs/$STDCPP)" | grep -v 'libjack\.' | grep -v "$(basename $file)"`
# echo -n "."
for dep in $deps ; do
base=`basename $dep`
@@ -442,25 +475,22 @@ echo
echo "Copying other stuff to $APPDIR ..."
-#cp $BUILD_ROOT/gtk2_ardour/ergonomic-us.bindings $Resources
-
-cp $BUILD_ROOT/gtk2_ardour/mnemonic-us.bindings $Resources
+cp $BUILD_ROOT/gtk2_ardour/ardour.keys $Resources
cp $BUILD_ROOT/gtk2_ardour/ardour.menus $Resources
cp $BUILD_ROOT/gtk2_ardour/default_ui_config $Resources
cp $BUILD_ROOT/gtk2_ardour/clearlooks.rc $Resources
# Copied directly from source tree
+mkdir ${Resources}/icons
+mkdir ${Resources}/resources
cp ../../system_config $Resources/system_config
cp ../../instant.xml $Resources/instant.xml
-cp ../../gtk2_ardour/step_editing.bindings $Resources
-cp ../../gtk2_ardour/mixer.bindings $Resources
-cp -r ../../gtk2_ardour/icons $Resources
-cp -r ../../gtk2_ardour/pixmaps $Resources
-cp ../../gtk2_ardour/dark.colors $Resources
-cp -R ../../gtk2_ardour/splash.png $Shared
-cp -R ../../gtk2_ardour/small-splash.png $Shared
-cp -R ../../gtk2_ardour/ArdourMono.ttf $Shared
+cp ../../gtk2_ardour/icons/*.png ${Resources}/icons/
+cp -r ../../gtk2_ardour/icons/cursor_* ${Resources}/icons/
+cp ../../gtk2_ardour/*.colors $Resources
+cp ../../gtk2_ardour/ArdourMono.ttf $Shared
+cp ../../gtk2_ardour/resources/${PRODUCT_PKG_DIR}-* ${Resources}/resources/
# go through and recursively remove any .svn dirs in the bundle
for svndir in `find $APPDIR -name .svn -type dir`; do
@@ -488,7 +518,7 @@ fi
for exe in $executables; do
EXE=$APPROOT/MacOS/$exe
changes=""
- for lib in `otool -L $EXE | egrep "($GTKSTACK_ROOT|$ARDOURSTACK_ROOT|/opt/|/local/|libs/)" | awk '{print $1}' | grep -v 'libjack\.'` ; do
+ for lib in `otool -L $EXE | egrep "($GTKSTACK_ROOT|$ARDOURSTACK_ROOT|/opt/|/local/|libs/$STDCPP)" | awk '{print $1}' | grep -v 'libjack\.'` ; do
base=`basename $lib`
changes="$changes -change $lib @executable_path/../lib/$base"
done
@@ -514,7 +544,7 @@ for libdir in $Frameworks $Frameworks/modules $Surfaces $Panners $Backends ; do
# change all the dependencies
changes=""
- for lib in `otool -L $dylib | egrep "($GTKSTACK_ROOT|$ARDOURSTACK_ROOT|/opt/|/local/|libs/)" | awk '{print $1}' | grep -v 'libjack\.'` ; do
+ for lib in `otool -L $dylib | egrep "($GTKSTACK_ROOT|$ARDOURSTACK_ROOT|/opt/|/local/|libs/$STDCPP)" | awk '{print $1}' | grep -v 'libjack\.'` ; do
base=`basename $lib`
if echo $lib | grep -s libbase; then
changes="$changes -change $lib @executable_path/../$libbase/$base"
@@ -572,20 +602,26 @@ else
fi
+if file ${PRODUCT_PKG_DIR}/$APPROOT/MacOS/$MAIN_EXECUTABLE | grep -q x86_64; then
+ OSX_ARCH=x86_64
+ OSX_BENSID=osx64
+elif file ${PRODUCT_PKG_DIR}/$APPROOT/MacOS/$MAIN_EXECUTABLE | grep -q ppc; then
+ OSX_ARCH=ppc
+ OSX_BENSID=osxppc
+else
+ OSX_ARCH=i386
+ OSX_BENSID=osx32
+fi
+
if test x$WITH_HARRISON_LV2 != x ; then
- if file ${PRODUCT_PKG_DIR}/$APPROOT/MacOS/$MAIN_EXECUTABLE | grep -q x86_64; then
- OSX_ARCH=osx64
- else
- OSX_ARCH=osx32
- fi
curl -s -S --fail -# \
- -z "${CACHEDIR}/harrison_lv2s.${OSX_ARCH}.zip" \
- -o "${CACHEDIR}/harrison_lv2s.${OSX_ARCH}.zip" \
- http://www.harrisonconsoles.com/mixbus/mb3/${OSX_ARCH}/harrison_lv2s.zip
+ -z "${CACHEDIR}/harrison_lv2s.${OSX_BENSID}.zip" \
+ -o "${CACHEDIR}/harrison_lv2s.${OSX_BENSID}.zip" \
+ "http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp/harrison_lv2s.${OSX_BENSID}.zip"
mkdir -p "${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2"
bsdtar -C "${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2/" -xf \
- "${CACHEDIR}/harrison_lv2s.${OSX_ARCH}.zip"
+ "${CACHEDIR}/harrison_lv2s.${OSX_BENSID}.zip"
fi
if test x$WITH_HARVID != x ; then
@@ -611,6 +647,14 @@ if test x$WITH_HARVID != x ; then
cp -r "${JADEO}/Jadeo.app" "$PRODUCT_PKG_DIR/"
hdiutil detach "${JADEO}"
+ XJCONTENT=${PRODUCT_PKG_DIR}/Jadeo.app/Contents
+ HVLIBS=${PRODUCT_PKG_DIR}/$APPROOT/lib/harvid
+
+ for file in ${XJCONTENT}/MacOS/Jadeo-bin ${XJCONTENT}/Frameworks/*.dylib ${HVLIBS}/*.dylib ${PRODUCT_PKG_DIR}/$APPROOT/MacOS/*harvid* ; do
+ lipo -extract_family ${OSX_ARCH} ${file} -output ${file}.thin && \
+ mv ${file}.thin ${file}
+ done
+
DMGWINBOTTOM=580
YPOS=$[ $DMGWINBOTTOM - 300 ]
XJADEOPOS="set position of item \"Jadeo.app\" of container window to {310, ${YPOS}}"
@@ -622,12 +666,6 @@ fi
### Mixbus plugins, etc
if test x$WITH_X42_LV2 != x ; then
echo "bundling x42 plugins"
- if file ${PRODUCT_PKG_DIR}/$APPROOT/MacOS/$MAIN_EXECUTABLE | grep -q x86_64; then
- OSX_ARCH=x86_64
- else
- OSX_ARCH=i386
- fi
-
mkdir -p "${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2"
METERS_VERSION=$(curl -s -S http://x42-plugins.com/x42/osx/x42-meters.latest.txt)
@@ -637,6 +675,13 @@ if test x$WITH_X42_LV2 != x ; then
bsdtar -C "${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2/" -xf \
"$CACHEDIR/x42-meters-lv2-osx-${METERS_VERSION}.zip"
+ EQ_VERSION=$(curl -s -S http://x42-plugins.com/x42/osx/x42-eq.latest.txt)
+ rsync -a -q --partial \
+ rsync://x42-plugins.com/x42/osx/x42-eq-lv2-osx-${EQ_VERSION}.zip \
+ "$CACHEDIR/x42-eq-lv2-osx-${EQ_VERSION}.zip"
+ bsdtar -C "${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2/" -xf \
+ "$CACHEDIR/x42-eq-lv2-osx-${EQ_VERSION}.zip"
+
SETBFREE_VERSION=$(curl -s -S http://x42-plugins.com/x42/osx/setBfree.latest.txt)
rsync -a -q --partial \
rsync://x42-plugins.com/x42/osx/setBfree-lv2-osx-${SETBFREE_VERSION}.zip \
@@ -652,29 +697,33 @@ if test x$WITH_X42_LV2 != x ; then
"$CACHEDIR/x42-midifilter-lv2-osx-${MIDIFILTER_VERSION}.zip"
for file in ${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2/*/*.dylib ; do
- lipo -thin ${OSX_ARCH} ${file} -output ${file}.thin
+ lipo -extract_family ${OSX_ARCH} ${file} -output ${file}.thin
mv ${file}.thin ${file}
done
fi
if test -n "$MIXBUS"; then
- if file ${PRODUCT_PKG_DIR}/$APPROOT/MacOS/$MAIN_EXECUTABLE | grep -q x86_64; then
- OSX_ARCH=osx64
- else
- OSX_ARCH=osx32
- fi
-
- echo "deploying harrison tools for $OSX_ARCH"
+ echo "deploying harrison channelstrip for $OSX_BENSID"
mkdir -p "${PRODUCT_PKG_DIR}/${APPROOT}/lib/ladspa/strip"
curl -s -S --fail -# \
- -z "${CACHEDIR}/harrison_channelstrip.${OSX_ARCH}.so" \
- -o "${CACHEDIR}/harrison_channelstrip.${OSX_ARCH}.so" \
- http://www.harrisonconsoles.com/mixbus/mb3/${OSX_ARCH}/harrison_channelstrip.so
+ -z "${CACHEDIR}/${HARRISONCHANNELSTRIP}.${OSX_BENSID}.so" \
+ -o "${CACHEDIR}/${HARRISONCHANNELSTRIP}.${OSX_BENSID}.so" \
+ "http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp/${HARRISONCHANNELSTRIP}.${OSX_BENSID}.so"
+
+ cp "${CACHEDIR}/${HARRISONCHANNELSTRIP}.${OSX_BENSID}.so" \
+ "${PRODUCT_PKG_DIR}/${APPROOT}/lib/ladspa/strip/${HARRISONCHANNELSTRIP}.so"
+
+ echo "deploying harrison vamp plugins for $OSX_BENSID"
+
+ curl -s -S --fail -# \
+ -z "${CACHEDIR}/harrison_vamp.${OSX_BENSID}.dylib" \
+ -o "${CACHEDIR}/harrison_vamp.${OSX_BENSID}.dylib" \
+ "http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp/harrison_vamp.${OSX_BENSID}.dylib"
- cp "${CACHEDIR}/harrison_channelstrip.${OSX_ARCH}.so" \
- "${PRODUCT_PKG_DIR}/${APPROOT}/lib/ladspa/strip/harrison_channelstrip.so"
+ cp "${CACHEDIR}/harrison_vamp.${OSX_BENSID}.dylib" \
+ "${PRODUCT_PKG_DIR}/${APPROOT}/lib/harrison_vamp.dylib"
fi
################################################################################
@@ -708,9 +757,8 @@ TMPDMG="${TMPDMG}.dmg"
trap "rm -rf $MNTPATH $TMPDMG ${TMPDMG}.dmg $ICNSTMP" EXIT
-hdiutil create -megabytes $DMGMEGABYTES "$TMPDMG"
+hdiutil create -megabytes $DMGMEGABYTES -fs HFS+ -volname "${VOLNAME}" "$TMPDMG"
DiskDevice=$(hdid -nomount "$TMPDMG" | grep Apple_HFS | cut -f 1 -d ' ')
-newfs_hfs -v "${VOLNAME}" "${DiskDevice}"
mount -t hfs -o nobrowse "${DiskDevice}" "${MNTPATH}"
cp -r ${PRODUCT_PKG_DIR}/* "${MNTPATH}" || exit
@@ -768,6 +816,7 @@ hdiutil eject "${DiskDevice}" || true
# Create a read-only version, use zlib compression
hdiutil convert -format UDZO "${TMPDMG}" -imagekey zlib-level=9 -o "${UC_DMG}"
+if test $(sw_vers -productVersion | cut -d '.' -f 2) -gt 5; then
echo "setting file icon ..."
cp ${PRODUCT_PKG_DIR}/$Resources/appIcon.icns ${ICNSTMP}.icns
@@ -777,6 +826,8 @@ Rez -append ${ICNSTMP}.rsrc -o "$UC_DMG"
SetFile -a C "$UC_DMG"
rm ${ICNSTMP}.icns ${ICNSTMP}.rsrc
+fi
+
rm -rf ${PRODUCT_PKG_DIR}
echo