X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=tools%2Flinux_packaging%2Fbuild;h=15d7096f2c4fb3b13aa4c119421ab412fa6bd8d6;hb=ac40945ff96f27606ff5d3600cf06b0ba663a5e1;hp=3a4e748fe629cb72e6a8ca7262386caa0f952653;hpb=1f501ef94023d2911e9542b70668455e0aa72a10;p=ardour.git

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 3a4e748fe6..15d7096f2c 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -14,28 +14,38 @@ ARDOURSTACK_ROOT=$HOME/a3/inst
 # the waf build tree to use when copying built/generated files
 BUILD_ROOT=../../build
 
+. ../define_versions.sh
+
 # where harvid and xjadeo binaries are cached
 if test -z "$CACHEDIR" -o ! -d "$CACHEDIR"; then
 	CACHEDIR=`pwd`
 fi
 
 MIXBUS=
-WITH_LADSPA=0
+WITH_HARRISON_LV2=
+WITH_X42_LV2=
 WITH_HARVID=
 STRIP=all
 PRINT_SYSDEPS=
 WITH_NLS=
 EXTERNAL_JACK=
 VENDOR=Ardour ;
+EXENAME=ardour
+GCC5ABI=false
+USEWINE=false
 BUILDTYPE=""
+NOSTRIP="libsuil|libserd|libsord|liblilv|libsratom|liblrdf|libardour|libpbd|libevoral"
 
+: ${HARRISONCHANNELSTRIP=harrison_channelstrip}
+: ${HARRISONLV2=harrison_lv2s-n}
+: ${HARRISONDSPURL=http://www.harrisonconsoles.com/plugins/releases/public}
 
 if [ $# -eq 0 ] ; then
-	echo ""	 
+	echo ""
 	echo "ERROR - Please specify build type"
 	echo "	  --public"
 	echo "	  --mixbus"
-	echo ""	 
+	echo ""
 	exit 1
 fi
 
@@ -48,36 +58,49 @@ while [ $# -gt 0 ] ; do
 	#
 
 	--mixbus)
-		MIXBUS=1; 
-		WITH_NLS=1 ; 
-		WITH_LADSPA=; 
+		MIXBUS=1;
+		WITH_HARRISON_LV2=1 ;
+		WITH_X42_LV2=1 ;
+		WITH_NLS=1 ;
 		STRIP=all
 		APPNAME=Mixbus ;
-                VENDOR=Harrison ;
+		VENDOR=Harrison ;
+		EXENAME=mixbus ;
+		shift ;;
+	--mixbus32c)
+		MIXBUS=1;
+		WITH_HARRISON_LV2=1 ;
+		WITH_X42_LV2=1 ;
+		WITH_NLS=1 ;
+		STRIP=all
+		APPNAME=Mixbus32C ;
+		VENDOR=Harrison ;
+		EXENAME=mixbus32c ;
+		major_version=""
 		shift ;;
 	--public)
-		WITH_NLS=1 ; 
-		WITH_LADSPA=; 
-		STRIP=all ; 
+		WITH_HARRISON_LV2=1 ;
+		WITH_NLS=1 ;
+		STRIP=all ;
 		APPNAME=Ardour ;
 		shift ;;
 	--allinone)
-		WITH_NLS= ; 
-		WITH_LADSPA=1; 
-		STRIP=all; 
+		WITH_NLS= ;
+		STRIP=all;
 		shift ;;
-	--test) WITH_LADSPA=; STRIP= ; shift ;;
+	--test) STRIP= ; shift ;;
 
 	#
 	# specific build flags
 	#
 
 	--nojack) INTERNAL_JACK= ; shift ;;
-	--noladspa) WITH_LADSPA= ; shift ;;
 	--strip) STRIP=$2 ; shift ; shift ;;
 	--sysdeps) PRINT_SYSDEPS=1; shift ;;
 	--nls) WITH_NLS=1 ; shift ;;
 	--harvid) WITH_HARVID=1 ; shift ;;
+	--gcc5abi) GCC5ABI=true ; shift ;;
+	--chanstrip) HARRISONCHANNELSTRIP=$2 ; shift; shift ;;
 
 	*)
 		#catch all for unknown arguments
@@ -96,6 +119,7 @@ if test x$STRIP != xall -a x$STRIP != xnone -a x$STRIP != xsome ; then
 fi
 
 . ../define_versions.sh
