Mercurial > mxe-octave

diff makeinst-script.sh @ 3409:5e77c5fc91ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author John Donoghue <john.donoghue@ieee.org>
date Fri, 10 Jan 2014 21:22:39 -0500
parents c0fe8d735baf
children 2a0e9378056c
line wrap: on
line diff
--- 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