unify ard* scripts for both scons & waf builds

git-svn-id: svn://localhost/ardour2/branches/3.0@4688 d708f5d6-7413-0410-9779-e7cbd77b26cf

6 files changed, 37 insertions, 53 deletions

diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index 2667cfa5a5..6939626fca 100644
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -468,9 +468,11 @@ for b in [ 'SAE-de-keypad',  'SAE-de-nokeypad', 'SAE-us-keypad', 'SAE-us-nokeypa
 	src_file = target_file + '.in'
 	Default (env.SubstInFile (target_file, src_file, SUBST_DICT = keybindings_dict))
 
-my_subst_dict['%INSTALL_PREFIX%'] = final_prefix
-my_subst_dict['%LIBDIR%'] = env['LIBDIR']
-my_subst_dict['%VERSION%'] = ardour_version
+my_subst_dict['@INSTALL_PREFIX@'] = final_prefix
+my_subst_dict['@LIBDIR@'] = env['LIBDIR']
+my_subst_dict['@LIBS@'] = 'libs'
+my_subst_dict['@VERSION@'] = ardour_version
+my_subst_dict['@EXECUTABLE@'] = 'ardour-' + ardour_version
 
 ardoursh = env.SubstInFile ('ardour.sh','ardour.sh.in', SUBST_DICT = my_subst_dict);
 env.AddPostAction (ardoursh, Chmod ('$TARGET', 0755))
diff --git a/gtk2_ardour/add_midi_cc_track_dialog.cc b/gtk2_ardour/add_midi_cc_track_dialog.cc
index 4631e1c002..fed1218c57 100644
--- a/gtk2_ardour/add_midi_cc_track_dialog.cc
+++ b/gtk2_ardour/add_midi_cc_track_dialog.cc
@@ -19,6 +19,7 @@
 
 #include <cstdio>
 #include <cmath>
+#include <cassert>
 
 #include <sigc++/bind.h>
 #include <gtkmm/stock.h>
diff --git a/gtk2_ardour/ardev-common-waf.sh.in b/gtk2_ardour/ardev-common-waf.sh.in
deleted file mode 100644
index 70b37cd381..0000000000
--- a/gtk2_ardour/ardev-common-waf.sh.in
+++ /dev/null
@@ -1,24 +0,0 @@
-cd `dirname "$0"`/..
-
-#export G_DEBUG=fatal_criticals
-
-libs=build/default/libs
-
-export ARDOUR_PATH=gtk2_ardour/icons:gtk2_ardour/pixmaps:gtk2_ardour:build/default/gtk2_ardour:.
-export ARDOUR_SURFACES_PATH=$libs/surfaces/osc:$libs/surfaces/generic_midi:$libs/surfaces/tranzport:$libs/surfaces/powermate
-export ARDOUR_DATA_PATH=gtk2_ardour:build/default/gtk2_ardour:.
-if test -d $HOME/gtk/inst ; then
-    echo USING NEW CLEARLOOKS
-    export GTK_PATH=~/.ardour3:$libs/clearlooks-newer
-else
-    echo USING OLD CLEARLOOKS
-    export GTK_PATH=~/.ardour3:$libs/clearlooks-older
-fi
-export VAMP_PATH=$libs/vamp-plugins:$VAMP_PATH
-
-export LD_LIBRARY_PATH=$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/sigc++2:$libs/glibmm2:$libs/gtkmm2/atk:$libs/gtkmm2/pango:$libs/gtkmm2/gdk:$libs/gtkmm2/gtk:$libs/libgnomecanvasmm:$libs/libsndfile:$libs/appleutility:$libs/cairomm:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$LD_LIBRARY_PATH
-
-# DYLD_LIBRARY_PATH is for darwin.
-export DYLD_FALLBACK_LIBRARY_PATH=$LD_LIBRARY_PATH
-
-EXECUTABLE=@EXECUTABLE@
diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in
index 6b870fb4e2..f4e0edee74 100644
--- a/gtk2_ardour/ardev_common.sh.in
+++ b/gtk2_ardour/ardev_common.sh.in
@@ -20,3 +20,27 @@ export LD_LIBRARY_PATH=libs/vamp-sdk:libs/surfaces/control_protocol:libs/ardour:
 export DYLD_FALLBACK_LIBRARY_PATH=$LD_LIBRARY_PATH
 
 EXECUTABLE=gtk2_ardour/ardour-%VERSION%
+cd `dirname "$0"`/..
+
+#export G_DEBUG=fatal_criticals
+
+libs=@LIBS@
+
+export ARDOUR_PATH=gtk2_ardour/icons:gtk2_ardour/pixmaps:gtk2_ardour:build/default/gtk2_ardour:.
+export ARDOUR_SURFACES_PATH=$libs/surfaces/osc:$libs/surfaces/generic_midi:$libs/surfaces/tranzport:$libs/surfaces/powermate
+export ARDOUR_DATA_PATH=gtk2_ardour:build/default/gtk2_ardour:.
+if test -d $HOME/gtk/inst ; then
+    echo USING NEW CLEARLOOKS
+    export GTK_PATH=~/.ardour3:$libs/clearlooks-newer
+else
+    echo USING OLD CLEARLOOKS
+    export GTK_PATH=~/.ardour3:$libs/clearlooks-older
+fi
+export VAMP_PATH=$libs/vamp-plugins:$VAMP_PATH
+
+export LD_LIBRARY_PATH=$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/sigc++2:$libs/glibmm2:$libs/gtkmm2/atk:$libs/gtkmm2/pango:$libs/gtkmm2/gdk:$libs/gtkmm2/gtk:$libs/libgnomecanvasmm:$libs/libsndfile:$libs/appleutility:$libs/cairomm:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$LD_LIBRARY_PATH
+
+# DYLD_LIBRARY_PATH is for darwin.
+export DYLD_FALLBACK_LIBRARY_PATH=$LD_LIBRARY_PATH
+
+EXECUTABLE=@EXECUTABLE@
diff --git a/gtk2_ardour/ardour.sh.in b/gtk2_ardour/ardour.sh.in
index 989af5e618..a08661785d 100644
--- a/gtk2_ardour/ardour.sh.in
+++ b/gtk2_ardour/ardour.sh.in
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-export GTK_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour3:$GTK_PATH
+export GTK_PATH=@INSTALL_PREFIX@/@LIBDIR@/ardour3:$GTK_PATH
 
-export LD_LIBRARY_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour3:$LD_LIBRARY_PATH 
+export LD_LIBRARY_PATH=@INSTALL_PREFIX@/@LIBDIR@/ardour3:$LD_LIBRARY_PATH 
 # DYLD_LIBRARY_PATH is for Darwin
 export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
 
@@ -20,7 +20,7 @@ fi
 
 ## Glib atomic test
 
-GLIB=$(ldd %INSTALL_PREFIX%/%LIBDIR%/ardour3/ardour-%VERSION% 2> /dev/null | grep glib-2.0 | sed 's/.*=> \([^ ]*\) .*/\1/')
+GLIB=$(ldd @INSTALL_PREFIX@/@LIBDIR@/ardour3/ardour-@VERSION@ 2> /dev/null | grep glib-2.0 | sed 's/.*=> \([^ ]*\) .*/\1/')
 
 if [ "$GLIB" = "" ]; then
 	echo "WARNING: Could not check your glib-2.0 for mutex locking atomic operations."
@@ -36,26 +36,6 @@ elif [ $(nm -D --radix=dec --defined-only -S $GLIB | grep -w g_atomic_int_add |
 	echo ""
 fi
 
-exec %INSTALL_PREFIX%/%LIBDIR%/ardour3/ardour-%VERSION% "$@"
-
-## Glib atomic test
-
-GLIB=$(ldd %INSTALL_PREFIX%/%LIBDIR%/ardour3/ardour-%VERSION% 2> /dev/null | grep glib-2.0 | sed 's/.*=> \([^ ]*\) .*/\1/')
-
-if [ "$GLIB" = "" ]; then
-	echo "WARNING: Could not check your glib-2.0 for mutex locking atomic operations."
-	echo ""
-elif [ $(nm -D --radix=dec --defined-only -S $GLIB | grep -w g_atomic_int_add | cut -d ' ' -f 2) -gt 32 ]; then
-	echo "WARNING: Your system contains a suspect libglib-2.0. Your version might be built"
-	echo "         to use mutex locking atomic operations. This is a fallback solution to"
-	echo "         a more robust hardware supported atomicity. It might cause reduced "
-	echo "         performance and/or deadlocks. Please contact your distribution support"
-	echo "         about this issue."
-	echo "         Unfortunately this check is not 100% accurate, so this might not be"
-	echo "         the case with your system."
-	echo ""
-fi
-
-exec %INSTALL_PREFIX%/%LIBDIR%/ardour3/ardour-%VERSION% "$@"
+exec @INSTALL_PREFIX@/@LIBDIR@/ardour3/ardour-@VERSION@ "$@"
 
 
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 37d4248049..490f432cfb 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -249,13 +249,14 @@ def build(bld):
 	wrapper_subst_dict = {
 		'INSTALL_PREFIX' : bld.env['PREFIX'],
 		'LIBDIR'         : os.path.normpath(bld.env['LIBDIRNAME']),
+		'LIBS'           : 'build/default/libs',
 		'VERSION'        : '3.0',
 		'EXECUTABLE'     : 'build/default/gtk2_ardour/ardour-3.0'
 	}
 
 	obj = bld.new_task_gen('subst')
-	obj.source = 'ardev-common-waf.sh.in'
-	obj.target = 'ardev-common-waf.sh'
+	obj.source = 'ardev_common.sh.in'
+	obj.target = 'ardev_common-waf.sh'
 	obj.chmod  = 0755
 	obj.dict   = wrapper_subst_dict