+lower_case_appname=`echo $APPNAME | tr '[:upper:]' '[:lower:]'`
 
 echo "Version is $release_version"
 if [ "x$commit" != "x" ] ; then
@@ -110,12 +134,16 @@ case `uname -m` in
 	i[3456789]86|x86|i86pc)
 		echo "Architecture is x86"
 		ARCH='x86'
+		WARCH='i386'
+		HARCH='linux32'
 		ARCH_BITS='32-bit'
 		MULTIARCH='i386-linux-gnu'
 		;;
 	x86_64|amd64|AMD64)
 		echo "Architecture is x86_64"
 		ARCH='x86_64'
+		WARCH='x86_64'
+		HARCH='linux64'
 		ARCH_BITS='64-bit'
 		MULTIARCH='x86_64-linux-gnu'
 		;;
@@ -156,27 +184,25 @@ Surfaces=$APPLIB/surfaces
 Panners=$APPLIB/panners
 Backends=$APPLIB/backends
 
-Modules=$Libraries/modules
-Loaders=$Libraries/loaders
-
+Themes=$Shared/themes
 Templates=$Shared/templates
 ExportFormats=$Shared/export
 Locale=$Shared/locale
 MidiMaps=$Shared/midi_maps
 PatchFiles=$Shared/patchfiles
+LuaScripts=$Shared/scripts
 MackieControl=$Shared/mcp
-VFork=$Libraries/vfork
 
 if [ x$PRINT_SYSDEPS != x ] ; then
 #
 # print system dependencies
 #
 
