diff options
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/make-windows-installer.bat | 4 | ||||
| -rw-r--r-- | windows/pandoc.wxs | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/windows/make-windows-installer.bat b/windows/make-windows-installer.bat index 892a61cdc..75fd01b4f 100644 --- a/windows/make-windows-installer.bat +++ b/windows/make-windows-installer.bat @@ -2,7 +2,7 @@ stack install --test
if %errorlevel% neq 0 exit /b %errorlevel%
for /f "delims=" %%a in ('stack path --local-bin-path') do @set BINPATH=%%a
-%BINPATH%\pandoc.exe -s -S --toc ..\README -o README.html
+%BINPATH%\pandoc.exe -s -S --toc ..\MANUAL -o MANUAL.html
if %errorlevel% neq 0 exit /b %errorlevel%
%BINPATH%\pandoc.exe -s ..\COPYING -t rtf -S -o COPYING.rtf
if %errorlevel% neq 0 exit /b %errorlevel%
@@ -14,7 +14,7 @@ for /f "tokens=1-2 delims= " %%a in ('%BINPATH%\pandoc.exe --version') do ( :next
if "%VERSION%" == "" (
echo Error: could not determine version number.
- exit /b 1
+ exit /b 1
)
echo Detected version %VERSION%
echo Creating msi...
diff --git a/windows/pandoc.wxs b/windows/pandoc.wxs index 50a686e55..dcdd3f582 100644 --- a/windows/pandoc.wxs +++ b/windows/pandoc.wxs @@ -57,8 +57,8 @@ <Component Id="Documentation" Guid="A8D54A76-1A3D-4647-8327-81B69D39D8A3"> - <File Id="pandocREADME" Name="Pandoc User's Guide.html" - Source="README.html" KeyPath="yes"> + <File Id="pandocMANUAL" Name="Pandoc User's Guide.html" + Source="MANUAL.html" KeyPath="yes"> <Shortcut Id="ApplicationStartMenuShortcut" Directory="ApplicationProgramsFolder" Name="Pandoc User’s Guide" Advertise="yes" /> @@ -123,18 +123,18 @@ </Feature> </Feature> - + <!-- Set properties for add/remove programs --> <Property Id="ARPURLINFOABOUT" Value="http://pandoc.org" /> <Property Id="ARPHELPLINK" Value="http://pandoc.org" /> <Property Id="ARPNOREPAIR" Value="yes" Secure="yes" /> <!-- Remove repair --> <Property Id="ARPNOMODIFY" Value="yes" Secure="yes" /> <!-- Remove modify --> - + <!--Needed for WixUI_Advanced--> <Property Id="ApplicationFolderName" Value="Pandoc" /> <Property Id="WixAppFolder" Value="WixPerUserFolder" /> - + <!--For Single Package for dual purpose i.e. per User/Machine--> <!--<Property Id="ALLUSERS" Value="2" Secure="yes" />--> <Property Id="MSIINSTALLPERUSER" Value="1" /> @@ -145,7 +145,7 @@ <CustomAction Id="SetExitDialogOptText" Property="WIXUI_EXITDIALOGOPTIONALTEXT" Value="!(loc.ExitDialogText)" /> - + <!--Offer Per User installs only on workstations (block on servers)--> <!--Unless ALLUSERS=1 is specified on command line--> <SetProperty Id="WixUISupportPerUser" Value="0" Before="FindRelatedProducts"> @@ -177,12 +177,12 @@ NOT Installed </Custom> </InstallUISequence> - + <UIRef Id="WixUI_Advanced_Custom"/> <!--Enable better description when debug logging--> <UIRef Id="WixUI_ErrorProgressText" /> - + </Product> - - + + </Wix> |