diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-23 08:47:57 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-23 08:47:57 -0400 |
commit | d135c4dc3a307d0be606f3afbbc8fd8c3ec56438 (patch) | |
tree | dbedf6ddfe1c1b6557a885ad3b87455ba2213a12 /tools | |
parent | fb313fb1741a04f270fff3703967df572ac4fc45 (diff) | |
parent | 75271a17d8d4ed0003c4627e80a28feb68f5d9c9 (diff) |
fix merge conflicts with master
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/linux_packaging/build | 3 | ||||
-rwxr-xr-x | tools/osx_packaging/osx_build | 50 |
2 files changed, 40 insertions, 13 deletions
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index 3bf793a637..e7f7d8b6dd 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -534,6 +534,9 @@ cp -R ../../gtk2_ardour/splash.png $Shared cp -R ../../gtk2_ardour/small-splash.png $Shared cp -R ../../gtk2_ardour/ArdourMono.ttf $Shared +# install bundled LV2s to <app>/lib/LV2/ +cp -R $BUILD_ROOT/libs/LV2 $APPLIB/ + # go through and recursively remove any .svn dirs in the bundle for svndir in `find $APPDIR -name .svn -type d`; do rm -rf $svndir diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index 276eb90fe5..c47e64483c 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -219,21 +219,42 @@ fi # copy locale files if test x$WITH_NLS != x ; then echo "NLS support ..." - echo "I hope you remembered to run scons msgupdate!" + echo "I hope you remembered to run waf i18n" LINGUAS= - for file in $BUILD_ROOT/gtk2_ardour/*.mo - do - 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 - for file in $BUILD_ROOT/libs/ardour/*.mo - do - lang=`basename $file | sed 's/\.mo//'` - mkdir -p $Locale/$lang/LC_MESSAGES - cp $file $Locale/$lang/LC_MESSAGES/libardour.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 ../../$pkg" + 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/`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 + LINGUAS="$LINGUAS $lang" + fi + done done + for l in $LINGUAS do if [ -d $GTKSTACK_ROOT/share/locale/$l ] ; then @@ -417,6 +438,9 @@ for svndir in `find $APPDIR -name .svn -type dir`; do rm -rf $svndir done +# install bundled LV2s to <app>/Contents/lib/LV2/ +cp -R $BUILD_ROOT/libs/LV2 $Frameworks/ + # now fix up the executables echo "Fixing up executable dependency names ..." executables=$MAIN_EXECUTABLE |