-	for file in $APPBIN/* $Libraries/* $Modules/* $Plugins/*.so ; do 
+	for file in $APPBIN/* $Libraries/* $Plugins/*.so ; do
 		if ! file $file | grep -qs Mach-O ; then
 			continue
 		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
 	exit 0
 fi
@@ -192,21 +218,19 @@ mkdir -p $APPDIR
 mkdir -p $APPBIN
 mkdir -p $APPLIB
 mkdir -p $Etc
-mkdir -p $Plugins
-mkdir -p $Modules
-mkdir -p $Loaders
 mkdir -p $Shared
+mkdir -p $Themes
 mkdir -p $Locale
 mkdir -p $Surfaces
 mkdir -p $MidiMaps
 mkdir -p $PatchFiles
+mkdir -p $LuaScripts
 mkdir -p $MackieControl
 mkdir -p $ExportFormats
 mkdir -p $Panners
 mkdir -p $Backends
 mkdir -p $Templates
 mkdir -p $Shared/doc
-mkdir -p $VFork
 
 # maybe set variables
 ENVIRONMENT=environment
@@ -220,7 +244,6 @@ if test x$MIXBUS != x ; then
 	#
 	echo export ARDOUR_KEYBOARD_LAYOUT=us-nokeypad >> $ENVIRONMENT
 	echo export ARDOUR_UI_CONF=ardour3_ui.conf >> $ENVIRONMENT
-	echo export ARDOUR3_UI_RC=ardour3_ui_dark.rc >> $ENVIRONMENT
 fi
 
 #
@@ -231,15 +254,27 @@ fi
 echo export 'PATH=/usr/local/bin:/opt/bin:$PATH' >> $ENVIRONMENT
 
 # create startup helper script
+if test -d $BUILD_ROOT/vst; then
+	WINEEXE=wine
+	USEWINE=true
+	echo export INSTALL_DIR >> $ENVIRONMENT
+else
+	WINEEXE=
+fi
 
-sed -e "/^%ENV%/r $ENVIRONMENT" -e '/^%ENV%/d' -e 's/%VER%/'"${release_version}"'/' < ardour.sh.in > $APPBIN/ardour3
-rm $ENVIRONMENT && chmod 775 $APPBIN/ardour3
-MAIN_EXECUTABLE=ardour-${release_version}
+sed -e "/^%ENV%/r $ENVIRONMENT" -e '/^%ENV%/d' -e 's/%VER%/'"${release_version}"'/;s/%EXENAME%/'"${EXENAME}"'/;s/%WINE%/'"$WINEEXE"'/' < ardour.sh.in > $APPBIN/${EXENAME}${major_version}
+rm $ENVIRONMENT && chmod 775 $APPBIN/${EXENAME}${major_version}
 
 echo "Copying ardour executable ...."
-cp $BUILD_ROOT/gtk2_ardour/$MAIN_EXECUTABLE $APPBIN
+if test -d $BUILD_ROOT/vst; then
+	#cp -v $BUILD_ROOT/gtk2_ardour/libgtk2_ardour.so $APPLIB/
+	cp -v $BUILD_ROOT/gtk2_ardour/ardour-${release_version}-vst.exe.so $APPBIN/${EXENAME}-${release_version}
+else
+	cp -v $BUILD_ROOT/gtk2_ardour/ardour-${release_version}* $APPBIN/${EXENAME}-${release_version}
+fi
+
 if test x$STRIP = xall ; then
-	strip $APPBIN/$MAIN_EXECUTABLE
+	strip -s $APPBIN/${EXENAME}-${release_version}
 fi
 
 # copy locale files
@@ -250,7 +285,7 @@ if test x$WITH_NLS != x ; then
 	echo "I hope you remembered to run scons msgupdate!"
 	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"`
 
             #
@@ -267,8 +302,8 @@ if test x$WITH_NLS != x ; then
 		echo "!!!! WARNING !!!! - Did not find any .mo files in ../../$pkg"
 		echo ""
 	    fi
- 
-	    for file in $files 
+
+	    for file in $files
 	    do
 		echo $file
 		lang=`basename $file | sed 's/\.mo//'`
@@ -277,7 +312,7 @@ if test x$WITH_NLS != x ; then
 		echo copy $file to $Locale/$lang/LC_MESSAGES/`basename $pkg`$vsuffix.mo
                 if echo $LINGUAS | grep $lang >/dev/null 2>&1 ; then
                     :
-                else 
+                else
 		    LINGUAS="$LINGUAS $lang"
                 fi
 	    done
@@ -288,7 +323,7 @@ if test x$WITH_NLS != x ; then
 
 	for l in $LINGUAS ; do
 		echo "Copying GTK i18n files for $l..."
-		for MO in $GTK_MESSAGES ; do 
+		for MO in $GTK_MESSAGES ; do
 			if [ -f $LOCALEROOT/$l/LC_MESSAGES/$MO ] ; then
 				cp $LOCALEROOT/$l/LC_MESSAGES/$MO $Locale/$l/LC_MESSAGES
 			else
@@ -306,25 +341,9 @@ fi
 
 #
 # Copy stuff that may be dynamically loaded
-# 
+#
 
 cp -R $GTKSTACK_ROOT/etc/* $Etc
-echo "Copying all Pango modules ..."
-cp -R $GTKSTACK_ROOT/lib/pango/1.8.0/modules/*.so $Modules
-echo "Copying all GDK Pixbuf loaders ..."
-cp -R $GTKSTACK_ROOT/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so $Loaders
-
-# Generate a pango module file using the actual Pango that we're going to bundle
-
-cat > pangorc <<EOF 
-[Pango]
-ModulesPath=$GTKSTACK_ROOT/lib/pango/1.8.0/modules
-EOF
-env PANGO_RC_FILE=pangorc $GTKSTACK_ROOT/bin/pango-querymodules | sed "s?$GTKSTACK_ROOT/lib/pango/1.8.0/?@ROOTDIR@/?" > $Etc/pango.modules.in
-rm pangorc
-
-# Ditto for gdk-pixbuf loaders
-gdk-pixbuf-query-loaders | sed "s?$GTKSTACK_ROOT/lib/gdk-pixbuf-2.0/2.10.0/?@ROOTDIR@/?" > $Etc/gdk-pixbuf.loaders.in
 
 # We rely on clearlooks, so include a version from our own build tree
 # this one is special - we will set GTK_PATH to $Libraries/gtkengines
@@ -339,19 +358,6 @@ cp $BUILD_ROOT/libs/clearlooks-newer/libclearlooks.so $Libraries
 cp $GTKSTACK_ROOT/lib/gtk-2.0/2.10.0/engines/libpixmap.so $Libraries
 (cd $GTK_ENGINE_DIR && ln -s ../../libpixmap.so . )
 
-# LADSPA
-if test x$WITH_LADSPA != x ; then
-	if test x$MIXBUS != x ; then
-		plugdir=mixbus_ladspa
-	else
-		plugdir=ladspa
-	fi
-	echo "Copying `ls $plugdir | wc -l` plugins ..."
-	if [ -d $plugdir ] ; then
-		cp -r $plugdir/* $Plugins
-	fi
-fi
-
 # Control Surfaces
 cp $BUILD_ROOT/libs/surfaces/*/libardour_*.so* $Surfaces
 cp $BUILD_ROOT/libs/surfaces/control_protocol/libardourcp.so* $Libraries
