# HG changeset patch
# User John Donoghue <john.donoghue@ieee.org>
# Date 1389406959 18000
# Node ID 5e77c5fc91ed4e17d79af435d4cd5e648ec71d38
# Parent  e0552735e3f328b6e37882f4f5b3e5326df33e56
qt: build translations in cross build and install

* src/qt.mk: in cross compile configure options, set translate path and -make option.

* makeinst-script.sh: Add createion and removal of libexec\octave\octave-version\qt.conf

diff -r e0552735e3f3 -r 5e77c5fc91ed makeinst-script.sh
--- a/makeinst-script.sh	Thu Jan 09 19:50:26 2014 -0500
+++ b/makeinst-script.sh	Fri Jan 10 21:22:39 2014 -0500
@@ -63,6 +63,10 @@
 Icon "\${INSTALLER_FILES}/octave-logo.ico"
 
 ######################################################################
+; StrFunc usage
+!include "StrFunc.nsh"
+\${StrRep}
+######################################################################
 ; MUI settings
 !include "MUI.nsh"
 
@@ -137,6 +141,12 @@
 
   cat >> octave.nsi << EOF
 
+ ; add qt.conf
+ Push \$0
+ \${StrRep} '\$0' '\$INSTDIR' '\\' '/'
+ WriteINIStr "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\qt.conf" "Paths" "Prefix" "\$0"
+ WriteINIStr "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\qt.conf" "Paths" "Translations" "translations"
+ Pop \$0
 SectionEnd
 
 Section make_uninstaller
@@ -188,6 +198,9 @@
 
  Delete "\$desktop\\Octave-$VERSION.lnk" 
  Delete "\$desktop\\Octave-$VERSION (Experimental GUI).lnk" 
+
+ ; delete generated qt.conf file
+ Delete "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\qt.conf"
 EOF
 
 # insert dir list (backwards order) for uninstall files
@@ -199,7 +212,7 @@
 
 # last bit of the uninstaller
   cat >> octave.nsi << EOF
- Delete "\$INSTDIR\*.*"
+ Delete "\$INSTDIR\\*.*"
  RmDir "\$INSTDIR"
 SectionEnd
 
diff -r e0552735e3f3 -r 5e77c5fc91ed src/octave-2-libexec.patch
--- a/src/octave-2-libexec.patch	Thu Jan 09 19:50:26 2014 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-
-# HG changeset patch
-# User John W. Eaton <jwe@octave.org>
-# Date 1387845274 18000
-# Node ID 65e4e0569ed4ed2aa368f0048561f0b9c19d1f81
-# Parent  bce3a82a4a8de81b81a0d0f26dd8a837932b2bbb
-install octave-gui binary in libexec directory
-
-* src/Makefile.am (archlib_PROGRAMS): New variable.  List octave-gui
-* here, not in OCTAVE_BINARIES (and, ultimately, bin_PROGRAMS).
-* src/main.in.cc (OCTAVE_ARCHLIBDIR): New macro.
-(get_octave_archlibdir): New function.
-(main): New variable octave_archlibdir.  If HAVE_OCTAVE_GUI, set file
-to octave-gui in the octave_archlibdir directory.
-
-diff --git a/src/Makefile.am b/src/Makefile.am
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -52,7 +52,7 @@
- OCTAVE_VERSION_LINKS = octave-cli-$(version)$(EXEEXT)
- 
- if AMCOND_BUILD_GUI
--  OCTAVE_BINARIES += octave-gui
-+  archlib_PROGRAMS = octave-gui
-   OCTAVE_VERSION_LINKS += octave-gui-$(version)$(EXEEXT)
- endif
- 
-diff --git a/src/main.in.cc b/src/main.in.cc
---- a/src/main.in.cc
-+++ b/src/main.in.cc
-@@ -46,6 +46,10 @@
- #define OCTAVE_VERSION %OCTAVE_VERSION%
- #endif
- 
-+#ifndef OCTAVE_ARCHLIBDIR
-+#define OCTAVE_ARCHLIBDIR %OCTAVE_ARCHLIBDIR%
-+#endif
-+
- #ifndef OCTAVE_BINDIR
- #define OCTAVE_BINDIR %OCTAVE_BINDIR%
- #endif
-@@ -439,6 +443,20 @@
-   return obd.empty () ? subst_octave_home (std::string (OCTAVE_BINDIR)) : obd;
- }
- 
-+static std::string
-+get_octave_archlibdir (void)
-+{
-+  // Accept value from the environment literally, but substitute
-+  // OCTAVE_HOME in the configuration value OCTAVE_ARCHLIBDIR in case
-+  // Octave has been relocated to some installation directory other than
-+  // the one originally configured.
-+
-+  std::string dir = octave_getenv ("OCTAVE_ARCHLIBDIR");
-+
-+  return dir.empty ()
-+    ? subst_octave_home (std::string (OCTAVE_ARCHLIBDIR)) : dir;
-+}
-+
- // Adapted from libtool wrapper.
- #if defined (__WIN32__) && ! defined (__CYGWIN__)
- 
-@@ -593,6 +611,7 @@
-   bool gui_libs = false;
- 
-   std::string octave_bindir = get_octave_bindir ();
-+  std::string octave_archlibdir = get_octave_archlibdir ();
- 
-   std::string file
-     = octave_bindir + dir_sep_char + "octave-cli-" OCTAVE_VERSION;;
-@@ -609,12 +628,15 @@
-         {
-           start_gui = true;
-           gui_libs = true;
--          file = octave_bindir + dir_sep_char;
--          #if defined (HAVE_OCTAVE_GUI)
--            file += "octave-gui-" OCTAVE_VERSION;
--          #else
--            file += "octave-cli-" OCTAVE_VERSION;
--          #endif
-+#if defined (HAVE_OCTAVE_GUI)
-+          // The Octave version number is already embedded in the
-+          // octave_archlibdir directory name so we don't need to
-+          // append it to the octave-gui file name.
-+
-+          file = octave_archlibdir + dir_sep_char + "octave-gui";
-+#else
-+          file = octave_bindir + dir_sep_char + "octave-cli-" OCTAVE_VERSION;
-+#endif
-           new_argv[k++] = argv[i];
-         }
-       else if (! strcmp (argv[i], "--no-gui-libs"))
-
diff -r e0552735e3f3 -r 5e77c5fc91ed src/qt.mk
--- a/src/qt.mk	Thu Jan 09 19:50:26 2014 -0500
+++ b/src/qt.mk	Fri Jan 10 21:22:39 2014 -0500
@@ -79,6 +79,8 @@
       -no-reduce-exports \
       -no-ssse3 \
       -no-rpath \
+      -make translations \
+      -translationdir '$($(PKG)_PREFIX)/translations' \
       -device-option PKG_CONFIG='$(MXE_PKG_CONFIG)' \
       -force-pkg-config  \
       -v