Translations fixed for Windows. Windows build script exits on build f…

…ailure [ci skip]
markummitchell · Oct 1, 2016 · ce5f054 · ce5f054
1 parent aae7217
commit ce5f054
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/dev/windows/build_msi_and_zip.bat b/dev/windows/build_msi_and_zip.bat
@@ -94,6 +94,11 @@ if "%ARG1%" neq "norelease" (
 )
 nmake
 
+if not exist bin/engauge.exe (
+  echo "Executable could not be built. Stopping"
+  exit /b 1
+)
+
 cd "%APPVEYOR_BUILD_FOLDER%"
 if not exist "%RESULTDIR%"\documentation mkdir "%RESULTDIR%"\documentation
 for %%I in (%QTDIRS%) do (

diff --git a/dev/windows/engauge.wxs b/dev/windows/engauge.wxs
@@ -91,19 +91,19 @@
 	  </Directory>
 	  <Directory Id='translations' Name='translations'>
 	    <Component Id='translations' Guid='A9AD2B5C-8B4F-48E5-819A-D38C4EA11153'>
-	      <File Id='qt_ar'  Name='qt_ar.qm'  DiskId='1' Source='../../translations/engauge_ar.qm'  />
-	      <File Id='qt_de'  Name='qt_de.qm'  DiskId='1' Source='../../translations/engauge_de.qm'  />
-	      <File Id='qt_en'  Name='qt_en.qm'  DiskId='1' Source='../../translations/engauge_en.qm'  />
-	      <File Id='qt_es'  Name='qt_es.qm'  DiskId='1' Source='../../translations/engauge_es.qm'  />
-	      <File Id='qt_fr'  Name='qt_fr.qm'  DiskId='1' Source='../../translations/engauge_fr.qm'  />
-	      <File Id='qt_hi'  Name='qt_hi.qm'  DiskId='1' Source='../../translations/engauge_hi.qm'  />
-	      <File Id='qt_it'  Name='qt_it.qm'  DiskId='1' Source='../../translations/engauge_it.qm'  />
-	      <File Id='qt_ja'  Name='qt_ja.qm'  DiskId='1' Source='../../translations/engauge_ja.qm'  />
-	      <File Id='qt_kk'  Name='qt_kk.qm'  DiskId='1' Source='../../translations/engauge_kk.qm'  />
-	      <File Id='qt_ko'  Name='qt_ko.qm'  DiskId='1' Source='../../translations/engauge_ko.qm'  />
-	      <File Id='qt_pt'  Name='qt_pt.qm'  DiskId='1' Source='../../translations/engauge_pt.qm'  />
-	      <File Id='qt_ru'  Name='qt_ru.qm'  DiskId='1' Source='../../translations/engauge_ru.qm'  />
-	      <File Id='qt_zh'  Name='qt_zh.qm'  DiskId='1' Source='../../translations/engauge_zh.qm'  />
+	      <File Id='qt_ar'  Name='engauge_ar.qm'  DiskId='1' Source='../../translations/engauge_ar.qm'  />
+	      <File Id='qt_de'  Name='engauge_de.qm'  DiskId='1' Source='../../translations/engauge_de.qm'  />
+	      <File Id='qt_en'  Name='engauge_en.qm'  DiskId='1' Source='../../translations/engauge_en.qm'  />
+	      <File Id='qt_es'  Name='engauge_es.qm'  DiskId='1' Source='../../translations/engauge_es.qm'  />
+	      <File Id='qt_fr'  Name='engauge_fr.qm'  DiskId='1' Source='../../translations/engauge_fr.qm'  />
+	      <File Id='qt_hi'  Name='engauge_hi.qm'  DiskId='1' Source='../../translations/engauge_hi.qm'  />
+	      <File Id='qt_it'  Name='engauge_it.qm'  DiskId='1' Source='../../translations/engauge_it.qm'  />
+	      <File Id='qt_ja'  Name='engauge_ja.qm'  DiskId='1' Source='../../translations/engauge_ja.qm'  />
+	      <File Id='qt_kk'  Name='engauge_kk.qm'  DiskId='1' Source='../../translations/engauge_kk.qm'  />
+	      <File Id='qt_ko'  Name='engauge_ko.qm'  DiskId='1' Source='../../translations/engauge_ko.qm'  />
+	      <File Id='qt_pt'  Name='engauge_pt.qm'  DiskId='1' Source='../../translations/engauge_pt.qm'  />
+	      <File Id='qt_ru'  Name='engauge_ru.qm'  DiskId='1' Source='../../translations/engauge_ru.qm'  />
+	      <File Id='qt_zh'  Name='engauge_zh.qm'  DiskId='1' Source='../../translations/engauge_zh.qm'  />
 	    </Component>
 	  </Directory>
 	</Directory>