@@ -368,6 +374,16 @@ for x in $BUILD_ROOT/../patchfiles/*.midnam ; do
     cp "$x" $PatchFiles
 done
 
+# Lua Scripts 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
+
 # MackieControl data
 # got to be careful with names here
 for x in $BUILD_ROOT/../mcp/*.device $BUILD_ROOT/../mcp/*.profile ; do
@@ -375,9 +391,9 @@ for x in $BUILD_ROOT/../mcp/*.device $BUILD_ROOT/../mcp/*.profile ; do
 done
 
 # Templates
-#for f in $BUILD_ROOT/../templates/* ; do 
+#for f in $BUILD_ROOT/../templates/* ; do
 #    if [ -d "$f" ] ; then
-#	echo Template: $f ; cp -r "$f" $Templates ; 
+#	echo Template: $f ; cp -r "$f" $Templates ;
 #    fi
 #done
 
@@ -391,42 +407,104 @@ done
 cp $BUILD_ROOT/libs/panners/*/lib*.so* $Panners
 
 # Backends
-for backend in jack wavesaudio ; do
+for backend in jack alsa dummy wavesaudio ; do
     cp $BUILD_ROOT/libs/backends/$backend/lib*.so* $Backends
 done
 
 # VAMP plugins that we use
 cp $BUILD_ROOT/libs/vamp-plugins/libardourvampplugins.so* $Libraries
 
-# Suil modules
-cp $ARDOURSTACK_ROOT/lib/suil-0/lib* $Libraries
+# Suil modules (new dir 'build-stack')
+if test -d $GTKSTACK_ROOT/lib/suil-0/ ; then
+    cp $GTKSTACK_ROOT/lib/suil-0/lib* $Libraries
+fi
+
+# Suil modules (old dir 'build-ardour-stack')
+if test -d $ARDOURSTACK_ROOT/lib/suil-0/ ; then
+    cp $ARDOURSTACK_ROOT/lib/suil-0/lib* $Libraries
+fi
 
 # VST scanner app (both LXVST as well as WIN-VST, 2in1)
 # (if build with wine: ardour-vst-scanner is a wrapper
 #  script for ardour-vst-scanner.exe.so, if VST is disabled
 #  neither binary nor script exists)
-cp $BUILD_ROOT/libs/fst/ardour-vst-scanner* $APPLIB || true
+if test -d $BUILD_ROOT/libs/fst ; then
+    cp $BUILD_ROOT/libs/fst/ardour-vst-scanner* $APPLIB || true
+    if test x$STRIP = xall ; then
+        strip -s $APPLIB/ardour-vst-scanner*
+    fi
+fi
 
 # vfork wrapper
-cp $BUILD_ROOT/libs/vfork/ardour-exec-wrapper $VFork
+if test -f $BUILD_ROOT/libs/vfork/ardour-exec-wrapper ; then
+    cp $BUILD_ROOT/libs/vfork/ardour-exec-wrapper $APPLIB
+    if test x$STRIP = xall ; then
+        strip -s $APPLIB/ardour-exec-wrapper
+    fi
+fi
 
 # ALSA device reservation tool (if available)
