X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=tools%2Flinux_packaging%2Fbuild;h=f2fa1293ecd3626ffd347c5efd347ccb08910252;hb=b150474b262f7c0dcf95b0d5d2b61d78e34591b0;hp=0120cf39feeb83b59eb6ee92c88941384ab7164b;hpb=72b0911421fbbdcfe4ce5937c9b7758ae085de42;p=ardour.git

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 0120cf39fe..f2fa1293ec 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -85,7 +85,7 @@ if test x$STRIP != xall -a x$STRIP != xnone -a x$STRIP != xsome ; then
 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`
+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`"
 echo "Info string is $info_string"
@@ -117,7 +117,7 @@ else
 	DEBUG="F"
 fi
 
-if [ x$DEBUG != x ]; then
+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\""
@@ -127,7 +127,7 @@ fi
 
 # the waf build tree to use when copying built/generated files
 
-BUILD_ROOT=../../build/default
+BUILD_ROOT=../../build
 
 # setup directory structure
 
@@ -233,37 +233,28 @@ if test x$WITH_NLS != x ; then
 	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"`
+        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"
@@ -441,14 +432,14 @@ mv $Surfaces/libardourcp.so* $Libraries
 
 # MidiMaps
 # got to be careful with names here
-for x in $BUILD_ROOT/../../midi_maps/*.map ; do
+for x in $BUILD_ROOT/../midi_maps/*.map ; do
     cp "$x" $MidiMaps
     echo Copied MIDI map $x 
 done
 
 # ExportFormats
 # got to be careful with names here
-for x in $BUILD_ROOT/../../export/*.preset $BUILD_ROOT/../../export/*.format ; do
+for x in $BUILD_ROOT/../export/*.preset $BUILD_ROOT/../export/*.format ; do
     cp "$x" $ExportFormats
 done
 
@@ -559,15 +550,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
-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
+
 
 #
 # put sooper sekrit ingredients here and they will be copied