diff options
| -rw-r--r-- | windows/make-windows-installer.bat | 3 | ||||
| -rw-r--r-- | windows/pandoc.wxs | 16 |
2 files changed, 13 insertions, 6 deletions
diff --git a/windows/make-windows-installer.bat b/windows/make-windows-installer.bat index e25a704da..c2b534f1b 100644 --- a/windows/make-windows-installer.bat +++ b/windows/make-windows-installer.bat @@ -9,7 +9,8 @@ if %errorlevel% neq 0 exit /b %errorlevel% strip cabal-dev\bin\pandoc.exe
cabal-dev\bin\pandoc.exe -s --template data\templates\default.html -S README -o README.html
if %errorlevel% neq 0 exit /b %errorlevel%
-copy COPYING COPYING.txt
+cabal-dev\bin\pandoc.exe -s --template data\templates\default.rtf COPYING -t rtf -S -o COPYING.rtf
+if %errorlevel% neq 0 exit /b %errorlevel%
copy COPYRIGHT COPYRIGHT.txt
cd windows
echo Creating msi...
diff --git a/windows/pandoc.wxs b/windows/pandoc.wxs index 257f536fd..fd1af33ed 100644 --- a/windows/pandoc.wxs +++ b/windows/pandoc.wxs @@ -16,8 +16,8 @@ Source="..\cabal-dev\bin\pandoc.exe" /> <File Id="pandocCOPYRIGHT" Name="COPYRIGHT.txt" Source="..\COPYRIGHT.txt" /> - <File Id="pandocCOPYING" Name="COPYING.txt" - Source="..\COPYING.txt" /> + <File Id="pandocCOPYING" Name="COPYING.rtf" + Source="..\COPYING.rtf" /> <Environment Id="UpdatePath" Name="PATH" Action="set" Part="last" System="yes" Value="[INSTALLDIR]" /> </Component> @@ -29,9 +29,15 @@ </Directory> </Directory> </Directory> - <Feature Id="Complete" Level="1"> - <ComponentRef Id="MainExecutable" /> - <ComponentRef Id="Documentation" /> + <Feature Id="Complete" Level="1" Title="Pandoc 1.10" Description="Complete package" Display="expand" ConfigurableDirectory="INSTALLDIR"> + <Feature Id="MainProgram" Title="Program" Description="The main executable." Level="1"> + <ComponentRef Id="MainExecutable" /> + </Feature> + <Feature Id="Manual"> + <ComponentRef Id="Documentation" /> + </Feature> </Feature> + <UIRef Id="WixUI_Advanced" /> + <WixVariable Id="WixUILicenseRtf" Value="..\COPYING.rtf" /> </Product> </Wix> |