Windows changes for version 8 [ci skip]

markummitchell · May 28, 2016 · b92a2fd · b92a2fd
1 parent 94a9869
commit b92a2fd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/dev/windows/build_msi_and_zip b/dev/windows/build_msi_and_zip
@@ -3,9 +3,9 @@
 # ENGDIR is two levels above the current directory
 DIR=`pwd`
 export ENGDIR=${DIR%/*/*}
+export ENGTRANSDIR="$ENGDIR/translations"
 export QTBINDIR=`qtpaths --binaries-dir`
 export QTPLUGINSDIR=`qtpaths --plugin-dir`
-export QTTRANSDIR="${QTPLUGINSDIR%/*}/translations"
 if [ -z "$QTBINDIR" ]; then
     echo "qtpaths utility is not in PATH, which should be pointing to the Qt5 bin directory"
     exit
@@ -14,7 +14,7 @@ fi
 echo "Engauge:         $ENGDIR"
 echo "Qt binaries:     $QTBINDIR"
 echo "Qt plugins:      $QTPLUGINSDIR"
-echo "Qt translations: $QTTRANSDIR"
+echo "Translations:    $ENGTRANSDIR"
 #
 echo " "
 where g++
@@ -73,6 +73,7 @@ echo "***Rebuilding release executable" &&
 export PATH="$QTBINDIR:$PATH"
 export ENGAUGE_RELEASE=1 &&
 cd ../.. &&
+lrelease engauge.pro &&
 qmake engauge.pro &&
 sed 's/-lQt/-lQt5/g' Makefile >Makefile~ &&
 sed 's/Qt55/Qt5/g' Makefile~ >Makefile &&
@@ -117,6 +118,7 @@ cp $QTPLUGINSDIR/sqldrivers/qsqlite.dll   "Engauge Digitizer/sqldrivers"
 cp $QTPLUGINSDIR/sqldrivers/qsqlmysql.dll "Engauge Digitizer/sqldrivers"
 cp $QTPLUGINSDIR/sqldrivers/qsqlpsql.dll "Engauge Digitizer/sqldrivers"
 cp $QTTRANSDIR/*.qm  "Engauge Digitizer/translations"
+cp $ENGTRANSDIR/*.qm "Engauge Digitizer/translations"
 cp ../../LICENSE                 "Engauge Digitizer"
 cp ../../bin/D3Dcompiler_47.dll  "Engauge Digitizer"
 cp ../../bin/engauge.exe         "Engauge Digitizer"

diff --git a/dev/windows/engauge.wxs b/dev/windows/engauge.wxs
@@ -2,10 +2,10 @@
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Product Name='Engauge Digitizer' 
            Manufacturer='Engauge Open Source Developers'
-	   Id='F9040179-1896-4DB0-B92b-1EB268E172A5'
+	   Id='37DB671F-AF4A-4559-8F9A-1FEF9689D8DA'
 	   UpgradeCode='00A6792B-65ED-4894-A48B-B95D63C62CC6'
 	   Language='1033' Codepage='1252' 
-           Version='7.2'>
+           Version='8.0'>
     <Package Id='*' Keywords='Installer' Description="Engauge Digitizer Installer"
 	     Comments='Engauge Digitizer is available from github.com' Manufacturer='Engauge Open Source Developers'
 	     InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />