X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=tools%2Fosx_packaging%2Fosx_build;h=19b64c3e045b3e84dbab9dacad18c36f2f5d8306;hb=52b6ad1b962f104ebd5ad050587a0d6325e57ce4;hp=ca3db40ea3b78125e37bff4ad8d0c99152de5e1a;hpb=72ac6bc8a69762b4b7503baa160f68077ba8b20e;p=ardour.git
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index ca3db40ea3..19b64c3e04 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -16,14 +16,20 @@ mkdir -p "$CACHEDIR"
SAE=
MIXBUS=
+MIXBUS32C=
WITH_HARVID=1
WITH_HARRISON_LV2=
WITH_X42_LV2=
-WITH_LADSPA=1
STRIP=1
PRINT_SYSDEPS=
WITH_NLS=
+: ${HARRISONCHANNELSTRIP=harrison_channelstrip}
+: ${HARRISONLV2=harrison_lv2s-n}
+: ${HARRISONDSPURL=http://www.harrisonconsoles.com/plugins/releases/public}
+
+. ../define_versions.sh
+
while [ $# -gt 0 ] ; do
echo "arg = $1"
case $1 in
@@ -34,7 +40,6 @@ while [ $# -gt 0 ] ; do
--sae)
SAE=1 ;
- WITH_LADSPA=1;
STRIP= ;
PRODUCT_PKG_DIR=ArdourSAE ;
APPNAME=Ardour ;
@@ -44,33 +49,43 @@ while [ $# -gt 0 ] ; do
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= ;
+ STRIP= ;
+ PRODUCT_PKG_DIR=Mixbus32C;
+ APPNAME=Mixbus32C-${major_version} ;
+ major_version=""
+ shift ;;
--public)
SAE= ;
- WITH_LADSPA=1;
+ WITH_HARRISON_LV2=1 ;
+ WITH_X42_LV2=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 ;;
+ --test) SAE= ; STRIP= ; shift ;;
#
# specific build flags
#
--noharvid) WITH_HARVID= ; shift ;;
- --noladspa) WITH_LADSPA= ; shift ;;
--nostrip) STRIP= ; shift ;;
--sysdeps) PRINT_SYSDEPS=1; shift ;;
--nls) WITH_NLS=1 ; shift ;;
+ --chanstrip) HARRISONCHANNELSTRIP=$2 ; shift; shift ;;
esac
done
@@ -79,7 +94,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`"
@@ -126,6 +140,7 @@ Templates=$Shared/templates
PatchFiles=$Shared/patchfiles
LuaScripts=$Shared/scripts
MackieControl=$Shared/mcp
+Themes=$Shared/themes
if [ x$PRINT_SYSDEPS != x ] ; then
#
@@ -163,6 +178,7 @@ mkdir -p $Etc
mkdir -p $MackieControl
mkdir -p $PatchFiles
mkdir -p $LuaScripts
+mkdir -p $Themes
# maybe set variables
env=""
@@ -176,7 +192,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"
#
@@ -238,6 +254,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
@@ -325,20 +343,6 @@ cp $GTKSTACK_ROOT/lib/gtk-2.0/2.10.0/engines/libpixmap.so $Frameworks
(cd $GTK_ENGINE_DIR && ln -s ../../libpixmap.so)
-if test x$WITH_LADSPA != x ; then
- if test x$SAE != x ; then
- plugdir=sae_ladspa
- elif test x$MIXBUS != x ; then
- plugdir=mixbus_ladspa
- else
- plugdir=ladspa
- fi
- if [ -d $plugdir -a "x$(ls $plugdir)" != x ] ; then
- echo "Copying `ls $plugdir | wc -l` plugins ..."
- cp -r $plugdir/* $Plugins
- fi
-fi
-
# Control Surface shared libraries
cp $BUILD_ROOT/libs/surfaces/*/libardour_*.dylib $Surfaces
cp $BUILD_ROOT/libs/surfaces/control_protocol/libardourcp*.dylib $Frameworks
@@ -378,6 +382,10 @@ done
# Lua Script Files
# got to be careful with names here
for x in $BUILD_ROOT/../scripts/*.lua ; do
+ BN=$(basename $x)
+ if test "${BN:0:1}" = "_"; then
+ continue;
+ fi
cp "$x" $LuaScripts
done
@@ -463,14 +471,19 @@ 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 -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/ArdourMono.ttf $Shared
+cp ../../gtk2_ardour/resources/${PRODUCT_PKG_DIR}-* ${Resources}/resources/
+
+
+# Themes: only install those named for this app
+lower_case_appname=`echo $APPNAME | tr '[:upper:]' '[:lower:]'`
+cp ../../gtk2_ardour/themes/*-${lower_case_appname}.colors $Themes
# go through and recursively remove any .svn dirs in the bundle
for svndir in `find $APPDIR -name .svn -type dir`; do
@@ -509,7 +522,7 @@ done
echo "Fixing up library names ..."
# now do the same for all the libraries we include
-for libdir in $Frameworks $Frameworks/modules $Surfaces $Panners $Backends ; do
+for libdir in $Frameworks $Frameworks/modules $Surfaces $Panners $Backends $Frameworks/LV2/* ; do
libbase=`basename $libdir`
@@ -595,13 +608,13 @@ fi
if test x$WITH_HARRISON_LV2 != x ; then
curl -s -S --fail -# \
- -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"
+ -z "${CACHEDIR}/${HARRISONLV2}.${OSX_BENSID}.zip" \
+ -o "${CACHEDIR}/${HARRISONLV2}.${OSX_BENSID}.zip" \
+ "${HARRISONDSPURL}/${HARRISONLV2}.${OSX_BENSID}.zip"
mkdir -p "${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2"
bsdtar -C "${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2/" -xf \
- "${CACHEDIR}/harrison_lv2s.${OSX_BENSID}.zip"
+ "${CACHEDIR}/${HARRISONLV2}.${OSX_BENSID}.zip"
fi
if test x$WITH_HARVID != x ; then
@@ -648,33 +661,14 @@ if test x$WITH_X42_LV2 != x ; then
echo "bundling x42 plugins"
mkdir -p "${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2"
- METERS_VERSION=$(curl -s -S http://x42-plugins.com/x42/osx/x42-meters.latest.txt)
- rsync -a -q --partial \
- rsync://x42-plugins.com/x42/osx/x42-meters-lv2-osx-${METERS_VERSION}.zip \
- "$CACHEDIR/x42-meters-lv2-osx-${METERS_VERSION}.zip"
- 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 \
- "$CACHEDIR/setBfree-lv2-osx-${SETBFREE_VERSION}.zip"
- bsdtar -C "${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2/" -xf \
- "$CACHEDIR/setBfree-lv2-osx-${SETBFREE_VERSION}.zip"
-
- MIDIFILTER_VERSION=$(curl -s -S http://x42-plugins.com/x42/osx/x42-midifilter.latest.txt)
- rsync -a -q --partial \
- rsync://x42-plugins.com/x42/osx/x42-midifilter-lv2-osx-${MIDIFILTER_VERSION}.zip \
- "$CACHEDIR/x42-midifilter-lv2-osx-${MIDIFILTER_VERSION}.zip"
- bsdtar -C "${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2/" -xf \
- "$CACHEDIR/x42-midifilter-lv2-osx-${MIDIFILTER_VERSION}.zip"
+ for proj in x42-meters x42-midifilter x42-midimap x42-stereoroute x42-eq setBfree; do
+ X42_VERSION=$(curl -s -S http://x42-plugins.com/x42/osx/${proj}.latest.txt)
+ rsync -a -q --partial \
+ rsync://x42-plugins.com/x42/osx/${proj}-lv2-osx-${X42_VERSION}.zip \
+ "$CACHEDIR/${proj}-lv2-osx-${X42_VERSION}.zip"
+ bsdtar -C "${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2/" -xf \
+ "$CACHEDIR/${proj}-lv2-osx-${X42_VERSION}.zip"
+ done
for file in ${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2/*/*.dylib ; do
lipo -extract_family ${OSX_ARCH} ${file} -output ${file}.thin
@@ -683,18 +677,39 @@ if test x$WITH_X42_LV2 != x ; then
fi
if test -n "$MIXBUS"; then
- echo "deploying harrison tools for $OSX_BENSID"
+ 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_BENSID}.so" \
- -o "${CACHEDIR}/harrison_channelstrip.${OSX_BENSID}.so" \
- "http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp/harrison_channelstrip.${OSX_BENSID}.so"
+ -z "${CACHEDIR}/${HARRISONCHANNELSTRIP}.${OSX_BENSID}.so" \
+ -o "${CACHEDIR}/${HARRISONCHANNELSTRIP}.${OSX_BENSID}.so" \
+ "${HARRISONDSPURL}/${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" \
+ "${HARRISONDSPURL}/harrison_vamp.${OSX_BENSID}.dylib"
- cp "${CACHEDIR}/harrison_channelstrip.${OSX_BENSID}.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
+
+################################################################################
+
+if test x$DEMO_SESSION_URL != x ; then
+ mkdir -p $Shared/sessions
+ DEMO_SESSIONS=$(curl -s -S --fail $DEMO_SESSION_URL/index.txt)
+ for demo in $DEMO_SESSIONS; do
+ curl -s -S --fail -# -o $Shared/sessions/$demo $DEMO_SESSION_URL/$demo
+ done
+fi
+
################################################################################
( cd $PRODUCT_PKG_DIR ; find . ) > file_list.txt