From 27e3bae19e04bbcfeb010e9bfc0adbcd62593b2c Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 11 Nov 2014 15:29:51 +0100 Subject: [PATCH] linux packaging: add some checks to reduce warnings --- tools/linux_packaging/build | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index cce7df2702..72b7bf3893 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -398,20 +398,33 @@ 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 +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 $VFork +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 +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 -- 2.30.2