more build script cleanups
[ardour.git] / tools / linux_packaging / build
index 0ffd1024c880f05ebbd8aa9b82d5639aaf9affac..4e715e77c99d6ffbf1ec23eec1eef00773457399 100755 (executable)
@@ -1,18 +1,27 @@
 #!/bin/bash
 
-#
-
-. ./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. See "noderun" for a complete build script.
+
+# where the GTK stack is installed
+GTKSTACK_ROOT=$HOME/gtk/inst
+# where the Ardour dependencies are installed
+ARDOURSTACK_ROOT=$HOME/a3/inst
+# the waf build tree to use when copying built/generated files
+BUILD_ROOT=../../build
 
 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 +43,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 +67,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,8 +81,10 @@ 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"`
@@ -105,25 +113,50 @@ case `uname -m` in
                ;;
 esac
 
-# the waf build tree to use when copying built/generated files
+# Figure out the Build Type
+if grep -q "DEBUG = True" ../../build/c4che/default.cache.py; then
+       DEBUG="T"
+else
+       DEBUG="F"
+fi
 
-BUILD_ROOT=../../build/default
+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
 
 # 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
 Etc=$APPDIR/etc
 Shared=$APPDIR/share
+
 Plugins=$APPLIB/plugins
 Surfaces=$APPLIB/surfaces
 Panners=$APPLIB/panners
-Locale=$Shared/locale
+
 Modules=$Libraries/modules
 Loaders=$Libraries/loaders
 
+Templates=$Shared/templates
+ExportFormats=$Shared/export
+Locale=$Shared/locale
+MidiMaps=$Shared/midi_maps
+PatchFiles=$Shared/patchfiles
+MackieControl=$Shared/mcp
 
 if [ x$PRINT_SYSDEPS != x ] ; then
 #
@@ -156,8 +189,14 @@ mkdir -p $Loaders
 mkdir -p $Shared
 mkdir -p $Locale
 mkdir -p $Surfaces
+mkdir -p $MidiMaps
+mkdir -p $PatchFiles
+mkdir -p $MackieControl
+mkdir -p $ExportFormats
 mkdir -p $Panners
+mkdir -p $Templates
 mkdir -p $Shared/templates
+mkdir -p $Shared/doc
 
 # maybe set variables
 ENVIRONMENT=environment
@@ -185,51 +224,44 @@ echo export 'PATH=/usr/local/bin:/opt/bin:$PATH' >> $ENVIRONMENT
 
 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
+# the 3.0 here is not the same as "release-version" because the latter may include "-betaN" etc.
 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"
@@ -253,139 +285,38 @@ else
        echo "Skipping NLS support"
 fi
 
-### Find gtk ###
-GTKROOT=`pkg-config --libs-only-L gtk+-2.0 | sed -e "s/-L//" -e "s/[[:space:]]//g"`
-if [ ! -z "$GTKROOT" ]; then
-       echo "Found GTKROOT using pkg-config"
-elif [ -d /usr/lib/gtk-2.0 ]; then
-       GTKROOT="/usr/lib/gtk-2.0"
-elif [ -d /usr/local/lib/gtk-2.0 ]; then
-       GTKROOT="/usr/local/lib/gtk-2.0"
-else
-       echo ""
-       echo "!!! ERROR !!! - Unable to locate gtk-2.0 directory. Packager will exit"
-       echo ""
-       exit 1
-fi
-
-echo "GTKROOT is ${GTKROOT}"
-versionDir=`ls ${GTKROOT}/gtk-2.0/ | grep "[0-9]*\.[0-9]*\.[0-9]*"`
-
-num=0
-for name in $versionDir ; do
-    num=$(($num + 1))
-done
-
-if [ $num -eq 1 ]; then
-       GTKLIB=${GTKROOT}/gtk-2.0/$versionDir
-       echo "GTKLIB is ${GTKLIB}"
-else
-       echo ""
-       echo "!!! ERROR !!! - More than one gtk-2.0 version found in ${GTKROOT}/gtk-2.0/  ( $versionDir ). Packager will exit"
-       echo ""
-       exit 1
-fi
-
-
-### Find pango ###
-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"
-elif [ -d /usr/local/lib/pango ]; then
-       PANGOROOT="/usr/local/lib/pango"
-else
-       echo ""
-       echo "!!! ERROR !!! - Unable to locate pango directory. Packager will exit"
-       echo ""
-       exit 1
-fi
-
-echo "PANGOROOT is ${PANGOROOT}"
-versionDir=`ls ${PANGOROOT}/pango/ | grep "[0-9]*\.[0-9]*\.[0-9]*"`
-
-num=0
-for name in $versionDir ; do
-       num=$(($num + 1))
-done
-
-if [ $num -eq 1 ]; then
-       PANGOLIB=${PANGOROOT}/pango/$versionDir
-       echo "PANGOLIB is ${PANGOLIB}"
-else
-       echo ""
-       echo "!!! ERROR !!! - More than one pango version found in ${PANGOROOT}/pango/  ( $versionDir ). Packager will exit"
-       echo ""
-       exit 1
-fi
-
-
-### Find gdk-pixbuf ###
-GDKPIXBUFROOT=`pkg-config --libs-only-L gdk-pixbuf-2.0 | sed -e "s/-L//" -e "s/[[:space:]]//g"`
-if [ ! -z "$GDKPIXBUFROOT" ]; then
-       echo "Found GDKPIXBUFROOT using pkg-config"
-elif [ -d /usr/lib/gdk-pixbuf-2.0 ]; then
-       GDKPIXBUFROOT="/usr/lib/gdk-pixbuf-2.0"
-elif [ -d /usr/local/lib/gdk-pixbuf-2.0 ]; then
-       GDKPIXBUFROOT="/usr/local/lib/gdk-pixbuf-2.0"
-elif [ -d ${GTKLIB}/loaders ]; then  #odd ball case
-       GDKPIXBUFROOT=${GTKROOT}
-       GDKPIXBUFLIB=${GTKLIB}
-else
-       echo ""
-       echo "!!! ERROR !!! - Unable to locate gdk-pixbuf-2.0 directory. Packager will exit"
-       echo ""
-       exit 1
-fi
-
-echo "GDKPIXBUFROOT is ${GDKPIXBUFROOT}"
-
-if [ -z ${GDKPIXBUFLIB} ]; then
-       versionDir=`ls ${GDKPIXBUFROOT}/gdk-pixbuf-2.0/ | grep "[0-9]*\.[0-9]*\.[0-9]*"`
-
-       num=0
-       for name in $versionDir ; do
-           num=$(($num + 1))
-       done
-
-       if [ $num -eq 1 ]; then
-               GDKPIXBUFLIB=${GDKPIXBUFROOT}/gdk-pixbuf-2.0/$versionDir
-               echo "GDKPIXBUFLIB is ${GDKPIXBUFLIB}"
-       else
-               echo ""
-               echo "!!! ERROR !!! - More than one gdk-pixbuf-2.0 version found in ${GDKPIXBUFROOT}/pango/  ( $versionDir ). Packager will exit"
-               echo ""
-               exit 1
-       fi
-fi
-
-
+#
+# Copy stuff that may be dynamically loaded
+# 
 
