X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=tools%2Flinux_packaging%2Fbuild;h=f2fa1293ecd3626ffd347c5efd347ccb08910252;hb=b150474b262f7c0dcf95b0d5d2b61d78e34591b0;hp=0ffd1024c880f05ebbd8aa9b82d5639aaf9affac;hpb=0881ec1f6a579ec4dcf9fcfdcaf758dc06285be8;p=ardour.git

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 0ffd1024c8..f2fa1293ec 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -5,14 +5,20 @@
 . ./buildenv
 
 # script for pulling together a Linux app bundle.
+#
+# This will create a bundle for a single architecture.
+# Execute this scirpt on both x86 and x86_64 and then use
+# package to merge the 2 bundles into a final package with the
+# installer.
 
 MIXBUS=
-INTERNAL_JACK=1
 WITH_LADSPA=0
-STRIP=1
+STRIP=all
 PRINT_SYSDEPS=
 WITH_NLS=
 EXTERNAL_JACK=
+VENDOR=Ardour ;
+BUILDTYPE=""
 
 if [ $# -eq 0 ] ; then
 	echo ""	 
@@ -34,25 +40,23 @@ while [ $# -gt 0 ] ; do
 	--mixbus)
 		MIXBUS=1; 
 		WITH_NLS=1 ; 
-		INTERNAL_JACK=; 
 		WITH_LADSPA=; 
-		STRIP= ; 
+		STRIP=all
 		APPNAME=Mixbus ;
+                VENDOR=Harrison ;
 		shift ;;
 	--public)
 		WITH_NLS=1 ; 
-		INTERNAL_JACK=; 
 		WITH_LADSPA=; 
-		STRIP= ; 
+		STRIP=all ; 
 		APPNAME=Ardour ;
 		shift ;;
 	--allinone)
 		WITH_NLS= ; 
-		INTERNAL_JACK=1; 
 		WITH_LADSPA=1; 
-		STRIP= ; 
+		STRIP=all; 
 		shift ;;
-	--test) INTERNAL_JACK=; WITH_LADSPA=; STRIP= ; shift ;;
+	--test) WITH_LADSPA=; STRIP= ; shift ;;
 
 	#
 	# specific build flags
@@ -60,10 +64,9 @@ while [ $# -gt 0 ] ; do
 
 	--nojack) INTERNAL_JACK= ; shift ;;
 	--noladspa) WITH_LADSPA= ; shift ;;
-	--nostrip) STRIP= ; shift ;;
+	--strip) STRIP=$2 ; shift ; shift ;;
 	--sysdeps) PRINT_SYSDEPS=1; shift ;;
 	--nls) WITH_NLS=1 ; shift ;;
-	--external_jack) EXTERNAL_JACK=$2; shift ; shift ;;
 
 	*)
 		#catch all for unknown arguments
