X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=tools%2Fosx_packaging%2Fosx_build;h=fcf1febe84fc78c2dd1641336c6d5918a47594ab;hb=269120905081e8b6fc47a96f8595637c2f926442;hp=22fe7819aea02443f8c38fbf1bae423a1899ba50;hpb=a47cfd7f6f5fe3c9755084ec9523367ba7cd6f80;p=ardour.git diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index 22fe7819ae..fcf1febe84 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -2,32 +2,18 @@ # script for pulling together a MacOSX app bundle. -GTKQUARTZ_ROOT=$HOME/gtk/inst - -if pkg-config --modversion gtk+-2.0 | grep -s 2.22 ; then - # older GTK - GDKPIXBUF_LOADERS=$GTKQUARTZ_ROOT/lib/gtk-2.0/2.10.0/loaders - echo - echo - echo "*****************************************************" - echo "You are building with the OLD GTK stack. I hope that is ok" - echo "*****************************************************" - echo - echo -else - # newer GTK - GDKPIXBUF_LOADERS=$GTKQUARTZ_ROOT/lib/gdk-pixbuf-2.0/2.10.0/loaders - echo - echo - echo "*****************************************************" - echo "You are building with the NEW GTK stack. I hope that is ok" - echo "*****************************************************" - echo - echo +GTKSTACK_ROOT=$HOME/gtk/inst +ARDOURSTACK_ROOT=$HOME/a3/inst +BUILD_ROOT=../../build + +# where harvid and xjadeo binaries are cached +if test -z "$CACHEDIR" -o ! -d "$CACHEDIR"; then + CACHEDIR=`pwd` fi SAE= MIXBUS= +WITH_HARVID=1 WITH_LADSPA=1 STRIP=1 PRINT_SYSDEPS= @@ -75,6 +61,7 @@ while [ $# -gt 0 ] ; do # specific build flags # + --noharvid) WITH_HARVID= ; shift ;; --noladspa) WITH_LADSPA= ; shift ;; --nostrip) STRIP= ; shift ;; --sysdeps) PRINT_SYSDEPS=1; shift ;; @@ -82,20 +69,25 @@ while [ $# -gt 0 ] ; do esac done -BUILD_ROOT=../../build +if test -z "$PRODUCT_PKG_DIR" -o -z "$APPNAME"; then + echo "application or product-name was not specified" + exit 1 +fi -#release_version=`grep -m 1 '^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`" +. ../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`" +else + info_string="$release_version built on `hostname` by `whoami` on `date`" +fi echo "Info string is $info_string" # setup directory structure APPDIR=${APPNAME}.app APPROOT=$APPDIR/Contents -Frameworks=$APPROOT/Frameworks +Frameworks=$APPROOT/lib Resources=$APPROOT/Resources # # Since this is OS X, don't try to distinguish between etc and shared @@ -111,11 +103,12 @@ Locale=$Resources/locale Plugins=$APPROOT/Plugins Surfaces=$Frameworks/surfaces Panners=$Frameworks/panners +Backends=$Frameworks/backends MidiMaps=$Shared/midi_maps ExportFormats=$Shared/export Templates=$Shared/templates PatchFiles=$Shared/patchfiles -MCP=$Shared/mcp +MackieControl=$Shared/mcp if [ x$PRINT_SYSDEPS != x ] ; then # @@ -144,12 +137,13 @@ mkdir -p $APPROOT/Resources mkdir -p $Plugins mkdir -p $Surfaces mkdir -p $Panners +mkdir -p $Backends mkdir -p $MidiMaps mkdir -p $ExportFormats mkdir -p $Templates mkdir -p $Frameworks/modules -mkdir -p $Shared/templates mkdir -p $Etc +mkdir -p $MackieControl # maybe set variables env="" @@ -187,12 +181,12 @@ env="LSEnvironment$envARDOUR_BUNDLEDtrue 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?g" \ -e "s?@INFOSTRING@?$info_string?g" < InfoPlist.strings.in > Resources/InfoPlist.strings || exit 1 # copy static files @@ -229,32 +223,53 @@ fi # copy locale files if test x$WITH_NLS != x ; then echo "NLS support ..." - echo "I hope you remembered to run scons msgupdate!" + echo "I hope you remembered to run waf i18n" LINGUAS= - for file in $BUILD_ROOT/gtk2_ardour/*.mo - do - lang=`basename $file | sed 's/\.mo//'` - mkdir -p $Locale/$lang/LC_MESSAGES - cp $file $Locale/$lang/LC_MESSAGES/gtk2_ardour.mo - LINGUAS="$LINGUAS $lang" - done - for file in $BUILD_ROOT/libs/ardour/*.mo - do - lang=`basename $file | sed 's/\.mo//'` - mkdir -p $Locale/$lang/LC_MESSAGES - cp $file $Locale/$lang/LC_MESSAGES/libardour.mo + + for pkg in gtk2_ardour libs/ardour libs/gtkmm2ext ; do + files=`find ../../$pkg -name "*.mo"` + + # + # the package name is appended with a number so that + # it can be parallel installed during a regular install + # with older (and newer) versions. it is just the major + # number of the release (i.e. leading digits) + # + + vsuffix=`echo $release_version | sed 's/^\([0-9][0-9]*\).*/\1/'` + + if [ -z "$files" ]; then + echo "" + echo "!!!! WARNING !!!! - Did not find any .mo files in ../../$pkg" + echo "" + fi + + for file in $files + do + echo $file + lang=`basename $file | sed 's/\.mo//'` + mkdir -p $Locale/$lang/LC_MESSAGES + cp $file $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 + : + else + LINGUAS="$LINGUAS $lang" + fi + done done + for l in $LINGUAS do - if [ -d $GTKQUARTZ_ROOT/share/locale/$l ] ; then + if [ -d $GTKSTACK_ROOT/share/locale/$l ] ; then echo "Copying GTK i18n files for $l..." - cp -r $GTKQUARTZ_ROOT/share/locale/$l $Locale + cp -r $GTKSTACK_ROOT/share/locale/$l $Locale else # try with just the language spec just_lang=`echo $l | sed 's/_[A-Z][A-Z]$//'` - if [ -d $GTKQUARTZ_ROOT/share/locale/$just_lang ] ; then + if [ -d $GTKSTACK_ROOT/share/locale/$just_lang ] ; then echo "Copying GTK i18n files for $l..." - cp -r $GTKQUARTZ_ROOT/share/locale/$just_lang $Locale + cp -r $GTKSTACK_ROOT/share/locale/$just_lang $Locale fi fi done @@ -262,15 +277,42 @@ else echo "Skipping NLS support" fi -cp -R $GTKQUARTZ_ROOT/etc/* $Etc +# +# Copy stuff that may be dynamically loaded +# + +cp -R $GTKSTACK_ROOT/etc/* $Etc echo "Copying all Pango modules ..." -cp -R $GTKQUARTZ_ROOT/lib/pango/1.6.0/modules/*.so $Frameworks/modules +cp -R $GTKSTACK_ROOT/lib/pango/1.8.0/modules/*.so $Frameworks/modules echo "Copying all GDK Pixbuf loaders ..." -cp -R $GDKPIXBUF_LOADERS/*.so $Frameworks/modules +cp -R $GTKSTACK_ROOT/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so $Frameworks/modules # charset alias file -cp -R $GTKQUARTZ_ROOT/lib/charset.alias $Resources +cp -R $GTKSTACK_ROOT/lib/charset.alias $Resources + +# generate new Pango module file +cat > pangorc < $Resources/pango.modules +rm pangorc + +# generate a new GDK pixbufs loaders file +gdk-pixbuf-query-loaders | sed "s?$GTKSTACK_ROOT/lib/gdk-pixbuf-2.0/2.10.0/loaders/?@executable_path/../lib/modules/?" > $Resources/gdk-pixbuf.loaders + +# We rely on clearlooks, so include a version from our own build tree +# this one is special - we will set GTK_PATH to $Frameworks/gtkengines + +GTK_ENGINE_DIR=$Frameworks/gtkengines/engines +mkdir -p $GTK_ENGINE_DIR + +echo "Copying GTK engines ..." +cp $BUILD_ROOT/libs/clearlooks-newer/libclearlooks.dylib $Frameworks +(cd $GTK_ENGINE_DIR && ln -s ../../libclearlooks.dylib . && ln -s ../../libclearlooks.dylib libclearlooks.so) + +cp $GTKSTACK_ROOT/lib/gtk-2.0/2.10.0/engines/libpixmap.so $Frameworks +(cd $GTK_ENGINE_DIR && ln -s ../../libpixmap.so) -pwd=`pwd` if test x$WITH_LADSPA != x ; then if test x$SAE != x ; then @@ -280,80 +322,65 @@ if test x$WITH_LADSPA != x ; then else plugdir=ladspa fi - echo "Copying `ls $plugdir | wc -l` plugins ..." - cp -r $plugdir/* $Plugins + if [ -d $plugdir -a "x$(ls $plugdir)" != x ] ; then + echo "Copying `ls $plugdir | wc -l` plugins ..." + cp -r $plugdir/* $Plugins + fi fi -# generate new Pango module file -cat > pangorc < $Resources/pango.modules -rm pangorc - -# generate a new GDK pixbufs loaders file -gdk-pixbuf-query-loaders | sed "s?$GDKPIXBUF_LOADERS/?@executable_path/../Frameworks/modules/?" > $Resources/gdk-pixbuf.loaders - -# this one is special - we will set GTK_PATH to $Frameworks/clearlooks -cp $BUILD_ROOT/libs/clearlooks-newer/libclearlooks.dylib $Frameworks -mkdir -p $Frameworks/clearlooks/engines -(cd $Frameworks/clearlooks/engines && ln -s $BUILD_ROOT/libclearlooks.dylib libclearlooks.dylib && ln -s ../../libclearlooks.dylib libclearlooks.so) - # Control Surface shared libraries cp $BUILD_ROOT/libs/surfaces/*/libardour_*.dylib $Surfaces -# hack ... move libardour_cp back into Frameworks -mv $Surfaces/libardourcp*.dylib $Frameworks +cp $BUILD_ROOT/libs/surfaces/control_protocol/libardourcp*.dylib $Frameworks # Panners cp $BUILD_ROOT/libs/panners/*/lib*.dylib $Panners +# Backends +cp $BUILD_ROOT/libs/backends/*/lib*.dylib $Backends # Export Formats/Presets for f in $BUILD_ROOT/../export/*.preset $BUILD_ROOT/../export/*.format ; do - echo ExportFormat: $f cp "$f" $ExportFormats ; done # Session and Route templates -for f in $BUILD_ROOT/../templates/* ; do - if [ -d "$f" ] ; then - echo Template: $f - cp -r "$f" $Templates ; - fi -done +#for f in $BUILD_ROOT/../templates/* ; do +# if [ -d "$f" ] ; then +# cp -r "$f" $Templates ; +# fi +#done # MidiMaps # got to be careful with names here for x in $BUILD_ROOT/../midi_maps/*.map ; do cp "$x" $MidiMaps - echo Copied MIDI map $x done # MIDNAM Patch Files # got to be careful with names here for x in $BUILD_ROOT/../patchfiles/*.midnam ; do cp "$x" $PatchFiles - echo Copied MIDNAM file "$x" done # MackieControl data # got to be careful with names here for x in $BUILD_ROOT/../mcp/*.device $BUILD_ROOT/../mcp/*.profile ; do - cp "$x" $MCP - echo Copied Mackie Control file $x + cp "$x" $MackieControl done # VAMP plugins that we use cp $BUILD_ROOT/libs/vamp-plugins/libardourvampplugins.dylib $Frameworks +# Suil modules +cp $ARDOURSTACK_ROOT/lib/suil-0/lib* $Frameworks + while [ true ] ; do missing=false - for file in $APPROOT/MacOS/* $Frameworks/* $Frameworks/modules/* $Panners/*.dylib $Surfaces/*.dylib $Plugins/*.so ; do + for file in $APPROOT/MacOS/* $Frameworks/* $Frameworks/modules/* $Panners/*.dylib $Backends/*.dylib $Surfaces/*.dylib $Plugins/*.so ; do if ! file $file | grep -qs Mach-O ; then continue fi - deps=`otool -L $file | awk '{print $1}' | egrep "($GTKQUARTZ_ROOT|/opt/|/local/|libs/)" | grep -v 'libjack\.'` + deps=`otool -L $file | awk '{print $1}' | egrep "($GTKSTACK_ROOT|$ARDOURSTACK_ROOT|/opt/|/local/|libs/)" | grep -v 'libjack\.'` # echo -n "." for dep in $deps ; do base=`basename $dep` @@ -393,8 +420,7 @@ if test x$SAE != x ; then cp $BUILD_ROOT/instant.xml.sae $Resources/instant.xml echo cp $BUILD_ROOT/instant.xml.sae $Resources/instant.xml else -# cp $BUILD_ROOT/ardour_system.rc $Resources/ardour_system.rc -# echo FOO cp $BUILD_ROOT/ardour_system.rc $Resources/ardour_system.rc + cp ../../ardour_system.rc $Resources/ardour_system.rc cp ../../instant.xml $Resources/instant.xml echo cp ../../instant.xml $Resources/instant.xml fi @@ -406,14 +432,19 @@ cp $BUILD_ROOT/gtk2_ardour/ardour3_ui_dark.rc $Resources cp -r ../../gtk2_ardour/icons $Resources cp -r ../../gtk2_ardour/pixmaps $Resources -# splash screen stuff +# shared stuff cp -R ../../gtk2_ardour/splash.png $Shared +cp -R ../../gtk2_ardour/small-splash.png $Shared +cp -R ../../gtk2_ardour/ArdourMono.ttf $Shared # go through and recursively remove any .svn dirs in the bundle for svndir in `find $APPDIR -name .svn -type dir`; do rm -rf $svndir done +# install bundled LV2s to /Contents/lib/LV2/ +cp -R $BUILD_ROOT/libs/LV2 $Frameworks/ + # now fix up the executables echo "Fixing up executable dependency names ..." executables=$MAIN_EXECUTABLE @@ -424,9 +455,9 @@ fi for exe in $executables; do EXE=$APPROOT/MacOS/$exe changes="" - for lib in `otool -L $EXE | egrep "($GTKQUARTZ_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/)" | awk '{print $1}' | grep -v 'libjack\.'` ; do base=`basename $lib` - changes="$changes -change $lib @executable_path/../Frameworks/$base" + changes="$changes -change $lib @executable_path/../lib/$base" done if test "x$changes" != "x" ; then install_name_tool $changes $EXE @@ -435,7 +466,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 ; do +for libdir in $Frameworks $Frameworks/modules $Surfaces $Panners $Backends ; do libbase=`basename $libdir` @@ -450,12 +481,12 @@ for libdir in $Frameworks $Frameworks/modules $Surfaces $Panners ; do # change all the dependencies changes="" - for lib in `otool -L $dylib | egrep "($GTKQUARTZ_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/)" | 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" else - changes="$changes -change $lib @executable_path/../Frameworks/$base" + changes="$changes -change $lib @executable_path/../lib/$base" fi done @@ -481,6 +512,9 @@ done rm -rf $PRODUCT_PKG_DIR mkdir $PRODUCT_PKG_DIR +DMGWINBOTTOM=440 +DMGBACKGROUND=dmgbg.png + if [ x$SAE != x ] ; then # SAE packaging @@ -498,7 +532,9 @@ elif [ x$MIXBUS != x ] ; then echo "Creating Mixbus packaging directory" mv $APPDIR $PRODUCT_PKG_DIR/ cp MixBus_Install_QuickStart.pdf "$PRODUCT_PKG_DIR/Mixbus Install & Quick Start Guide.pdf" - + DMGWINBOTTOM=580 + YPOS=$[ $DMGWINBOTTOM - 300 ] + MIXBUSPOS="set position of item \"MixBus_Install_QuickStart.pdf\" of container window to {90, ${YPOS}}" else echo "Creating $APPNAME packaging directory" @@ -506,20 +542,123 @@ else fi -echo "Building DMG ..." +if test x$WITH_HARVID != x ; then + echo "installing video tools.." + HARVID_VERSION=$(curl -s -S http://ardour.org/files/video-tools/harvid_version.txt) + XJADEO_VERSION=$(curl -s -S http://ardour.org/files/video-tools/xjadeo_version.txt) + echo "copying harvid and xjadeo ..." -# 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 + rsync -Pa \ + rsync://ardour.org/video-tools/harvid-osx-${HARVID_VERSION}.tgz \ + "$CACHEDIR/harvid-${MULTIARCH}-${HARVID_VERSION}.tgz" -rm -f $UC_DMG -echo hdiutil create $UC_DMG -volname $APPNAME-$release_version -fs HFS+ -srcfolder $PRODUCT_PKG_DIR -hdiutil create $UC_DMG -volname $APPNAME-$release_version -fs HFS+ -srcfolder $PRODUCT_PKG_DIR + rsync -Pa \ + rsync://ardour.org/video-tools/jadeo-${XJADEO_VERSION:1}.dmg \ + "$CACHEDIR/jadeo-${XJADEO_VERSION:1}.dmg" -# compress it -# echo "Compressing DMG ..." -# rm -f $FINAL_DMG -# hdiutil convert $UC_DMG -format UDBZ -o $FINAL_DMG + tar -x -z \ + -C $PRODUCT_PKG_DIR/$APPROOT \ + -f "$CACHEDIR/harvid-${MULTIARCH}-${HARVID_VERSION}.tgz" || exit 1 -echo "Done." + JADEO=$(hdiutil attach "$CACHEDIR/jadeo-${XJADEO_VERSION:1}.dmg" | grep Apple_HFS | grep dev/ | cut -f 3) + cp -r "${JADEO}/Jadeo.app" "$PRODUCT_PKG_DIR/" + hdiutil detach "${JADEO}" + DMGWINBOTTOM=580 + YPOS=$[ $DMGWINBOTTOM - 300 ] + XJADEOPOS="set position of item \"Jadeo.app\" of container window to {310, ${YPOS}}" + + DMGBACKGROUND=dmgbgxj.png +fi + +echo "Building DMG ..." + +# UC_DMG=$APPNAME-${release_version}-UC.dmg +# FINAL_DMG=$APPNAME-${release_version}.dmg +UC_DMG=$APPNAME-$release_version.dmg +VOLNAME=$APPNAME-$release_version + +# TODO use mktemp +export TMPDIR=`pwd` +MNTPATH=`mktemp -d -t /ardourimg` +TMPDMG=`mktemp -t ardour` +ICNSTMP=`mktemp -t ardouricon` +EXTRA_SPACE_MB=30 +DMGMEGABYTES=$[ `du -sk "$PRODUCT_PKG_DIR" | cut -f 1` * 1024 / 1048576 + $EXTRA_SPACE_MB ] + +echo "DMG MB = " $DMGMEGABYTES + +rm -f $UC_DMG "$TMPDMG" "${TMPDMG}.dmg" "$ICNSTMP" +rm -rf "$MNTPATH" +mkdir -p "$MNTPATH" + +TMPDMG="${TMPDMG}.dmg" + +hdiutil create -megabytes $DMGMEGABYTES "$TMPDMG" +DiskDevice=$(hdid -nomount "$TMPDMG" | grep Apple_HFS | cut -f 1 -d ' ') +newfs_hfs -v "${VOLNAME}" "${DiskDevice}" +mount -t hfs "${DiskDevice}" "${MNTPATH}" + +cp -r ${PRODUCT_PKG_DIR}/* "${MNTPATH}" || exit +mkdir "${MNTPATH}/.background" +cp -vi ${DMGBACKGROUND} "${MNTPATH}/.background/dmgbg.png" + +echo "setting DMG background ..." + +echo ' + tell application "Finder" + tell disk "'${VOLNAME}'" + open + set current view of container window to icon view + set toolbar visible of container window to false + set statusbar visible of container window to false + set the bounds of container window to {400, 200, 800, '${DMGWINBOTTOM}'} + set theViewOptions to the icon view options of container window + set arrangement of theViewOptions to not arranged + set icon size of theViewOptions to 64 + set background picture of theViewOptions to file ".background:dmgbg.png" + make new alias file at container window to POSIX file "/Applications" with properties {name:"Applications"} + set position of item "'${APPDIR}'" of container window to {90, 100} + set position of item "Applications" of container window to {310, 100} + '${MIXBUSPOS}' + '${HARVIDPOS}' + '${XJADEOPOS}' + close + open + update without registering applications + delay 5 + eject + end tell + end tell +' | osascript + +chmod -Rf go-w "${MNTPATH}" +sync + +echo "compressing Image ..." + +# Umount the image +umount "${DiskDevice}" +hdiutil eject "${DiskDevice}" +# Create a read-only version, use zlib compression +hdiutil convert -format UDZO "${TMPDMG}" -imagekey zlib-level=9 -o "${UC_DMG}" +# Delete the temporary files +rm "$TMPDMG" +rm -rf "$MNTPATH" + +echo "setting file icon ..." + +cp ${PRODUCT_PKG_DIR}/$Resources/appIcon.icns ${ICNSTMP}.icns +/usr/bin/sips -i ${ICNSTMP}.icns +/Developer/Tools/DeRez -only icns ${ICNSTMP}.icns > ${ICNSTMP}.rsrc +/Developer/Tools/Rez -append ${ICNSTMP}.rsrc -o "$UC_DMG" +/Developer/Tools/SetFile -a C "$UC_DMG" + +rm ${ICNSTMP}.icns ${ICNSTMP}.rsrc + +echo +echo "packaging suceeded." +ls -l "$UC_DMG" + +echo "Done." +exit