add linux packaging script(s) from 2.0-ongoing
[ardour.git] / tools / linux_packaging / build
index 4d2d0d9f1ae579845a060aeda3bb71b35994bd19..1c80f8d45bd99f4f77b1477db7919b0f11291e52 100755 (executable)
@@ -15,42 +15,55 @@ PRINT_SYSDEPS=
 WITH_NLS=
 EXTERNAL_JACK=
 
+if [ $# -eq 0 ] ; then
+       echo ""  
+       echo "ERROR - Please specify build type"
+       echo "    --public"
+       echo "    --sae"
+       echo ""  
+       exit 1
+fi
+
 while [ $# -gt 0 ] ; do
-    echo "arg = $1"
-    case $1 in
+       echo "arg = $1"
+       case $1 in
 
        #
        # top level build targets
        #
 
-       --sae) WITH_NLS= ; 
-               SAE=1 ; 
-              INTERNAL_JACK=1; 
-              WITH_LADSPA=1; 
-               STRIP= ; 
-              APPNAME=Ardour ;
-              shift ;;
-       --mixbus) MIXBUS=1; 
-                 WITH_NLS=1 ; 
-                  SAE= ; 
-                  INTERNAL_JACK=; 
-                  WITH_LADSPA=; 
-                  STRIP= ; 
-                 APPNAME=Mixbus ;
-                  shift ;;
-       --public) WITH_NLS=1 ; 
-                 SAE= ; 
-                 INTERNAL_JACK=; 
-                  WITH_LADSPA=; 
-                  STRIP= ; 
-                 APPNAME=Ardour ;
-                 shift ;;
-       --allinone) SAE= ; 
-                   WITH_NLS= ; 
-                   INTERNAL_JACK=1; 
-                   WITH_LADSPA=1; 
-                   STRIP= ; 
-                   shift ;;
+       --sae)
+               WITH_NLS= ; 
+               SAE=1 ; 
+               INTERNAL_JACK=1; 
+               WITH_LADSPA=1; 
+               STRIP= ; 
+               APPNAME=Ardour ;
+               shift ;;
+       --mixbus)
+               MIXBUS=1; 
+               WITH_NLS=1 ; 
+               SAE= ; 
+               INTERNAL_JACK=; 
+               WITH_LADSPA=; 
+               STRIP= ; 
+               APPNAME=Mixbus ;
+               shift ;;
+       --public)
+               WITH_NLS=1 ; 
+               SAE= ; 
+               INTERNAL_JACK=; 
+               WITH_LADSPA=; 
+               STRIP= ; 
+               APPNAME=Ardour ;
+               shift ;;
+       --allinone)
+               SAE= ; 
+               WITH_NLS= ; 
+               INTERNAL_JACK=1; 
+               WITH_LADSPA=1; 
+               STRIP= ; 
+               shift ;;
        --test) SAE= ; INTERNAL_JACK=; WITH_LADSPA=; STRIP= ; shift ;;
 
        #
@@ -63,11 +76,19 @@ while [ $# -gt 0 ] ; do
        --sysdeps) PRINT_SYSDEPS=1; shift ;;
        --nls) WITH_NLS=1 ; shift ;;
        --external_jack) EXTERNAL_JACK=$2; shift ; shift ;;
-    esac
+
+       *)
+               #catch all for unknown arguments
+               echo ""
+               echo "!!! ERROR !!! - Unknown argument $1"
+               echo ""
+               exit 1
+               ;;
+       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."
+       echo "It makes no sense to package JACK internally and externally. Please pick one."
 fi
 
 release_version=`grep -m 1 '^ardour_version' ../../SConstruct | cut -d' ' -f 3 | sed "s/'//g"`
@@ -76,9 +97,29 @@ 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"
 
+# Figure out our CPU type
+case `uname -m` in
+       i[3456789]86|x86|i86pc)
+               echo "Architecture is x86"
+               ARCH='x86'
+               ARCH_BITS='32-bit'
+               ;;
+       x86_64|amd64|AMD64)
+               echo "Architecture is x86_64"
+               ARCH='x86_64'
+               ARCH_BITS='64-bit'
+               ;;
+       *)
+               echo ""
+               echo "ERROR - Unknown architecture `uname -m`"
+               echo ""
+               exit 1
+               ;;
+esac
+
 # setup directory structure
 