@@ -75,12 +78,14 @@ while [ $# -gt 0 ] ; do
 	esac
 done
 
-if [ x$EXTERNAL_JACK != x -a x$INTERNAL_JACK != x ] ; then
-	echo "It makes no sense to package JACK internally and externally. Please pick one."
+if test x$STRIP != xall -a x$STRIP != xnone -a x$STRIP != xsome ; then
+    echo "Unknown strip option \"$STRIP\""
+    echo "Legal values are: all, none, some"
+    exit 1
 fi
 
 release_version=`grep -m 1 '^VERSION' ../../wscript | awk '{print $3}' | sed "s/'//g"`
-svn_version=`grep -m 1 'svn_revision =' ../../libs/ardour/svn_revision.cc | cut -d"'" -f 2`
+svn_version=`grep -m 1 'svn_revision =' ../../libs/ardour/svn_revision.cc | cut -d"\"" -f 2`
 echo "Version is $release_version / $svn_version"
 info_string="$release_version/$svn_version built on `hostname` by `whoami` on `date`"
 echo "Info string is $info_string"
@@ -105,13 +110,35 @@ case `uname -m` in
 		;;
 esac
 
+# Figure out the Build Type
+if grep -q "DEBUG = True" ../../build/c4che/default.cache.py; then
+	DEBUG="T"
+else
+	DEBUG="F"
+fi
+
+if [ x$DEBUG = xT ]; then
+    BUILDTYPE="dbg"
+    if [ x$STRIP = xall ] ; then
+        echo "A debug build with --strip all makes no sense - STRIP reset to \"some\""
+        STRIP=some
+    fi
+fi
+
 # the waf build tree to use when copying built/generated files
 
-BUILD_ROOT=../../build/default
+BUILD_ROOT=../../build
 
 # setup directory structure
 
-APPDIR=${APPNAME}_${ARCH}-${release_version}_${svn_version}
+if [ -z "${BUILDTYPE}" ]; then
+	APPDIR=${APPNAME}_${ARCH}-${release_version}_${svn_version}
+	APP_VER_NAME=${APPNAME}-${release_version}_${svn_version}
+else
+	APPDIR=${APPNAME}_${ARCH}-${release_version}_${svn_version}-${BUILDTYPE}
+	APP_VER_NAME=${APPNAME}-${release_version}_${svn_version}-${BUILDTYPE}
+fi
+
 APPBIN=$APPDIR/bin
 APPLIB=$APPDIR/lib
 Libraries=$APPLIB
@@ -120,7 +147,9 @@ Shared=$APPDIR/share
 Plugins=$APPLIB/plugins
 Surfaces=$APPLIB/surfaces
 Panners=$APPLIB/panners
+ExportFormats=$Shared/export
 Locale=$Shared/locale
+MidiMaps=$Shared/midi_maps
 Modules=$Libraries/modules
 Loaders=$Libraries/loaders
 
@@ -156,8 +185,11 @@ mkdir -p $Loaders
 mkdir -p $Shared
 mkdir -p $Locale
 mkdir -p $Surfaces
+mkdir -p $MidiMaps
+mkdir -p $ExportFormats
 mkdir -p $Panners
 mkdir -p $Shared/templates
+mkdir -p $Shared/doc
 
 # maybe set variables
 ENVIRONMENT=environment
@@ -190,46 +222,39 @@ MAIN_EXECUTABLE=ardour-3.0
 
 echo "Copying ardour executable ...."
 cp $BUILD_ROOT/gtk2_ardour/$MAIN_EXECUTABLE $APPBIN
-if test x$STRIP != x ; then
+if test x$STRIP = xall ; then
 	strip $APPBIN/$MAIN_EXECUTABLE
 fi
 
 # copy locale files
+# note that at present(feb 2011), the .mo files end up in the source tree which is
+# not really as it should be.
 if test x$WITH_NLS != x ; then
 	echo "NLS support ..."
 	echo "I hope you remembered to run scons msgupdate!"
 	LINGUAS=
-	files=`find $BUILD_ROOT/gtk2_ardour/ -name "*.mo"`
 
-	if [ -z "$files" ]; then
-		echo ""
-		echo "!!!! WARNING !!!! - Did not find any .mo files in $BUILD_ROOT/gtk2_ardour"
-		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/gtk2_ardour.mo
-		LINGUAS="$LINGUAS $lang"
-	done
-
-	files=`find ../../libs/ardour/ -name "*.mo"`
+        for dl in gtk2_ardour libs/ardour libs/gtkmm2ext ; do 
+	    files=`find ../../$dl -name "*.mo"`
 
-	if [ -z "$files" ]; then
+	    if [ -z "$files" ]; then
 		echo ""
-		echo "!!!! WARNING !!!! - Did not find any .mo files in ../../libs/ardour"
+		echo "!!!! WARNING !!!! - Did not find any .mo files in ../../$dl"
 		echo ""
-	fi
-
-	for file in $files 
-	do
+	    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/libardour.mo
+		cp $file $Locale/$lang/LC_MESSAGES/`basename $dl`
+                if echo $LINGUAS | grep $lang >/dev/null 2>&1 ; then
+                    :
+                else 
+		    LINGUAS="$LINGUAS $lang"
+                fi
+	    done
 	done
 
 	GTK_MESSAGES="atk10.mo gdk-pixbuf.mo gtk20-properties.mo gtk20.mo atk10.mo glib20.mo"
@@ -258,9 +283,9 @@ GTKROOT=`pkg-config --libs-only-L gtk+-2.0 | sed -e "s/-L//" -e "s/[[:space:]]//
 if [ ! -z "$GTKROOT" ]; then
 	echo "Found GTKROOT using pkg-config"
 elif [ -d /usr/lib/gtk-2.0 ]; then
-	GTKROOT="/usr/lib/gtk-2.0"
+	GTKROOT="/usr/lib"
 elif [ -d /usr/local/lib/gtk-2.0 ]; then
-	GTKROOT="/usr/local/lib/gtk-2.0"
+	GTKROOT="/usr/local/lib"
 else
 	echo ""
 	echo "!!! ERROR !!! - Unable to locate gtk-2.0 directory. Packager will exit"
@@ -292,9 +317,9 @@ PANGOROOT=`pkg-config --libs-only-L pango | sed -e "s/-L//" -e "s/[[:space:]]//g
 if [ ! -z "$PANGOROOT" ]; then
 	echo "Found PANGOROOT using pkg-config"
 elif [ -d /usr/lib/pango ]; then
-	PANGOROOT="/usr/lib/pango"
+	PANGOROOT="/usr/lib"
 elif [ -d /usr/local/lib/pango ]; then
-	PANGOROOT="/usr/local/lib/pango"
+	PANGOROOT="/usr/local/lib"
 else
 	echo ""
 	echo "!!! ERROR !!! - Unable to locate pango directory. Packager will exit"
@@ -374,18 +399,18 @@ gdk-pixbuf-query-loaders | sed "s?$GDKPIXBUFLIB/?@ROOTDIR@/?" > $Etc/gdk-pixbuf.
 # We sort of rely on clearlooks, so include a version
 # this one is special - we will set GTK_PATH to $Libraries/clearlooks
 
-#if [ ! -e ${GTKLIB}/engines/libclearlooks.so ]; then
-#	echo ""
-#	echo "!!! ERROR !!! - not able to locate libclearlooks.so"
-#	echo ""
-#	echo "Packager with exit"
-#	exit 1
-#fi
+if [ ! -e ${GTKLIB}/engines/libclearlooks.so ]; then
+	echo ""
+	echo "!!! ERROR !!! - not able to locate libclearlooks.so"
+	echo ""
+	echo "Packager with exit"
+	exit 1
+fi
 
-#echo "Copying clearlooks ..."
-#cp ${GTKLIB}/engines/libclearlooks.so $Libraries
-#mkdir -p $Libraries/clearlooks/engines
-#(cd $Libraries/clearlooks/engines && ln -s ../../libclearlooks* libclearlooks.so )
+echo "Copying clearlooks ..."
+cp ${GTKLIB}/engines/libclearlooks.so $Libraries
+mkdir -p $Libraries/clearlooks/engines
+(cd $Libraries/clearlooks/engines && ln -s ../../libclearlooks* libclearlooks.so )
 
 # LADSPA
 if test x$WITH_LADSPA != x ; then
@@ -400,20 +425,37 @@ if test x$WITH_LADSPA != x ; then
 	fi
 fi
 
-# XXX STILL NEED TO DO PANNERS FOR TRUNK
-cp $BUILD_ROOT/libs/surfaces/*/libardour_*.so* $Surfaces
+# Control Surfaces
+cp $BUILD_ROOT/libs/surfaces/*/libardour*.so* $Surfaces
 # hack ... move libardour_cp back into Libraries
-mv $Surfaces/libardour_cp.so* $Libraries
+mv $Surfaces/libardourcp.so* $Libraries
+
+# 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
+
+# ExportFormats
+# got to be careful with names here
+for x in $BUILD_ROOT/../export/*.preset $BUILD_ROOT/../export/*.format ; do
+    cp "$x" $ExportFormats
+done
+
+# Panners
+cp $BUILD_ROOT/libs/panners/*/lib*.so* $Panners
 
 # VAMP plugins that we use
 cp $BUILD_ROOT/libs/vamp-plugins/libardourvampplugins.so* $Libraries
 
 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/libgnomecanvasmm:$OURLIBDIR/libsndfile:$OURLIBDIR/evoral:$OURLIBDIR/evoral/src/libsmf:$OURLIBDIR/audiographer:$OURLIBDIR/timecode:$OURLIBDIR/taglib
+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/libgnomecanvasmm:$OURLIBDIR/libsndfile:$OURLIBDIR/evoral:$OURLIBDIR/evoral/src/libsmf:$OURLIBDIR/audiographer:$OURLIBDIR/timecode:$OURLIBDIR/taglib:$OURLIBDIR/qm-dsp
 
 echo $OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 
 checkedIdx=0
+deplibs=
 
 while [ true ] ; do 
 	missing=false
@@ -474,6 +516,10 @@ while [ true ] ; do
 					echo "Copying dependant lib $dep    (required by ${parent})"
 					cp $dep $Libraries
 				fi
+                                if echo $dep | grep -sq '^/' ; then
+                                    # absolute path, candidate for stripping
+                                    deplibs="$deplibs $base"
+                                fi
 				missing=true
 			fi
 		done
@@ -486,8 +532,15 @@ done
 echo
 
 # strip libraries
-echo Stripping libraries
-find $APPLIB/ -name "*.so*" | xargs strip
+if test x$STRIP = xall ; then
+    echo Stripping all libraries
+    find $APPLIB/ -name "*.so*" | xargs strip
+elif test x$STRIP = xsome ; then
+    echo Stripping dependent libraries
+    for l in $deplibs ; do
+        strip $APPLIB/$l
+    done
+fi
 find $APPLIB/ -name "*.so*" | xargs chmod a+rx
 
 echo "Copying other stuff to $APPDIR  ..."
@@ -497,16 +550,18 @@ echo "Copying other stuff to $APPDIR  ..."
 cp $BUILD_ROOT/gtk2_ardour/mnemonic-us.bindings  $Etc
 cp $BUILD_ROOT/gtk2_ardour/ardour.menus $Etc
 cp $BUILD_ROOT/ardour_system.rc $Etc/ardour_system.rc
-# temporarily unavailable
-#cp $BUILD_ROOT/gtk2_ardour/ardour3_ui_light.rc $Etc
-cp $BUILD_ROOT/gtk2_ardour/ardour3_ui_dark.rc $Etc
+cp $BUILD_ROOT/gtk2_ardour/ardour3*.rc $Etc
 
 # these are copied straight from the 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 -r ../../gtk2_ardour/icons $Etc
 cp -r ../../gtk2_ardour/pixmaps $Etc
+cp ../../gtk2_ardour/step_editing.bindings $Etc
+cp ../../gtk2_ardour/mixer.bindings $Etc
+
 
 #
 # put sooper sekrit ingredients here and they will be copied
@@ -527,34 +582,29 @@ for svndir in `find $APPDIR -name .svn -type d`; do
 	rm -rf $svndir
 done
 
+#
+# Add the uninstaller
+#
+sed -e "s/%REPLACE_PGM%/${APPNAME}/" -e "s/%REPLACE_VENDOR%/${VENDOR}/" -e "s/%REPLACE_VERSION%/${release_version}/" -e "s/%REPLACE_BUILD%/${svn_version}/" -e "s/%REPLACE_TYPE%/${BUILDTYPE}/" < uninstall.sh.in > $APPBIN/${APP_VER_NAME}.uninstall.sh
+chmod a+x $APPBIN/${APP_VER_NAME}.uninstall.sh
+
 #Sanity Check file
 if [ -e $BUILD_ROOT/tools/sanity_check/sanityCheck ]; then
-	cp $BUILD_ROOT/tools/sanity_check/sanityCheck $APPDIR
+	cp $BUILD_ROOT/tools/sanity_check/sanityCheck $APPBIN
 else
 	echo "!!!ERROR !!! sanityCheck program is missing. packager will exit without being complete"
 	exit 1
 fi
 
-#
-# and now ... the final package
-# 
-
-if [ x$MIXBUS != x ] ; then
-
-	# Mixbus packaging
-
-	echo "Creating Mixbus packaging directory"
-	cp MixBus_Install_QuickStart.pdf "$APPDIR/Mixbus Install & Quick Start Guide.pdf"
-	
-	if [ -x $EXTERNAL_JACK != x ] ; then
-		cp $EXTERNAL_JACK $PRODUCT_PKG_DIR
-	fi
-fi
-
 echo "Building tarball ..."
 
 rm -f $APPDIR.tar.bz2
 tar -cjf $APPDIR.tar.bz2 $APPDIR
 
+echo "Calculating bundle size"
+du -sb $APPDIR/  | awk '{print $1}' > $APPDIR.size
+
+rm -rf $APPDIR/
+
 echo "Done."