-cp $BUILD_ROOT/libs/ardouralsautil/ardour-request-device $APPLIB/ || true
+if test -f $BUILD_ROOT/libs/ardouralsautil/ardour-request-device; then
+    cp $BUILD_ROOT/libs/ardouralsautil/ardour-request-device $APPLIB/ || true
+    if test x$STRIP = xall ; then
+        strip -s $APPLIB/ardour-request-device
+    fi
+fi
+
+# session-utils
+HAVE_SESSION_UTILS=false
+for file in $BUILD_ROOT/session_utils/${lower_case_appname}${major_version}-*; do
+	BN=$(basename $file)
+	cp -v $file $APPLIB/
+	if test x$STRIP = xall ; then
+		strip -s $APPLIB/${BN}
+	fi
+	ln -s ../lib/ardour-util.sh $APPBIN/${BN}
+	HAVE_SESSION_UTILS=true
+done
+
+if test "$HAVE_SESSION_UTILS" = true ; then
+	cat >> $APPLIB/ardour-util.sh << EOF
+#!/bin/sh
+
+BIN_DIR=\$(dirname \$(readlink -f \$0))
+INSTALL_DIR=\$(dirname \$BIN_DIR)
+
+export LD_LIBRARY_PATH=\$INSTALL_DIR/lib\${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
+
+export ARDOUR_DATA_PATH=\$INSTALL_DIR/share
+export ARDOUR_CONFIG_PATH=\$INSTALL_DIR/etc
+export ARDOUR_DLL_PATH=\$INSTALL_DIR/lib
+export VAMP_PATH=\$INSTALL_DIR/lib\${VAMP_PATH:+:\$VAMP_PATH}
+
+SELF=\$(basename \$0)
+exec "\$INSTALL_DIR/lib/\$SELF" "\$@"
+EOF
+	chmod +x $APPLIB/ardour-util.sh
+fi
 
 OURLIBDIR=$BUILD_ROOT/libs
-OURLIBS=$OURLIBDIR/vamp-sdk:$OURLIBDIR/surfaces/control_protocol:$OURLIBDIR/ardour:$OURLIBDIR/midi++2:$OURLIBDIR/pbd:$OURLIBDIR/rubberband:$OURLIBDIR/soundtouch:$OURLIBDIR/gtkmm2ext:$OURLIBDIR/sigc++2:$OURLIBDIR/glibmm2:$OURLIBDIR/gtkmm2/atk:$OURLIBDIR/gtkmm2/pango:$OURLIBDIR/gtkmm2/gdk:$OURLIBDIR/gtkmm2/gtk:$OURLIBDIR/canvas:$OURLIBDIR/libsndfile:$OURLIBDIR/evoral:$OURLIBDIR/evoral/src/libsmf:$OURLIBDIR/audiographer:$OURLIBDIR/timecode:$OURLIBDIR/taglib:$OURLIBDIR/libltc:$OURLIBDIR/qm-dsp:$OURLIBDIR/ardouralsautil
+OURLIBS=$OURLIBDIR/vamp-sdk:$OURLIBDIR/surfaces/control_protocol:$OURLIBDIR/ardour:$OURLIBDIR/midi++2:$OURLIBDIR/pbd:$OURLIBDIR/rubberband:$OURLIBDIR/soundtouch:$OURLIBDIR/gtkmm2ext:$OURLIBDIR/sigc++2:$OURLIBDIR/glibmm2:$OURLIBDIR/gtkmm2/atk:$OURLIBDIR/gtkmm2/pango:$OURLIBDIR/gtkmm2/gdk:$OURLIBDIR/gtkmm2/gtk:$OURLIBDIR/canvas:$OURLIBDIR/libsndfile:$OURLIBDIR/evoral:$OURLIBDIR/evoral/src/libsmf:$OURLIBDIR/audiographer:$OURLIBDIR/timecode:$OURLIBDIR/taglib:$OURLIBDIR/libltc:$OURLIBDIR/qm-dsp:$OURLIBDIR/ardouralsautil:$OURLIBDIR/ptformat:$BUILD_ROOT/gtk2_ardour
 
 echo $OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 
 checkedIdx=0
-deplibs=
 
-while [ true ] ; do 
+# these are dynamically loaded by NSS
+deplibs="libfreeblpriv3.so libsoftokn3.so libnsspem.so"
+cp -v $GTKSTACK_ROOT/lib/libsoftokn3.so $Libraries/
+cp -v $GTKSTACK_ROOT/lib/libfreeblpriv3.so $Libraries/
+cp -v $GTKSTACK_ROOT/lib/libnsspem.so $Libraries/
+chrpath -r foo $Libraries/libsoftokn3.so
+chrpath -r foo $Libraries/libfreeblpriv3.so
+chrpath -r foo $Libraries/libnsspem.so
+
+while [ true ] ; do
 	missing=false
 	filelist=`find $APPLIB/ -type f`
-	filelist="$APPBIN/$MAIN_EXECUTABLE $filelist"
+	filelist="$APPBIN/${EXENAME}-${release_version} $filelist"
 
-	for file in $filelist  ; do 
+	for file in $filelist  ; do
 		if ! file $file | grep -qs ELF ; then
 			continue
 		fi
@@ -439,13 +517,16 @@ while [ true ] ; do
 		done
 		depCheckedList[$checkIdx]=$file
 		checkIdx=$(($checkIdx + 1))
-		
-		# do not include libjack
-		deps=`LD_LIBRARY_PATH=$OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} ldd $file | awk '{print $3}'`
+
+		# ignore suil/qt wrappers - the plugin will pull in QT4.
+		if echo $file | grep -qs 'libsuil_.*qt[45]' ; then continue; fi
+
+		# do not include libjack, nor libwine
+		deps=`LD_LIBRARY_PATH=$OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} ldd $file | grep -v libwine.so | awk '{print $3}'`
 
 		echo -n "."
 		for dep in $deps ; do
-			if test "not" = ${dep}; then 
+			if test "not" = ${dep}; then
 				echo ""
 				echo "!!! ERROR !!! - Missing dependant library for $file."
 				echo "Searched: " $OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
@@ -465,16 +546,18 @@ while [ true ] ; do
 			# don't include ALSA
 			if echo $dep | grep -qs libasound ; then continue; fi
 			# don't include any X Window libraries
-			if echo $dep | grep -qs libX\. ; then continue; fi  
-			if echo $dep | grep -qs libxcb ; then continue; fi  
-			if echo $dep | grep -qs libICE\. ; then continue; fi  
-			if echo $dep | grep -qs libSM\. ; then continue; fi  
+			if echo $dep | grep -qs libX\. ; then continue; fi
+			if echo $dep | grep -qs libxcb ; then continue; fi
+			if echo $dep | grep -qs libICE\. ; then continue; fi
+			if echo $dep | grep -qs libSM\. ; then continue; fi
 			# don't include libc
 			if echo $dep | grep -qs 'libc\.' ; then continue; fi
 			# don't include libstdc++
 			if echo $dep | grep -qs libstdc++ ; then continue; fi
-                        # don't include libdbus
+			# don't include libdbus (alsa request device)
 			if echo $dep | grep -qs libdbus ; then continue; fi
+			# nor libudev (hidapi)
+			if echo $dep | grep -qs libudev ; then continue; fi
 
 			base=`basename $dep`
 			if ! test -f $Libraries/$base; then
@@ -510,37 +593,40 @@ echo
 if test x$STRIP = xall ; then
     echo Stripping all libraries
     # Must be writable so that we can strip
-    find $APPLIB/ -name "*.so*" | xargs chmod u+w
+    find $APPLIB/ -name "*.so*" -print0 | xargs -0 chmod u+w
     # and strip ...
-    find $APPLIB/ -name "*.so*" | xargs strip
+    find $APPLIB/ -name "*.so*" -print0 | xargs -0 strip -s
 elif test x$STRIP = xsome ; then
     echo Stripping dependent libraries
     for l in $deplibs ; do
+        if echo "$l" | grep -qE "$NOSTRIP"; then
+            continue
+        fi
         chmod u+w $APPLIB/$l
-        strip $APPLIB/$l
+        strip -s $APPLIB/$l
     done
 fi
-find $APPLIB/ -name "*.so*" | xargs chmod a+rx
+find $APPLIB/ -name "*.so*" -print0 | xargs -0 chmod a+rx
 
 echo "Copying other stuff to $APPDIR  ..."
 
 # these are all generated by waf
-#cp $BUILD_ROOT/gtk2_ardour/ergonomic-us.bindings	$Etc
-cp $BUILD_ROOT/gtk2_ardour/mnemonic-us.bindings  $Etc
+cp $BUILD_ROOT/gtk2_ardour/ardour.keys  $Etc
 cp $BUILD_ROOT/gtk2_ardour/ardour.menus $Etc
-cp ../../ardour_system.rc $Etc/ardour_system.rc
-cp $BUILD_ROOT/gtk2_ardour/ardour3_ui_*.rc $Etc
+cp $BUILD_ROOT/gtk2_ardour/clearlooks.rc $Etc
+cp $BUILD_ROOT/gtk2_ardour/default_ui_config $Etc
 
-# these are copied straight from the source tree
+# Copied directly from source tree
 
-cp ../../gtk2_ardour/ardour3_ui_default.conf $Etc/ardour3_ui_default.conf
-cp ../../gtk2_ardour/ardour3_ui_default.conf $Etc/ardour3_ui.conf
-cp ../../instant.xml $Etc/instant.xml
-cp ../../gtk2_ardour/step_editing.bindings $Etc
-cp ../../gtk2_ardour/mixer.bindings $Etc
-cp -r ../../gtk2_ardour/icons $Shared
-cp -r ../../gtk2_ardour/pixmaps $Shared
+mkdir ${Shared}/icons
+mkdir ${Shared}/resources
+cp ../../gtk2_ardour/icons/*.png ${Shared}/icons
+cp -r ../../gtk2_ardour/icons/cursor_* ${Shared}/icons/
+cp ../../gtk2_ardour/ArdourMono.ttf $Shared
+cp ../../gtk2_ardour/resources/${APPNAME}-* ${Shared}/resources/
 
+# Themes: only install those named for this app
+cp ../../gtk2_ardour/themes/*-${lower_case_appname}.colors $Themes
 
 #
 # put sooper sekrit ingredients here and they will be copied
@@ -550,20 +636,98 @@ if [ -d specialSauce ] ; then
 	cp -r specialSauce $Etc
 fi
 
-# share stuff
-
-cp -R ../../gtk2_ardour/splash.png $Shared
-cp -R ../../gtk2_ardour/small-splash.png $Shared
-cp -R ../../gtk2_ardour/ArdourMono.ttf $Shared
-
 # install bundled LV2s to <app>/lib/LV2/
 cp -R $BUILD_ROOT/libs/LV2 $APPLIB/
 
+# lv2 core, classifications etc - TODO check if we need the complete LV2 ontology
+if test -d $ARDOURSTACK_ROOT/lib/lv2/lv2core.lv2 ; then
+	mkdir -p $APPLIB/LV2/lv2core.lv2
+	cp -R $ARDOURSTACK_ROOT/lib/lv2/lv2core.lv2/*.ttl $APPLIB/LV2/lv2core.lv2/
+elif test -d $GTKSTACK_ROOT/lib/lv2/lv2core.lv2 ; then
+	mkdir -p $APPLIB/LV2/lv2core.lv2
+	cp -R $GTKSTACK_ROOT/lib/lv2/lv2core.lv2/*.ttl $APPLIB/LV2/lv2core.lv2/
+fi
+
 # go through and recursively remove any .svn dirs in the bundle
 for svndir in `find $APPDIR -name .svn -type d`; do
 	rm -rf $svndir
 done
 
+
+################################################################################
+### Mixbus plugins, etc
+if test x$WITH_HARRISON_LV2 != x ; then
+	echo "Adding Harrison LV2s"
+	mkdir -p $APPLIB/LV2
+
+	curl -s -S --fail -# \
+		-z "${CACHEDIR}/${HARRISONLV2}.${HARCH}.zip" \
+		-o "${CACHEDIR}/${HARRISONLV2}.${HARCH}.zip" \
+		"${HARRISONDSPURL}/${HARRISONLV2}.${HARCH}.zip"
+	unzip -q -d "$APPLIB/LV2/" "${CACHEDIR}/${HARRISONLV2}.${HARCH}.zip"
+fi
+
+if test -n "$MIXBUS"; then
+	echo "Adding Mixbus Channelstrip"
+
+	mkdir -p $APPLIB/ladspa/strip/
+	curl -s -S --fail -# \
+		-z "${CACHEDIR}/${HARRISONCHANNELSTRIP}.${HARCH}.so" \
+		-o "${CACHEDIR}/${HARRISONCHANNELSTRIP}.${HARCH}.so" \
+		"${HARRISONDSPURL}/${HARRISONCHANNELSTRIP}.${HARCH}.so"
+
+	cp "${CACHEDIR}/${HARRISONCHANNELSTRIP}.${HARCH}.so" \
+		$APPLIB/ladspa/strip/${HARRISONCHANNELSTRIP}.so
+	chmod +x $APPLIB/ladspa/strip/${HARRISONCHANNELSTRIP}.so
+
+	echo "Adding Harrison Vamp Plugins"
+
+	if test "$GCC5ABI" = "true"; then
+		VAMPARCH="${HARCH}gcc5"
+	else
+		VAMPARCH="${HARCH}"
+	fi
+	curl -s -S --fail -# \
+		-z "${CACHEDIR}/harrison_vamp.${VAMPARCH}.so" \
+		-o "${CACHEDIR}/harrison_vamp.${VAMPARCH}.so" \
+		"${HARRISONDSPURL}/harrison_vamp.${VAMPARCH}.so"
+
+	cp "${CACHEDIR}/harrison_vamp.${VAMPARCH}.so" \
+		$APPLIB/harrison_vamp.so
+	chmod +x $APPLIB/harrison_vamp.so
+fi
+
+if true ; then
+	mkdir -p $APPLIB/LV2
+
+	echo "Adding General MIDI Synth LV2"
+
+	for proj in x42-gmsynth ; do
+		X42_VERSION=$(curl -s -S http://x42-plugins.com/x42/linux/${proj}.latest.txt)
+		rsync -a -q --partial \
+			rsync://x42-plugins.com/x42/linux/${proj}-lv2-linux-${WARCH}-${X42_VERSION}.zip \
+			"${CACHEDIR}/${proj}-lv2-linux-${WARCH}-${X42_VERSION}.zip"
+		unzip -q -d "$APPLIB/LV2/" "${CACHEDIR}/${proj}-lv2-linux-${WARCH}-${X42_VERSION}.zip"
+	done
+fi
+
+
+if test x$WITH_X42_LV2 != x ; then
+	mkdir -p $APPLIB/LV2
+
+	echo "Adding x42 Plugins"
+
+	for proj in x42-meters x42-midifilter x42-midimap x42-stereoroute x42-eq setBfree x42-avldrums; do
+		X42_VERSION=$(curl -s -S http://x42-plugins.com/x42/linux/${proj}.latest.txt)
+		rsync -a -q --partial \
+			rsync://x42-plugins.com/x42/linux/${proj}-lv2-linux-${WARCH}-${X42_VERSION}.zip \
+			"${CACHEDIR}/${proj}-lv2-linux-${WARCH}-${X42_VERSION}.zip"
+		unzip -q -d "$APPLIB/LV2/" "${CACHEDIR}/${proj}-lv2-linux-${WARCH}-${X42_VERSION}.zip"
+	done
+fi
+
+################################################################################
+
 if test x$WITH_HARVID != x ; then
 	cd $APPBIN
 	HARVID_VERSION=$(curl -s -S http://ardour.org/files/video-tools/harvid_version.txt)
@@ -588,12 +752,31 @@ if test x$WITH_HARVID != x ; then
 	cd -
 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
+
+################################################################################
+
 #
 # Add the uninstaller
 #
-sed -e "s/%REPLACE_PGM%/${APPNAME}/" -e "s/%REPLACE_VENDOR%/${VENDOR}/" -e "s/%REPLACE_VERSION%/${release_version}/" -e "s/%REPLACE_TYPE%/${BUILDTYPE}/" < uninstall.sh.in > $APPBIN/${APP_VER_NAME}.uninstall.sh
+sed -e "s/%REPLACE_PGM%/${APPNAME}/" -e "s/%REPLACE_VENDOR%/${VENDOR}/" -e "s/%REPLACE_MAJOR_VERSION%/${major_version}/" -e "s/%REPLACE_VERSION%/${release_version}/" -e "s/%REPLACE_TYPE%/${BUILDTYPE}/" < uninstall.sh.in > $APPBIN/${APP_VER_NAME}.uninstall.sh
 chmod a+x $APPBIN/${APP_VER_NAME}.uninstall.sh
 
+#
+# Add the stage2.run script
+#
+sed -e "s/%REPLACE_MAJOR_VERSION%/${major_version}/;s/%REPLACE_PGM%/${APPNAME}/;s/%REPLACE_VENDOR%/${VENDOR}/;s/%REPLACE_EXE%/${EXENAME}/;s/%REPLACE_GCC5%/${GCC5ABI}/;s/%REPLACE_WINE%/${USEWINE}/" < stage2.run.in > stage2.run
+chmod a+x stage2.run
+
+
 #Sanity Check file
 if [ -e $BUILD_ROOT/tools/sanity_check/sanityCheck ]; then
 	cp $BUILD_ROOT/tools/sanity_check/sanityCheck $APPBIN
@@ -604,12 +787,14 @@ fi
 
 echo "Building tarball ..."
 
-rm -f $APPDIR.tar.bz2
-tar -cjf $APPDIR.tar.bz2 $APPDIR
+rm -f $APPDIR.tar
+tar -cf $APPDIR.tar $APPDIR
 
 echo "Calculating bundle size"
 du -sb $APPDIR/  | awk '{print $1}' > $APPDIR.size
 
+( cd $APPDIR ; find . ) > file_list.txt
+
 rm -rf $APPDIR/
 
 echo "Done."