git.iko.soy/typeable/pandoc
on master help sign in
windows installer: UI with license, etc.
b86bdb9John MacFarlane
windows/make-windows-installer.bat+2−1
compare with master
unifiedsplit
@@ -9,7 +9,8 @@ if %errorlevel% neq 0 exit /b %errorlevel%
9strip cabal-dev\bin\pandoc.exe
9strip cabal-dev\bin\pandoc.exe
10cabal-dev\bin\pandoc.exe -s --template data\templates\default.html -S README -o README.html
10cabal-dev\bin\pandoc.exe -s --template data\templates\default.html -S README -o README.html
11if %errorlevel% neq 0 exit /b %errorlevel%
11if %errorlevel% neq 0 exit /b %errorlevel%
12−copy COPYING COPYING.txt
12+cabal-dev\bin\pandoc.exe -s --template data\templates\default.rtf COPYING -t rtf -S -o COPYING.rtf
13+if %errorlevel% neq 0 exit /b %errorlevel%
13copy COPYRIGHT COPYRIGHT.txt
14copy COPYRIGHT COPYRIGHT.txt
14cd windows
15cd windows
15echo Creating msi...
16echo Creating msi...
windows/pandoc.wxs+11−5
@@ -16,8 +16,8 @@
16 Source="..\cabal-dev\bin\pandoc.exe" />
16 Source="..\cabal-dev\bin\pandoc.exe" />
17 <File Id="pandocCOPYRIGHT" Name="COPYRIGHT.txt"
17 <File Id="pandocCOPYRIGHT" Name="COPYRIGHT.txt"
18 Source="..\COPYRIGHT.txt" />
18 Source="..\COPYRIGHT.txt" />
19− <File Id="pandocCOPYING" Name="COPYING.txt"
19+ <File Id="pandocCOPYING" Name="COPYING.rtf"
20− Source="..\COPYING.txt" />
20+ Source="..\COPYING.rtf" />
21 <Environment Id="UpdatePath" Name="PATH" Action="set"
21 <Environment Id="UpdatePath" Name="PATH" Action="set"
22 Part="last" System="yes" Value="[INSTALLDIR]" />
22 Part="last" System="yes" Value="[INSTALLDIR]" />
23 </Component>
23 </Component>
@@ -29,9 +29,15 @@
29 </Directory>
29 </Directory>
30 </Directory>
30 </Directory>
31 </Directory>
31 </Directory>
32− <Feature Id="Complete" Level="1">
32+ <Feature Id="Complete" Level="1" Title="Pandoc 1.10" Description="Complete package" Display="expand" ConfigurableDirectory="INSTALLDIR">
33+ <Feature Id="MainProgram" Title="Program" Description="The main executable." Level="1">
33− <ComponentRef Id="MainExecutable" />
34+ <ComponentRef Id="MainExecutable" />
35+ </Feature>
36+ <Feature Id="Manual">
34− <ComponentRef Id="Documentation" />
37+ <ComponentRef Id="Documentation" />
38+ </Feature>
35 </Feature>
39 </Feature>
40+ <UIRef Id="WixUI_Advanced" />
41+ <WixVariable Id="WixUILicenseRtf" Value="..\COPYING.rtf" />
36 </Product>
42 </Product>
37</Wix>
43</Wix>