-APPDIR=${APPNAME}
+APPDIR=${APPNAME}_${ARCH}-${release_version}_${svn_version}
 APPBIN=$APPDIR/bin
 APPLIB=$APPDIR/lib
 Libraries=$APPLIB
@@ -91,23 +132,23 @@ Locale=$Shared/locale
 Modules=$Libraries/modules
 Loaders=$Libraries/loaders
 
+
 if [ x$PRINT_SYSDEPS != x ] ; then
 #
 # print system dependencies
 #
 
-    for file in $APPBIN/* $Libraries/* $Modules/* $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)" 
-    done | sort | uniq
-    exit 0
+       for file in $APPBIN/* $Libraries/* $Modules/* $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)" 
+       done | sort | uniq
+       exit 0
 fi
 
 echo "Removing old $APPDIR tree ..."
-
-rm -rf $APPDIR
+rm -rf $APPDIR/
 
 echo "Building new app directory structure ..."
 
@@ -132,25 +173,21 @@ rm -f $ENVIRONMENT
 touch $ENVIRONMENT
 
 if test x$SAE != x ; then
-    appname="Ardour2/SAE"
-    echo "export ARDOUR_SAE=true" >> $ENVIRONMENT
-    #
-    # current default for SAE version is German keyboard layout without a keypad
-    #
-    echo export ARDOUR_KEYBOARD_LAYOUT=de-nokeypad >> $ENVIRONMENT
-    echo export ARDOUR_UI_CONF=ardour2_ui_sae.conf >> $ENVIRONMENT
-    echo export ARDOUR2_UI_RC=ardour2_ui_dark_sae.rc >> $ENVIRONMENT
+       echo "export ARDOUR_SAE=true" >> $ENVIRONMENT
+       #
+       # current default for SAE version is German keyboard layout without a keypad
+       #
+       echo export ARDOUR_KEYBOARD_LAYOUT=de-nokeypad >> $ENVIRONMENT
+       echo export ARDOUR_UI_CONF=ardour2_ui_sae.conf >> $ENVIRONMENT
+       echo export ARDOUR2_UI_RC=ardour2_ui_dark_sae.rc >> $ENVIRONMENT
 elif test x$MIXBUS != x ; then
-    appname="Ardour2/Mixbus"
-    echo export ARDOUR_MIXBUS=true >> $ENVIRONMENT
-    #
-    # current default for MIXBUS version is US keyboard layout without a keypad
-    #
-    echo export ARDOUR_KEYBOARD_LAYOUT=us-nokeypad >> $ENVIRONMENT
-    echo export ARDOUR_UI_CONF=ardour2_ui.conf >> $ENVIRONMENT
-    echo export ARDOUR2_UI_RC=ardour2_ui_dark.rc >> $ENVIRONMENT
-else
-    appname="Ardour2"
+       echo export ARDOUR_MIXBUS=true >> $ENVIRONMENT
+       #
+       # current default for MIXBUS version is US keyboard layout without a keypad
+       #
+       echo export ARDOUR_KEYBOARD_LAYOUT=us-nokeypad >> $ENVIRONMENT
+       echo export ARDOUR_UI_CONF=ardour2_ui.conf >> $ENVIRONMENT
+       echo export ARDOUR2_UI_RC=ardour2_ui_dark.rc >> $ENVIRONMENT
 fi
 
 #
@@ -162,95 +199,223 @@ echo export 'PATH=/usr/local/bin:/opt/bin:$PATH' >> $ENVIRONMENT
 
 # create startup helper script
 
-sed -e "/^%ENV%/r $ENVIRONMENT" -e '/^%ENV%/d' < ardour.sh.in > $APPBIN/ardour2
+sed -e "/^%ENV%/r $ENVIRONMENT" -e '/^%ENV%/d' -e 's/%VER%/'"${release_version}"'/' < ardour.sh.in > $APPBIN/ardour2
 rm $ENVIRONMENT && chmod 775 $APPBIN/ardour2
 MAIN_EXECUTABLE=ardour-$release_version
 
 echo "Copying ardour executable ...."
 cp ../../gtk2_ardour/$MAIN_EXECUTABLE $APPBIN
 if test x$STRIP != x ; then
-    strip $APPBIN/$MAIN_EXECUTABLE
+       strip $APPBIN/$MAIN_EXECUTABLE
 fi
 
 # copy locale files
 if test x$WITH_NLS != x ; then
-    echo "NLS support ..."
-    echo "I hope you remembered to run scons msgupdate!"
-    LINGUAS=
-    for file in ../../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 ../../libs/ardour/*.mo 
-    do
-       lang=`basename $file | sed 's/\.mo//'`
-       mkdir -p $Locale/$lang/LC_MESSAGES
-       cp $file $Locale/$lang/LC_MESSAGES/libardour.mo
-    done
-
-    GTK_MESSAGES="atk10.mo gdk-pixbuf.mo gtk20-properties.mo gtk20.mo atk10.mo glib20.mo"
-    LOCALEROOT=/usr/share/locale
-
-    for l in $LINGUAS ; do
-       echo "Copying GTK i18n files for $l..."
-        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
-         # try with just the language spec
-               just_lang=`echo $l | sed 's/_[A-Z][A-Z]$//'`
-               if [ -f $LOCALEROOT/$just_lang/LC_MESSAGES/$MO ] ; then
-                   cp $LOCALEROOT/$just_lang/LC_MESSAGES/$MO $Locale/$just_lang/LC_MESSAGES
-               fi
-            fi
-        done
-    done
+       echo "NLS support ..."
+       echo "I hope you remembered to run scons msgupdate!"
+       LINGUAS=
+       files=`find ../../gtk2_ardour/ -name "*.mo"`
+
+       if [ -z "$files" ]; then
+               echo ""
+               echo "!!!! WARNING !!!! - Did not find any .mo files in ../../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"`
+
+       if [ -z "$files" ]; then
+               echo ""
+               echo "!!!! WARNING !!!! - Did not find any .mo files in ../../libs/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/libardour.mo
+       done
+
+       GTK_MESSAGES="atk10.mo gdk-pixbuf.mo gtk20-properties.mo gtk20.mo atk10.mo glib20.mo"
+       LOCALEROOT=/usr/share/locale
+
+       for l in $LINGUAS ; do
+               echo "Copying GTK i18n files for $l..."
+               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
+                               # try with just the language spec
+                               just_lang=`echo $l | sed 's/_[A-Z][A-Z]$//'`
+                               if [ -f $LOCALEROOT/$just_lang/LC_MESSAGES/$MO ] ; then
+                                       cp $LOCALEROOT/$just_lang/LC_MESSAGES/$MO $Locale/$just_lang/LC_MESSAGES
+                               fi
+                       fi
+               done
+       done
+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
+       let "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
+       let "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 "Skipping NLS support"
+       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
+               let "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
 
-GTKROOT=`pkg-config --libs-only-L gtk+-2.0 | sed s/-L//`
-GTKROOT=`dirname $GTKROOT`
-echo GTK stack root is $GTKROOT
 
-GTKETC=${GTKROOT}/etc/gtk-2.0
-GTKLIB=${GTKROOT}/lib/gtk-2.0/2.10.0
-PANGOLIB=${GTKROOT}/lib/pango/1.6.0
-GDKPIXBUFLIB=${GTKROOT}/lib/gdk-pixbuf-2.0/2.10.0
 
-cp -R $GTKETC/* $Etc
 echo "Copying all Pango modules ..."
 cp -R $PANGOLIB/modules/*.so $Modules
+
 echo "Copying all GDK Pixbuf loaders ..."
 cp -R $GDKPIXBUFLIB/loaders/*.so $Loaders
 
-pwd=`pwd`
-
-if test x$WITH_LADSPA != x ; then
-    if test x$SAE != x ; then
-       plugdir=sae_ladspa
-    elif 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
-
-pango-querymodules | sed "s?$GTKROOT/lib/pango/[0-9][0-9]*\.[0-9][0-9]*.[0-9][0-9]*/?@ROOTDIR@/?" > $Etc/pango.modules.in
-gdk-pixbuf-query-loaders | sed "s?$GTKROOT/lib/gdk-pixbuf-2.0/[0-9][0-9]*\.[0-9][0-9]*.[0-9][0-9]*/?@ROOTDIR@/?" > $Etc/gdk-pixbuf.loaders.in
+pango-querymodules | sed "s?$PANGOLIB/?@ROOTDIR@/?" > $Etc/pango.modules.in
+gdk-pixbuf-query-loaders | sed "s?$GDKPIXBUFLIB/?@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
-cp /usr/lib64/gtk-2.0/2.10.0/engines/libclearlooks.so $Libraries
+
+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.so* )
+(cd $Libraries/clearlooks/engines && ln -s ../../libclearlooks* libclearlooks.so )
+
+# LADSPA
+if test x$WITH_LADSPA != x ; then
+       if test x$SAE != x ; then
+               plugdir=sae_ladspa
+       elif 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
 
 # XXX STILL NEED TO DO PANNERS FOR TRUNK
 cp ../../libs/surfaces/*/libardour_*.so* $Surfaces
@@ -263,56 +428,88 @@ cp ../../libs/vamp-plugins/libardourvampplugins.so* $Libraries
 OURLIBDIR=../../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
 
+echo $OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+
+checkedIdx=0
+
 while [ true ] ; do 
-    missing=false
-    for file in $APPBIN/* $Libraries/* $Modules/* $Plugins/*.so ; do 
-       if ! file $file | grep -qs ELF ; then
-           continue
-       fi
-        # do not include libjack
-       deps=`LD_LIBRARY_PATH=$OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} ldd $file | awk '{print $3}' | egrep "(/opt/|/local/|libs/|/usr/lib|/gtk)" | grep -v 'libjack\.'`
-       # 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 [ "x$dep" = "xnot" ] ; then 
-                  echo "Missing dependant library. Use ldd to find and fix"
-                  exit 1
-            fi
-
-            # don't use anything mapped at a specific address
-            if  echo $dep | grep -qs '0x' ; then continue; fi
-            # don't include any X Window libraries
-            if echo $dep | grep -qs libX ; then continue; fi  
-            # don't include libc
-            if echo $dep | grep -qs 'libc\.' ; then continue; fi
-
-           base=`basename $dep`
-           if ! test -f $Libraries/$base; then
-               if echo $dep | grep -sq '^libs' ; then
-                    # echo Copying ../../$dep
-                   cp ../../$dep $Libraries
-               else
-                    # echo Copying $dep
-                   cp $dep $Libraries
+       missing=false
+       filelist=`find $APPLIB/ -type f`
+       filelist="$APPBIN/$MAIN_EXECUTABLE $filelist"
+
+       for file in $filelist  ; do 
+               if ! file $file | grep -qs ELF ; then
+                       continue
                fi
-               missing=true
-           fi
+
+               # speed this up a bit by not checking things multiple times.
+               for i in "${depCheckedList[@]}"; do
+                       if [ $i == $file ]; then
+                               continue 2
+                       fi
+               done
+               depCheckedList[$checkIdx]=$file
+               let "checkIdx += 1"
+               
+               # 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 
+                               echo ""
+                               echo "!!! ERROR !!! - Missing dependant library for $file."
+                               echo ""
+                               (LD_LIBRARY_PATH=$OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} ldd $file)
+                               echo ""
+                               echo "!!! ERROR !!! - See Above"
+                               exit 1
+                       fi
+
+                       # don't use anything mapped at a specific address
+                       if echo $dep | grep -qs '0x' ; then continue; fi
+                       # don't include /lib
+                       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 any X Window libraries
+                       if echo $dep | grep -qs libX ; then continue; fi  
+                       if echo $dep | grep -qs libxcb ; 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
+
+                       base=`basename $dep`
+                       if ! test -f $Libraries/$base; then
+                               parent=$(basename ${file})
+                               if echo $dep | grep -sq '^libs' ; then
+                                       echo "Copying dependant lib ../../$dep    (required by ${parent})"
+                                       cp ../../$dep $Libraries
+                               else
+                                       echo "Copying dependant lib $dep    (required by ${parent})"
+                                       cp $dep $Libraries
+                               fi
+                               missing=true
+                       fi
+               done
        done
-    done
-    if test x$missing = xfalse ; then
-       # everything has been found
-       break
-    fi
+       if test x$missing = xfalse ; then
+               # everything has been found
+               break
+       fi
 done
 echo
 
 # strip libraries
 echo Stripping libraries
-strip $APPLIB/*.so*
+find $APPLIB/ -name "*.so*" | xargs strip
+find $APPLIB/ -name "*.so*" | xargs chmod a+rx
 
 echo "Copying other stuff to $APPDIR  ..."
 
-cp ../../gtk2_ardour/ergonomic-us.bindings  $Etc
+cp ../../gtk2_ardour/ergonomic-us.bindings     $Etc
 cp ../../gtk2_ardour/mnemonic-us.bindings  $Etc
 cp ../../gtk2_ardour/SAE-de-keypad.bindings  $Etc
 cp ../../gtk2_ardour/SAE-de-nokeypad.bindings  $Etc
@@ -321,15 +518,15 @@ cp ../../gtk2_ardour/SAE-us-nokeypad.bindings  $Etc
 cp ../../gtk2_ardour/ardour.menus $Etc
 cp ../../gtk2_ardour/ardour-sae.menus $Etc
 if test x$SAE != x ; then
-    cp ../../ardour_system_sae.rc $Etc/ardour_system.rc
-    echo cp ../../ardour_system_sae.rc $Etc/ardour_system.rc
-    cp ../../instant.xml.sae $Etc/instant.xml
-    echo cp ../../instant.xml.sae $Etc/instant.xml
+       cp ../../ardour_system_sae.rc $Etc/ardour_system.rc
+       echo cp ../../ardour_system_sae.rc $Etc/ardour_system.rc
+       cp ../../instant.xml.sae $Etc/instant.xml
+       echo cp ../../instant.xml.sae $Etc/instant.xml
 else
-#    cp ../../ardour_system.rc $Etc/ardour_system.rc
-#    echo FOO cp ../../ardour_system.rc $Etc/ardour_system.rc
-    cp ../../instant.xml $Etc/instant.xml
-    echo cp ../../instant.xml $Etc/instant.xml
+       cp ../../ardour_system.rc $Etc/ardour_system.rc
+       echo cp ../../ardour_system.rc $Etc/ardour_system.rc
+       cp ../../instant.xml $Etc/instant.xml
+       echo cp ../../instant.xml $Etc/instant.xml
 fi
 cp ../../gtk2_ardour/ardour2_ui_sae.conf $Etc
 cp ../../gtk2_ardour/ardour2_ui_default.conf $Etc
@@ -347,7 +544,7 @@ cp -r ../../gtk2_ardour/pixmaps $Etc
 #
 
 if [ -d specialSauce ] ; then
-    cp -r specialSauce $Etc
+       cp -r specialSauce $Etc
 fi
 
 # share stuff
@@ -357,38 +554,46 @@ 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
+       rm -rf $svndir
 done
 
+#Sanity Check file
+if [ -e ../sanity_check/sanityCheck ]; then
+       cp ../sanity_check/sanityCheck $APPDIR
+else
+       echo "!!!ERROR !!! sanityCheck program is missing. packager will exit without being complete"
+       exit 1
+fi
+
 #
 # and now ... the final package
 # 
 
 if [ x$SAE != x ] ; then
        
-    # SAE packaging
-    
-    echo "Creating SAE packaging directory"
-    cp HowToInstallArdourSAE.pdf "$APPDIR/How To Install Ardour SAE.pdf"
-    cp SAE-de-keypad.pdf "$APPDIR/Ardour SAE Shortcuts (keypad).pdf"
-    cp SAE-de-nokeypad.pdf "$APPDIR/Ardour SAE Shortcuts.pdf"
-    
+       # SAE packaging
+       
+       echo "Creating SAE packaging directory"
+       cp HowToInstallArdourSAE.pdf "$APPDIR/How To Install Ardour SAE.pdf"
+       cp SAE-de-keypad.pdf "$APPDIR/Ardour SAE Shortcuts (keypad).pdf"
+       cp SAE-de-nokeypad.pdf "$APPDIR/Ardour SAE Shortcuts.pdf"
+       
 elif [ x$MIXBUS != x ] ; then
 
-     # Mixbus packaging
+       # 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
+       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 ..."
+echo "Building tarball ..."
 
-#rm -f $APPNAME-$release_version.tar.bz2
-#tar -jcf $APPNAME-$release_version.tar.bz2 $APPDIR
+rm -f $APPDIR.tar.bz2
+tar -cjf $APPDIR.tar.bz2 $APPDIR
 
 echo "Done."