summaryrefslogtreecommitdiff
path: root/windows/make-windows-installer.bat
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2016-06-04 11:34:41 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2016-06-04 11:34:41 -0700
commit146c7a78e551af2f59c95215833f39be5b6c8a67 (patch)
treede6bec9c608cc6779583cfe38de591986977cb86 /windows/make-windows-installer.bat
parent64a037141d6730b6282615e28fffda344f1c1211 (diff)
Improved Windows installer (nkalvi, #2708, #2389).
* Scope selection in the first screen. Since I couldn't detect if the user is 'real' admin user, default is still per user. * Scope is limited to per machine on servers. Though not perfect (couldn't detect `DisableMSI` policy), it should handle #2389 better. * For per machine, location can be changed by selecting Advanced. Localization: modified templates from WiX toolkit support localization very well. A short sample localization file for en-us is used. * Dialog elements are moved to their own files.
Diffstat (limited to 'windows/make-windows-installer.bat')
-rw-r--r--windows/make-windows-installer.bat4
1 files changed, 2 insertions, 2 deletions
diff --git a/windows/make-windows-installer.bat b/windows/make-windows-installer.bat
index d3d9bb71c..2f0bf4b88 100644
--- a/windows/make-windows-installer.bat
+++ b/windows/make-windows-installer.bat
@@ -18,9 +18,9 @@ if "%VERSION%" == "" (
)
echo Detected version %VERSION%
echo Creating msi...
-candle -dVERSION=%VERSION% -dBINPATH=%BINPATH% pandoc.wxs
+candle -dVERSION=%VERSION% -dBINPATH=%BINPATH% *.wxs -out wixobj\
if %errorlevel% neq 0 exit /b %errorlevel%
-light -sw1076 -ext WixUIExtension -ext WixUtilExtension -out pandoc-%VERSION%-windows.msi pandoc.wixobj
+light -sw1076 -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -loc Pandoc-en-us.wxl -out pandoc-%VERSION%-windows.msi wixobj\*.wixobj
if %errorlevel% neq 0 exit /b %errorlevel%
echo Starting kSign: sign, then quit kSign to complete the build...
kSign