X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=tools%2Flinux_packaging%2Fbuild;h=93bbcc95b86ebb8fd4ca3672d83181c54de26af0;hb=936362abc20e1b813ba81955ae9251bdae8a07ad;hp=2ce69e19f00d1b969bc2e50350e9d3126a1d01f1;hpb=2caf7891257d0161c8c40b4e1b63f25128fbeca7;p=ardour.git

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 2ce69e19f0..93bbcc95b8 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -87,10 +87,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`"
+release_version=`grep -m 1 '[^A-Za-z_]LINUX_VERSION = ' ../../wscript | awk '{ print $3 }' | sed "s/'//g"`
+revision=`grep -m 1 'revision =' ../../libs/ardour/revision.cc | cut -d'"' -f 2 | sed -e "s/$release_version-//"`
+echo "Version is $release_version / $revision"
+info_string="$release_version/$revision built on `hostname` by `whoami` on `date`"
 echo "Info string is $info_string"
 
 # Figure out our CPU type
@@ -114,7 +114,7 @@ case `uname -m` in
 esac
 
 # Figure out the Build Type
-if grep -q "DEBUG = True" ../../build/c4che/default.cache.py; then
+if grep -q "DEBUG = True" ../../build/c4che/_cache.py; then
 	DEBUG="T"
 else
 	DEBUG="F"
@@ -131,11 +131,11 @@ fi
 # 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}-${release_version}-${revision}
+	APP_VER_NAME=${APPNAME}-${release_version}-${revision}
 else
-	APPDIR=${APPNAME}_${ARCH}-${release_version}_${svn_version}-${BUILDTYPE}
-	APP_VER_NAME=${APPNAME}-${release_version}_${svn_version}-${BUILDTYPE}
+	APPDIR=${APPNAME}_${ARCH}-${release_version}-${revision}-${BUILDTYPE}
+	APP_VER_NAME=${APPNAME}-${release_version}-${revision}-${BUILDTYPE}
 fi
 
 APPBIN=$APPDIR/bin
@@ -264,8 +264,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 $pkg`$vsuffix
-		echo copy $file to $Locale/$lang/LC_MESSAGES/`basename $pkg`$vsuffix
+		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 
@@ -275,7 +275,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..."
@@ -318,12 +318,17 @@ rm pangorc
 gdk-pixbuf-query-loaders | sed "s?$GTKSTACK_ROOT/lib/gdk-pixbuf-2.0/2.10.0/?@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/clearlooks
+# this one is special - we will set GTK_PATH to $Libraries/gtkengines
 
-echo "Copying clearlooks ..."
+GTK_ENGINE_DIR=$Libraries/gtkengines/engines
+mkdir -p $GTK_ENGINE_DIR
+
+echo "Copying GTK engines ..."
 cp $BUILD_ROOT/libs/clearlooks-newer/libclearlooks.so $Libraries
-mkdir -p $Libraries/clearlooks/engines
-(cd $Libraries/clearlooks/engines && ln -s ../../libclearlooks.so . )
+(cd $GTK_ENGINE_DIR && ln -s ../../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
@@ -520,6 +525,7 @@ 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
@@ -529,7 +535,7 @@ done
 #
 # 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%/${release_version}/" -e "s/%REPLACE_BUILD%/${revision}/" -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