X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tools%2Flinux_packaging%2Fbuild;h=1928fadd8f7fc85afbb77101be9360ddd25e2d78;hb=30968b854257cb5f9159ca59589f783c85615601;hp=50fb408fe48aad2724621604edb0753c38c5a46b;hpb=a47cfd7f6f5fe3c9755084ec9523367ba7cd6f80;p=ardour.git diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index 50fb408fe4..1928fadd8f 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -1,18 +1,22 @@ #!/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. +# 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= WITH_LADSPA=0 +WITH_HARVID= STRIP=all PRINT_SYSDEPS= WITH_NLS= @@ -67,6 +71,7 @@ while [ $# -gt 0 ] ; do --strip) STRIP=$2 ; shift ; shift ;; --sysdeps) PRINT_SYSDEPS=1; shift ;; --nls) WITH_NLS=1 ; shift ;; + --harvid) WITH_HARVID=1 ; shift ;; *) #catch all for unknown arguments @@ -84,10 +89,10 @@ if test x$STRIP != xall -a x$STRIP != xnone -a x$STRIP != xsome ; then 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` -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 $version / $commit" +info_string="$version ($commit) built on `hostname` by `whoami` on `date`" echo "Info string is $info_string" # Figure out our CPU type @@ -96,11 +101,13 @@ case `uname -m` in echo "Architecture is x86" ARCH='x86' ARCH_BITS='32-bit' + MULTIARCH='i386-linux-gnu' ;; x86_64|amd64|AMD64) echo "Architecture is x86_64" ARCH='x86_64' ARCH_BITS='64-bit' + MULTIARCH='x86_64-linux-gnu' ;; *) echo "" @@ -110,13 +117,6 @@ 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 @@ -125,18 +125,14 @@ if [ x$DEBUG = xT ]; then fi fi -# the waf build tree to use when copying built/generated files - -BUILD_ROOT=../../build - # setup directory structure if [ -z "${BUILDTYPE}" ]; then - APPDIR=${APPNAME}_${ARCH}-${release_version}_${svn_version} - APP_VER_NAME=${APPNAME}-${release_version}_${svn_version} + APPDIR=${APPNAME}_${ARCH}-${version} + APP_VER_NAME=${APPNAME}-${version} else - APPDIR=${APPNAME}_${ARCH}-${release_version}_${svn_version}-${BUILDTYPE} - APP_VER_NAME=${APPNAME}-${release_version}_${svn_version}-${BUILDTYPE} + APPDIR=${APPNAME}_${ARCH}-${version}-${BUILDTYPE} + APP_VER_NAME=${APPNAME}-${version}-${BUILDTYPE} fi APPBIN=$APPDIR/bin @@ -196,7 +192,6 @@ mkdir -p $MackieControl mkdir -p $ExportFormats mkdir -p $Panners mkdir -p $Templates -mkdir -p $Shared/templates mkdir -p $Shared/doc # maybe set variables @@ -225,7 +220,7 @@ 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 ...." @@ -242,12 +237,21 @@ if test x$WITH_NLS != x ; then echo "I hope you remembered to run scons msgupdate!" LINGUAS= - for dl in gtk2_ardour libs/ardour libs/gtkmm2ext ; do - files=`find ../../$dl -name "*.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 ../../$dl" + echo "!!!! WARNING !!!! - Did not find any .mo files in ../../$pkg" echo "" fi @@ -256,7 +260,8 @@ if test x$WITH_NLS != x ; then echo $file lang=`basename $file | sed 's/\.mo//'` mkdir -p $Locale/$lang/LC_MESSAGES - cp $file $Locale/$lang/LC_MESSAGES/`basename $dl` + 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 @@ -266,7 +271,7 @@ if test x$WITH_NLS != x ; then done GTK_MESSAGES="atk10.mo gdk-pixbuf.mo gtk20-properties.mo gtk20.mo atk10.mo glib20.mo" - LOCALEROOT=/usr/share/locale + LOCALEROOT=$GTKSTACK_ROOT/share/locale for l in $LINGUAS ; do echo "Copying GTK i18n files for $l..." @@ -286,166 +291,40 @@ else echo "Skipping NLS support" fi -### Find fontconfig ### -FCROOT=`pkg-config --libs-only-L fontconfig | sed -e "s/-L//" -e "s/[[:space:]]//g"` -if [ ! -z "$FCROOT" ]; then - echo "Found FCOOT using pkg-config" - FCETC=`dirname $FCROOT`/etc -elif [ -d /usr/lib/gtk-2.0 ]; then - FCETC="/etc" -elif [ -d /usr/local/lib/gtk-2.0 ]; then - FCETC="/usr/local/etc" -else - echo "" - echo "!!! ERROR !!! - Unable to locate fontconfig directory. Packager will exit" - echo "" - exit 1 -fi - -echo "Copying Fontconfig files to $Etc ..." -cp -r $FCETC/fonts $Etc - -### 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" -elif [ -d /usr/local/lib/gtk-2.0 ]; then - GTKROOT="/usr/local/lib" -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" -elif [ -d /usr/local/lib/pango ]; then - PANGOROOT="/usr/local/lib" -elif [ -d /usr/lib/x86_64-linux-gnu/pango ]; then - PANGOROOT="/usr/lib/x86_64-linux-gnu" -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" -elif [ -d /usr/local/lib/gdk-pixbuf-2.0 ]; then - GDKPIXBUFROOT="/usr/local/lib" -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/* $Etc +echo "Copying all Pango modules ..." +cp -R $GTKSTACK_ROOT/lib/pango/1.6.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 -echo "Copying all Pango modules ..." -cp -R $PANGOLIB/modules/*.so $Modules +cat > pangorc < $Etc/pango.modules.in +rm pangorc -echo "Copying all GDK Pixbuf loaders ..." -cp -R $GDKPIXBUFLIB/loaders/*.so $Loaders +# 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 -pango-querymodules | sed "s?$PANGOLIB/?@ROOTDIR@/?" > $Etc/pango.modules.in -gdk-pixbuf-query-loaders | sed "s?$GDKPIXBUFLIB/?@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 -# We sort of rely on clearlooks, so include a version -# this one is special - we will set GTK_PATH to $Libraries/clearlooks +GTK_ENGINE_DIR=$Libraries/gtkengines/engines +mkdir -p $GTK_ENGINE_DIR -if [ ! -e ${GTKLIB}/engines/libclearlooks.so ]; then - if [ ! -e $BUILD_ROOT/libs/clearlooks-newer/libclearlooks.so ] ; then - echo "" - echo "!!! ERROR !!! - not able to locate libclearlooks.so" - echo "" - echo "Packager with exit" - exit 1 - else - clearlooks_so=$BUILD_ROOT/libs/clearlooks-newer/libclearlooks.so - fi -else - clearlooks_so=${GTKLIB}/engines/libclearlooks.so -fi +echo "Copying GTK engines ..." +cp $BUILD_ROOT/libs/clearlooks-newer/libclearlooks.so $Libraries +(cd $GTK_ENGINE_DIR && ln -s ../../libclearlooks.so . ) -echo "Copying clearlooks ..." -cp $clearlooks_so $Libraries -mkdir -p $Libraries/clearlooks/engines -(cd $Libraries/clearlooks/engines && ln -s ../../libclearlooks* libclearlooks.so ) +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 @@ -461,37 +340,33 @@ if test x$WITH_LADSPA != x ; then fi # Control Surfaces -cp $BUILD_ROOT/libs/surfaces/*/libardour*.so* $Surfaces -# hack ... move libardour_cp back into Libraries -mv $Surfaces/libardourcp.so* $Libraries +cp $BUILD_ROOT/libs/surfaces/*/libardour_*.so* $Surfaces +cp $BUILD_ROOT/libs/surfaces/control_protocol/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 +#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 @@ -505,8 +380,11 @@ 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:$OURLIBDIR/qm-dsp +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/libltc:$OURLIBDIR/qm-dsp echo $OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} @@ -535,12 +413,12 @@ 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 echo "" echo "!!! ERROR !!! - Missing dependant library for $file." + echo "Searched: " $OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} echo "" (LD_LIBRARY_PATH=$OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} ldd $file) echo "" @@ -554,9 +432,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++ @@ -572,6 +454,11 @@ while [ true ] ; do echo "Copying dependant lib $dep (required by ${parent})" cp $dep $Libraries fi + # + # reset RPATH so that the runtime linker never looks + # in places we don't want it to + # + chrpath -r foo $Libraries/`basename $dep` if echo $dep | grep -sq '^/' ; then # absolute path, candidate for stripping deplibs="$deplibs $base" @@ -609,8 +496,8 @@ echo "Copying other stuff to $APPDIR ..." #cp $BUILD_ROOT/gtk2_ardour/ergonomic-us.bindings $Etc 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 -cp $BUILD_ROOT/gtk2_ardour/ardour3*.rc $Etc +cp ../../ardour_system.rc $Etc/ardour_system.rc +cp $BUILD_ROOT/gtk2_ardour/ardour3_ui_*.rc $Etc # these are copied straight from the source tree @@ -634,16 +521,25 @@ fi # share stuff cp -R ../../gtk2_ardour/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 d`; do rm -rf $svndir done +if test x$WITH_HARVID != x ; then + cd $APPBIN + HARVID_VERSION="v0.7.0" # todo make 'latest' symlink on github work somehow. + curl -L http://x42.github.com/harvid/releases/harvid-${MULTIARCH}-${HARVID_VERSION}.tgz \ + | tar -x -z --exclude=README --exclude=harvid.1 --strip-components=1 || exit 1 + cd - +fi + # # 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 +sed -e "s/%REPLACE_PGM%/${APPNAME}/" -e "s/%REPLACE_VENDOR%/${VENDOR}/" -e "s/%REPLACE_VERSION%/${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