+cp -R $GTKSTACK_ROOT/etc/fonts $Etc
+cp -R $GTKSTACK_ROOT/etc/* $Etc
 echo "Copying all Pango modules ..."
-cp -R $PANGOLIB/modules/*.so $Modules
-
+cp -R $GTKSTACK_ROOT/lib/pango/1.6.0/modules/*.so $Modules
 echo "Copying all GDK Pixbuf loaders ..."
-cp -R $GDKPIXBUFLIB/loaders/*.so $Loaders
+cp -R $GTKSTACK_ROOT/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so $Loaders
+# charset alias file
+cp -R $GTKSTACK_ROOT/lib/charset.alias $Etc
 
-pango-querymodules | sed "s?$PANGOLIB/?@ROOTDIR@/?" > $Etc/pango.modules.in
-gdk-pixbuf-query-loaders | sed "s?$GDKPIXBUFLIB/?@ROOTDIR@/?" > $Etc/gdk-pixbuf.loaders.in
+pango-querymodules | sed "s?$GTKSTACK_ROOT/lib/pango/1.6.0/?@ROOTDIR@/?" > $Etc/pango.modules.in
+gdk-pixbuf-query-loaders | sed "s?$GTKSTACK_ROOT/lib/gdk-pixbuf-2.0/2.10.0/?@ROOTDIR@/?" > $Etc/gdk-pixbuf.loaders.in
 
 # 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
+clearlooks_so=${GTKLIB}/engines/libclearlooks.so
+if [ ! -e $clearlooks.so ]; then
+       echo "!!! ERROR !!! - not able to locate libclearlooks.so"
+       echo ""
+       echo "Packager with exit"
+       exit 1
+else
+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 $clearlooks_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 +331,61 @@ 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
+
+# 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" $MackieControl
+    echo Copied Mackie Control file $x 
+done
+
+# Templates
+for f in $BUILD_ROOT/../templates/* ; do 
+    if [ -d "$f" ] ; then
+       echo Template: $f ; cp -r "$f" $Templates ; 
+    fi
+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
 
+# Suil modules
+cp $ARDOURSTACK_ROOT/lib/suil-0/lib* $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
@@ -437,7 +409,6 @@ while [ true ] ; do
                # do not include libjack
                deps=`LD_LIBRARY_PATH=$OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} ldd $file | awk '{print $3}'`
 
-               # LD_LIBRARY_PATH=$OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} ldd $file | egrep "(/opt/|/local/|libs/|/usr/lib|/gtk)" | grep -v 'libjack\.'
                echo -n "."
                for dep in $deps ; do
                        if test "not" = ${dep}; then 
@@ -456,9 +427,13 @@ while [ true ] ; do
                        if echo $dep | grep -qs "^/lib/" ; then continue; fi
                        # don't include jack
                        if echo $dep | grep -qs libjack ; then continue; fi
+                       # 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 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++
@@ -474,6 +449,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 +465,19 @@ done
 echo
 
 # strip libraries
-echo Stripping libraries
-find $APPLIB/ -name "*.so*" | xargs strip
+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
+    # and strip ...
+    find $APPLIB/ -name "*.so*" | xargs strip
+elif test x$STRIP = xsome ; then
+    echo Stripping dependent libraries
+    for l in $deplibs ; do
+        chmod u+w $APPLIB/$l
+        strip $APPLIB/$l
+    done
+fi
 find $APPLIB/ -name "*.so*" | xargs chmod a+rx
 
 echo "Copying other stuff to $APPDIR  ..."
@@ -497,16 +487,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
+cp -r ../../gtk2_ardour/icons $Shared
+cp -r ../../gtk2_ardour/pixmaps $Shared
+
 
 #
 # put sooper sekrit ingredients here and they will be copied
@@ -519,42 +511,35 @@ fi
 # share stuff
 
 cp -R ../../gtk2_ardour/splash.png $Shared
-# currently no templates
-#cp ../../templates/*.template $Shared/templates/
 
 # 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
 
+#
+# 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."