ardour/livetrax
13
0
Fork 0
Code

NO-OP: whitespace

Browse Source
This commit is contained in:
Robin Gareus 2019-06-05 15:34:58 +02:00
parent 9398df415d
commit bf7906ce97
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 177 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

354
tools/osx_packaging/osx_build
View File

@ -31,8 +31,8 @@ WITH_NLS=
. ../define_versions.sh . ../define_versions.sh
while [ $# -gt 0 ] ; do while [ $# -gt 0 ] ; do
echo "arg = $1" echo "arg = $1"
case $1 in case $1 in
# #
# top level build targets # top level build targets
@ -93,7 +93,7 @@ while [ $# -gt 0 ] ; do
--sysdeps) PRINT_SYSDEPS=1; shift ;; --sysdeps) PRINT_SYSDEPS=1; shift ;;
--nls) WITH_NLS=1 ; shift ;; --nls) WITH_NLS=1 ; shift ;;
--chanstrip) HARRISONCHANNELSTRIP=$2 ; shift; shift ;; --chanstrip) HARRISONCHANNELSTRIP=$2 ; shift; shift ;;
esac esac
done done
if test -z "$PRODUCT_PKG_DIR" -o -z "$APPNAME"; then if test -z "$PRODUCT_PKG_DIR" -o -z "$APPNAME"; then
@ -103,9 +103,9 @@ fi
echo "Version is $release_version" echo "Version is $release_version"
if [ "x$commit" != "x" ] ; then if [ "x$commit" != "x" ] ; then
info_string="$release_version ($commit) built on `hostname` by `whoami` on `date`" info_string="$release_version ($commit) built on `hostname` by `whoami` on `date`"
else else
info_string="$release_version built on `hostname` by `whoami` on `date`" info_string="$release_version built on `hostname` by `whoami` on `date`"
fi fi
echo "Info string is $info_string" echo "Info string is $info_string"
@ -130,7 +130,7 @@ Resources=$APPROOT/Resources
# Since this is OS X, don't try to distinguish between etc and shared # Since this is OS X, don't try to distinguish between etc and shared
# (machine dependent and independent data) - just put everything # (machine dependent and independent data) - just put everything
# into Resources. # into Resources.
# #
Shared=$Resources Shared=$Resources
Etc=$Resources Etc=$Resources
Locale=$Resources/locale Locale=$Resources/locale
@ -158,9 +158,9 @@ for file in $APPROOT/MacOS/* $Frameworks/* $Frameworks/modules/* ; do
if ! file $file | grep -qs Mach-O ; then if ! file $file | grep -qs Mach-O ; then
continue continue
fi fi
otool -L $file | awk '{print $1}' | egrep -v "(^@executable_path|^Ardour[0-9][.0-9]*.app)" otool -L $file | awk '{print $1}' | egrep -v "(^@executable_path|^Ardour[0-9][.0-9]*.app)"
done | sort | uniq done | sort | uniq
exit 0 exit 0
fi fi
echo "Removing old $APPDIR tree ..." echo "Removing old $APPDIR tree ..."
@ -238,14 +238,14 @@ MAIN_EXECUTABLE=Ardour.bin ## used in startup_script
echo "Copying ardour executable ...." echo "Copying ardour executable ...."
cp $BUILD_ROOT/gtk2_ardour/ardour-$release_version $APPROOT/MacOS/$MAIN_EXECUTABLE cp $BUILD_ROOT/gtk2_ardour/ardour-$release_version $APPROOT/MacOS/$MAIN_EXECUTABLE
if test x$SAE != x ; then if test x$SAE != x ; then
# cp $BUILD_ROOT/gtk2_ardour/evtest $APPROOT/MacOS/gtkevents # cp $BUILD_ROOT/gtk2_ardour/evtest $APPROOT/MacOS/gtkevents
cp Ardour3-SAE.icns $Resources/appIcon.icns cp Ardour3-SAE.icns $Resources/appIcon.icns
elif test x$MIXBUS32C != x ; then elif test x$MIXBUS32C != x ; then
cp Mixbus32C.icns $Resources/appIcon.icns cp Mixbus32C.icns $Resources/appIcon.icns
elif test x$MIXBUS != x ; then elif test x$MIXBUS != x ; then
cp Mixbus.icns $Resources/appIcon.icns cp Mixbus.icns $Resources/appIcon.icns
else else
cp Ardour.icns $Resources/appIcon.icns cp Ardour.icns $Resources/appIcon.icns
fi fi
cp typeArdour.icns $Resources/ cp typeArdour.icns $Resources/
@ -253,64 +253,64 @@ set +e # things below are not error-free (optional files etc) :(
# copy locale files # copy locale files
if test x$WITH_NLS != x ; then if test x$WITH_NLS != x ; then
echo "NLS support ..." echo "NLS support ..."
echo "I hope you remembered to run waf i18n" echo "I hope you remembered to run waf i18n"
LINGUAS= LINGUAS=
for pkg in gtk2_ardour libs/ardour libs/gtkmm2ext ; do for pkg in gtk2_ardour libs/ardour libs/gtkmm2ext ; do
files=`find ../../$pkg -name "*.mo"` files=`find ../../$pkg -name "*.mo"`
# #
# the package name is appended with a number so that # the package name is appended with a number so that
# it can be parallel installed during a regular install # it can be parallel installed during a regular install
# with older (and newer) versions. it is just the major # with older (and newer) versions. it is just the major
# number of the release (i.e. leading digits) # number of the release (i.e. leading digits)
# #
vsuffix=`echo $release_version | sed 's/^\([0-9][0-9]*\).*/\1/'` vsuffix=`echo $release_version | sed 's/^\([0-9][0-9]*\).*/\1/'`
if [ -z "$files" ]; then if [ -z "$files" ]; then
echo "" echo ""
echo "!!!! WARNING !!!! - Did not find any .mo files in ../../$pkg" echo "!!!! WARNING !!!! - Did not find any .mo files in ../../$pkg"
echo "" echo ""
fi fi
for file in $files for file in $files
do do
echo $file echo $file
lang=`basename $file | sed 's/\.mo//'` lang=`basename $file | sed 's/\.mo//'`
mkdir -p $Locale/$lang/LC_MESSAGES mkdir -p $Locale/$lang/LC_MESSAGES
cp $file $Locale/$lang/LC_MESSAGES/`basename $pkg`$vsuffix.mo cp $file $Locale/$lang/LC_MESSAGES/`basename $pkg`$vsuffix.mo
echo copy $file to $Locale/$lang/LC_MESSAGES/`basename $pkg`$vsuffix.mo echo copy $file to $Locale/$lang/LC_MESSAGES/`basename $pkg`$vsuffix.mo
if echo $LINGUAS | grep $lang >/dev/null 2>&1 ; then if echo $LINGUAS | grep $lang >/dev/null 2>&1 ; then
: :
else else
LINGUAS="$LINGUAS $lang" LINGUAS="$LINGUAS $lang"
fi fi
done
done done
done
for l in $LINGUAS for l in $LINGUAS
do do
if [ -d $GTKSTACK_ROOT/share/locale/$l ] ; then if [ -d $GTKSTACK_ROOT/share/locale/$l ] ; then
echo "Copying GTK i18n files for $l..." echo "Copying GTK i18n files for $l..."
cp -r $GTKSTACK_ROOT/share/locale/$l $Locale cp -r $GTKSTACK_ROOT/share/locale/$l $Locale
else else
# try with just the language spec # try with just the language spec
just_lang=`echo $l | sed 's/_[A-Z][A-Z]$//'` just_lang=`echo $l | sed 's/_[A-Z][A-Z]$//'`
if [ -d $GTKSTACK_ROOT/share/locale/$just_lang ] ; then if [ -d $GTKSTACK_ROOT/share/locale/$just_lang ] ; then
echo "Copying GTK i18n files for $l..." echo "Copying GTK i18n files for $l..."
cp -r $GTKSTACK_ROOT/share/locale/$just_lang $Locale cp -r $GTKSTACK_ROOT/share/locale/$just_lang $Locale
fi fi
fi fi
done done
else else
echo "Skipping NLS support" echo "Skipping NLS support"
fi fi
# #
# Copy stuff that may be dynamically loaded # Copy stuff that may be dynamically loaded
# #
cp -R $GTKSTACK_ROOT/etc/* $Etc cp -R $GTKSTACK_ROOT/etc/* $Etc
cp -R $GTKSTACK_ROOT/lib/charset.alias $Resources cp -R $GTKSTACK_ROOT/lib/charset.alias $Resources
@ -338,12 +338,12 @@ cp $BUILD_ROOT/libs/panners/*/lib*.dylib $Panners
# Backends # Backends
for backend in jack wavesaudio dummy coreaudio; do for backend in jack wavesaudio dummy coreaudio; do
cp $BUILD_ROOT/libs/backends/$backend/lib*.dylib $Backends cp $BUILD_ROOT/libs/backends/$backend/lib*.dylib $Backends
done done
# Export Formats/Presets # Export Formats/Presets
for f in $BUILD_ROOT/../export/*.preset $BUILD_ROOT/../export/*.format ; do for f in $BUILD_ROOT/../export/*.preset $BUILD_ROOT/../export/*.format ; do
cp "$f" $ExportFormats ; cp "$f" $ExportFormats ;
done done
#Session templates #Session templates
@ -355,41 +355,41 @@ cp -av $BUILD_ROOT/../plugin_metadata $PluginMetadata
# MidiMaps # MidiMaps
# got to be careful with names here # got to be careful with names here
for x in $BUILD_ROOT/../midi_maps/*.map ; do for x in $BUILD_ROOT/../midi_maps/*.map ; do
cp "$x" $MidiMaps cp "$x" $MidiMaps
done done
# MIDNAM Patch Files # MIDNAM Patch Files
# got to be careful with names here # got to be careful with names here
for x in $BUILD_ROOT/../patchfiles/*.midnam ; do for x in $BUILD_ROOT/../patchfiles/*.midnam ; do
cp "$x" $PatchFiles cp "$x" $PatchFiles
done done
# Lua Script Files # Lua Script Files
# got to be careful with names here # got to be careful with names here
for x in $BUILD_ROOT/../scripts/*.lua ; do for x in $BUILD_ROOT/../scripts/*.lua ; do
BN=$(basename $x) BN=$(basename $x)
if test "${BN:0:1}" = "_"; then if test "${BN:0:1}" = "_"; then
continue; continue;
fi fi
cp "$x" $LuaScripts cp "$x" $LuaScripts
done done
# MackieControl data # MackieControl data
# got to be careful with names here # got to be careful with names here
for x in $BUILD_ROOT/../mcp/*.device $BUILD_ROOT/../mcp/*.profile ; do for x in $BUILD_ROOT/../mcp/*.device $BUILD_ROOT/../mcp/*.profile ; do
cp "$x" $MackieControl cp "$x" $MackieControl
done done
# OSC data # OSC data
# got to be careful with names here # got to be careful with names here
for x in $BUILD_ROOT/../osc/*.preset ; do for x in $BUILD_ROOT/../osc/*.preset ; do
cp "$x" $OSC cp "$x" $OSC
done done
# Mixbus MixerSettings (if any) # Mixbus MixerSettings (if any)
for x in $BUILD_ROOT/../mixer_settings/*.lua ; do for x in $BUILD_ROOT/../mixer_settings/*.lua ; do
mkdir -p $MixerSettings # create on demand mkdir -p $MixerSettings # create on demand
cp "$x" $MixerSettings cp "$x" $MixerSettings
done done
# VAMP plugins that we use # VAMP plugins that we use
@ -397,23 +397,23 @@ cp $BUILD_ROOT/libs/vamp-plugins/libardourvampplugins.dylib $Frameworks
# Suil modules (new dir 'build-stack') # Suil modules (new dir 'build-stack')
if test -d $GTKSTACK_ROOT/lib/suil-0/ ; then if test -d $GTKSTACK_ROOT/lib/suil-0/ ; then
cp $GTKSTACK_ROOT/lib/suil-0/lib* $Frameworks cp $GTKSTACK_ROOT/lib/suil-0/lib* $Frameworks
fi fi
# Suil modules (old dir 'build-ardour-stack') # Suil modules (old dir 'build-ardour-stack')
if test -d $ARDOURSTACK_ROOT/lib/suil-0/ ; then if test -d $ARDOURSTACK_ROOT/lib/suil-0/ ; then
cp $ARDOURSTACK_ROOT/lib/suil-0/lib* $Frameworks cp $ARDOURSTACK_ROOT/lib/suil-0/lib* $Frameworks
fi fi
# VST scanner app and wrapper script, if they exist # VST scanner app and wrapper script, if they exist
if test -d $BUILD_ROOT/libs/fst ; then if test -d $BUILD_ROOT/libs/fst ; then
cp $BUILD_ROOT/libs/fst/ardour-vst-scanner* $Frameworks/ cp $BUILD_ROOT/libs/fst/ardour-vst-scanner* $Frameworks/
fi fi
# vfork wrapper # vfork wrapper
if test -f $BUILD_ROOT/libs/vfork/ardour-exec-wrapper ; then if test -f $BUILD_ROOT/libs/vfork/ardour-exec-wrapper ; then
mkdir -p $Frameworks/vfork mkdir -p $Frameworks/vfork
cp $BUILD_ROOT/libs/vfork/ardour-exec-wrapper $Frameworks/ cp $BUILD_ROOT/libs/vfork/ardour-exec-wrapper $Frameworks/
fi fi
# session-utils # session-utils
@ -451,39 +451,39 @@ else
STDCPP= STDCPP=
fi fi
while [ true ] ; do while [ true ] ; do
missing=false missing=false
for file in $APPROOT/MacOS/* $Frameworks/* $Frameworks/modules/* $Panners/*.dylib $Backends/*.dylib $Surfaces/*.dylib ; do for file in $APPROOT/MacOS/* $Frameworks/* $Frameworks/modules/* $Panners/*.dylib $Backends/*.dylib $Surfaces/*.dylib ; do
if ! file $file | grep -qs Mach-O ; then if ! file $file | grep -qs Mach-O ; then
continue continue
fi
# libffi contains "S" (other section symbols) that should not be stripped.
if [[ $file == *"libffi"* ]] ; then
continue
fi
if test x$STRIP != x ; then
strip -u -r -arch all $file &>/dev/null
fi
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`
if ! test -f $Frameworks/$base; then
if echo $dep | grep -sq '^libs' ; then
cp $BUILD_ROOT/$dep $Frameworks
else
cp $dep $Frameworks
fi fi
missing=true # libffi contains "S" (other section symbols) that should not be stripped.
fi if [[ $file == *"libffi"* ]] ; then
continue
fi
if test x$STRIP != x ; then
strip -u -r -arch all $file &>/dev/null
fi
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`
if ! test -f $Frameworks/$base; then
if echo $dep | grep -sq '^libs' ; then
cp $BUILD_ROOT/$dep $Frameworks
else
cp $dep $Frameworks
fi
missing=true
fi
done
done done
done if test x$missing = xfalse ; then
if test x$missing = xfalse ; then # everything has been found
# everything has been found break
break fi
fi
done done
echo echo
@ -510,7 +510,7 @@ cp ../../gtk2_ardour/themes/*-${lower_case_appname}.colors $Themes
# go through and recursively remove any .svn dirs in the bundle # go through and recursively remove any .svn dirs in the bundle
for svndir in `find $APPDIR -name .svn -type dir`; do for svndir in `find $APPDIR -name .svn -type dir`; do
rm -rf $svndir rm -rf $svndir
done done
# session utils start script # session utils start script
@ -548,7 +548,7 @@ fi
echo "Fixing up executable dependency names ..." echo "Fixing up executable dependency names ..."
executables=$MAIN_EXECUTABLE executables=$MAIN_EXECUTABLE
if test x$SAE != x ; then if test x$SAE != x ; then
executables="$executables" executables="$executables"
fi fi
if test "$HAVE_SESSION_UTILS" = true ; then if test "$HAVE_SESSION_UTILS" = true ; then
for file in $Frameworks/${lower_case_appname}${major_version}-*; do for file in $Frameworks/${lower_case_appname}${major_version}-*; do
@ -562,62 +562,62 @@ if test -f "$Frameworks/ardour-vst-scanner"; then
fi fi
for exe in $executables; do for exe in $executables; do
echo "Processing Executable: $exe" echo "Processing Executable: $exe"
EXE=$APPROOT/MacOS/$exe EXE=$APPROOT/MacOS/$exe
changes="" changes=""
for lib in `otool -L $EXE | egrep "($GTKSTACK_ROOT|$ARDOURSTACK_ROOT|/opt/|/local/|libs/$STDCPP)" | 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` base=`basename $lib`
changes="$changes -change $lib @executable_path/../lib/$base" changes="$changes -change $lib @executable_path/../lib/$base"
done done
if test "x$changes" != "x" ; then if test "x$changes" != "x" ; then
install_name_tool $changes $EXE install_name_tool $changes $EXE
fi fi
done done
echo "Fixing up library names ..." echo "Fixing up library names ..."
# now do the same for all the libraries we include # now do the same for all the libraries we include
for libdir in $Frameworks $Frameworks/modules $Surfaces $Panners $Backends $Frameworks/LV2/* ; do for libdir in $Frameworks $Frameworks/modules $Surfaces $Panners $Backends $Frameworks/LV2/* ; do
libbase=`basename $libdir` libbase=`basename $libdir`
for dylib in $libdir/*.dylib $libdir/*.so ; do for dylib in $libdir/*.dylib $libdir/*.so ; do
# skip symlinks # skip symlinks
if test -L $dylib ; then if test -L $dylib ; then
continue continue
fi fi
# change all the dependencies # change all the dependencies
changes="" changes=""
for lib in `otool -L $dylib | egrep "($GTKSTACK_ROOT|$ARDOURSTACK_ROOT|/opt/|/local/|libs/$STDCPP)" | 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` base=`basename $lib`
if echo $lib | grep -s libbase; then if echo $lib | grep -s libbase; then
changes="$changes -change $lib @executable_path/../$libbase/$base" changes="$changes -change $lib @executable_path/../$libbase/$base"
else else
changes="$changes -change $lib @executable_path/../lib/$base" changes="$changes -change $lib @executable_path/../lib/$base"
fi fi
done
if test "x$changes" != x ; then
if install_name_tool $changes $dylib ; then
:
else
exit 1
fi
fi
# now the change what the library thinks its own name is
base=`basename $dylib`
install_name_tool -id @executable_path/../$libbase/$base $dylib
done done
if test "x$changes" != x ; then
if install_name_tool $changes $dylib ; then
:
else
exit 1
fi
fi
# now the change what the library thinks its own name is
base=`basename $dylib`
install_name_tool -id @executable_path/../$libbase/$base $dylib
done
done done
# #
# and now ... the DMG # and now ... the DMG
# #
rm -rf $PRODUCT_PKG_DIR rm -rf $PRODUCT_PKG_DIR
mkdir $PRODUCT_PKG_DIR mkdir $PRODUCT_PKG_DIR
@ -626,26 +626,26 @@ DMGWINBOTTOM=440
DMGBACKGROUND=dmgbg DMGBACKGROUND=dmgbg
if [ x$SAE != x ] ; then if [ x$SAE != x ] ; then
# SAE packaging # SAE packaging
echo "Creating SAE packaging directory" echo "Creating SAE packaging directory"
mv $APPDIR $PRODUCT_PKG_DIR/Ardour3-SAE.app mv $APPDIR $PRODUCT_PKG_DIR/Ardour3-SAE.app
cp HowToInstallArdourSAE.pdf "$PRODUCT_PKG_DIR/How To Install Ardour SAE.pdf" cp HowToInstallArdourSAE.pdf "$PRODUCT_PKG_DIR/How To Install Ardour SAE.pdf"
cp SAE-de-keypad.pdf "$PRODUCT_PKG_DIR/Ardour SAE Shortcuts (keypad).pdf" cp SAE-de-keypad.pdf "$PRODUCT_PKG_DIR/Ardour SAE Shortcuts (keypad).pdf"
cp SAE-de-nokeypad.pdf "$PRODUCT_PKG_DIR/Ardour SAE Shortcuts.pdf" cp SAE-de-nokeypad.pdf "$PRODUCT_PKG_DIR/Ardour SAE Shortcuts.pdf"
elif [ x$MIXBUS != x ] ; then elif [ x$MIXBUS != x ] ; then
# Mixbus packaging # Mixbus packaging
echo "Creating Mixbus packaging directory" echo "Creating Mixbus packaging directory"
mv $APPDIR $PRODUCT_PKG_DIR/ mv $APPDIR $PRODUCT_PKG_DIR/
DMGBACKGROUND=dmgbgMB DMGBACKGROUND=dmgbgMB
else else
echo "Creating $APPNAME packaging directory" echo "Creating $APPNAME packaging directory"
mv $APPDIR $PRODUCT_PKG_DIR/ mv $APPDIR $PRODUCT_PKG_DIR/
fi fi