prepare windows i18n

diff --git a/gtk2_ardour/bundle_env_mingw.cc b/gtk2_ardour/bundle_env_mingw.cc
index b45a209a798f00d67e7f82be1a0d2e871547a4f4..3bfb653ddac0e136330eaa6967c59c4015e6c2f9 100644 (file)
--- 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 e6ed0b638173bb38dc63acefe033e51352e1c1b7..8db9d984af7372dd000be3589a1e39a39eb7761f 100755 (executable)
--- 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 c747aae3ca6b7fa8c1e9b4475467af63f0fb91ef..bb139cc6c54ad6b7eb5d394c9a6c08c0125070f8 100755 (executable)
--- 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