Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Windows installer: more typos from transition from cabal-dev.

Browse source
This commit is contained in:
John MacFarlane 2014-05-06 08:56:52 -07:00
parent 7019069a32
commit ef8de35505
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
windows/make-windows-installer.bat
View file

@ -13,10 +13,10 @@ strip .\.cabal-sandbox\bin\pandoc.exe
strip .\.cabal-sandbox\bin\pandoc-citeproc.exe strip .\.cabal-sandbox\bin\pandoc-citeproc.exe
.\.cabal-sandbox\bin\pandoc.exe -s --template data\templates\default.html -S README -o README.html .\.cabal-sandbox\bin\pandoc.exe -s --template data\templates\default.html -S README -o README.html
if %errorlevel% neq 0 exit /b %errorlevel% if %errorlevel% neq 0 exit /b %errorlevel%
.\cabal-sandbox\bin\pandoc.exe -s --template data\templates\default.rtf COPYING -t rtf -S -o COPYING.rtf .\.cabal-sandbox\bin\pandoc.exe -s --template data\templates\default.rtf COPYING -t rtf -S -o COPYING.rtf
if %errorlevel% neq 0 exit /b %errorlevel% if %errorlevel% neq 0 exit /b %errorlevel%
copy COPYRIGHT COPYRIGHT.txt copy COPYRIGHT COPYRIGHT.txt
for /f "tokens=1-2 delims= " %%a in ('.\cabal-sandbox\bin\pandoc --version') do ( for /f "tokens=1-2 delims= " %%a in ('.\.cabal-sandbox\bin\pandoc --version') do (
@set VERSION=%%b @set VERSION=%%b
goto :next goto :next
) )

4
windows/pandoc.wxs
View file

@ -44,7 +44,7 @@
Name="Version" Type="string" Value="[ProductVersion]" KeyPath="yes"/> Name="Version" Type="string" Value="[ProductVersion]" KeyPath="yes"/>
<RemoveFolder Id="APPLICATIONFOLDER" On="uninstall"/> <RemoveFolder Id="APPLICATIONFOLDER" On="uninstall"/>
<File Id="pandocEXE" Name="pandoc.exe" <File Id="pandocEXE" Name="pandoc.exe"
Source="..\cabal-dev\bin\pandoc.exe" /> Source="..\.cabal-sandbox\bin\pandoc.exe" />
<File Id="pandocCOPYRIGHT" Name="COPYRIGHT.txt" <File Id="pandocCOPYRIGHT" Name="COPYRIGHT.txt"
Source="..\COPYRIGHT.txt" /> Source="..\COPYRIGHT.txt" />
<File Id="pandocCOPYING" Name="COPYING.rtf" <File Id="pandocCOPYING" Name="COPYING.rtf"
@ -56,7 +56,7 @@
<RegistryValue Root="HKMU" Key="Software\John MacFarlane\Pandoc" <RegistryValue Root="HKMU" Key="Software\John MacFarlane\Pandoc"
Name="Version" Type="string" Value="[ProductVersion]" KeyPath="yes"/> Name="Version" Type="string" Value="[ProductVersion]" KeyPath="yes"/>
<File Id="pandoc_citeprocEXE" Name="pandoc-citeproc.exe" <File Id="pandoc_citeprocEXE" Name="pandoc-citeproc.exe"
Source="..\cabal-dev\bin\pandoc-citeproc.exe" /> Source="..\.cabal-sandbox\bin\pandoc-citeproc.exe" />
</Component> </Component>
<Component Id="UpdatePathUser" <Component Id="UpdatePathUser"