From ae5c614bf8c68ca064345f4016c864f94bf62b8e Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 12 Mar 2015 02:36:01 +0100 Subject: prepare windows i18n --- gtk2_ardour/bundle_env_mingw.cc | 8 ++++++++ tools/x-win/compile.sh | 4 ++++ tools/x-win/package.sh | 5 +++++ 3 files changed, 17 insertions(+) diff --git a/gtk2_ardour/bundle_env_mingw.cc b/gtk2_ardour/bundle_env_mingw.cc index b45a209a79..3bfb653dda 100644 --- a/gtk2_ardour/bundle_env_mingw.cc +++ b/gtk2_ardour/bundle_env_mingw.cc @@ -95,6 +95,14 @@ fixup_bundle_environment (int, char* [], const char** localedir) // Unset GTK_RC_FILES so that only ardour specific files are loaded Glib::unsetenv ("GTK_RC_FILES"); + if (ARDOUR::translations_are_enabled ()) { + path = windows_search_path().to_string(); + path += "\\locale"; + Glib::setenv ("GTK_LOCALEDIR", path, true); + + // and return the same path to our caller + (*localedir) = strdup (path.c_str()); + } std::string path; const char *cstr; diff --git a/tools/x-win/compile.sh b/tools/x-win/compile.sh index e6ed0b6381..8db9d984af 100755 --- a/tools/x-win/compile.sh +++ b/tools/x-win/compile.sh @@ -72,3 +72,7 @@ LDFLAGS="-L${PREFIX}/lib" ./waf configure \ $ARDOURCFG \ --prefix=${PREFIX} ./waf ${CONCURRENCY} + +echo " === build complete, creating translations" +./waf i18n +echo " === done" diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh index c747aae3ca..bb139cc6c5 100755 --- a/tools/x-win/package.sh +++ b/tools/x-win/package.sh @@ -83,6 +83,9 @@ if ! test -f build/gtk2_ardour/ardour-${BINVERSION}.exe; then echo "*** Please compile ardour ${ARDOURVERSION} first." exit 1 fi + +echo " === bundle to $DESTDIR" + ./waf install ################################################################################ @@ -156,6 +159,7 @@ if test -f /usr/${XPREFIX}/lib/libwinpthread-1.dll; then fi cp -r $PREFIX/share/${LOWERCASE_DIRNAME} $DESTDIR/share/ +cp -r $PREFIX/share/locale $DESTDIR/share/ cp -r $PREFIX/etc/${LOWERCASE_DIRNAME}/* $DESTDIR/share/${LOWERCASE_DIRNAME}/ cp COPYING $DESTDIR/share/ @@ -166,6 +170,7 @@ cp gtk2_ardour/icons/ardour_bug.ico $DESTDIR/share/ cp gtk2_ardour/icons/cursor_square/* $DESTDIR/share/${LOWERCASE_DIRNAME}/icons/ # clean build-dir after depoyment +echo " === bundle completed, cleaning up" ./waf uninstall echo " === complete" du -sh $DESTDIR -- cgit v1.2.3