git.iko.soy/typeable/pandoc
on master help sign in
Windows installer: more typos from transition from cabal-dev.
commitef8de35505833938c70253fb11659400fc3e18fb authorJohn MacFarlane <fiddlosopher@gmail.com> dateTue 6 May 2014, 08:56 (12 years ago) parent7019069
2 files changed+4−4
compare with master
unifiedsplit
windows/make-windows-installer.bat+2−2 windows/pandoc.wxs+2−2
windows/make-windows-installer.bat+2−2
@@ -13,10 +13,10 @@ strip .\.cabal-sandbox\bin\pandoc.exe
1313strip .\.cabal-sandbox\bin\pandoc-citeproc.exe
1414.\.cabal-sandbox\bin\pandoc.exe -s --template data\templates\default.html -S README -o README.html
1515if %errorlevel% neq 0 exit /b %errorlevel%
16−.\cabal-sandbox\bin\pandoc.exe -s --template data\templates\default.rtf COPYING -t rtf -S -o COPYING.rtf
16+.\.cabal-sandbox\bin\pandoc.exe -s --template data\templates\default.rtf COPYING -t rtf -S -o COPYING.rtf
1717if %errorlevel% neq 0 exit /b %errorlevel%
1818copy COPYRIGHT COPYRIGHT.txt
19−for /f "tokens=1-2 delims= " %%a in ('.\cabal-sandbox\bin\pandoc --version') do (
19+for /f "tokens=1-2 delims= " %%a in ('.\.cabal-sandbox\bin\pandoc --version') do (
2020 @set VERSION=%%b
2121 goto :next
2222 )
windows/pandoc.wxs+2−2
@@ -44,7 +44,7 @@
4444 Name="Version" Type="string" Value="[ProductVersion]" KeyPath="yes"/>
4545 <RemoveFolder Id="APPLICATIONFOLDER" On="uninstall"/>
4646 <File Id="pandocEXE" Name="pandoc.exe"
47− Source="..\cabal-dev\bin\pandoc.exe" />
47+ Source="..\.cabal-sandbox\bin\pandoc.exe" />
4848 <File Id="pandocCOPYRIGHT" Name="COPYRIGHT.txt"
4949 Source="..\COPYRIGHT.txt" />
5050 <File Id="pandocCOPYING" Name="COPYING.rtf"
@@ -56,7 +56,7 @@
5656 <RegistryValue Root="HKMU" Key="Software\John MacFarlane\Pandoc"
5757 Name="Version" Type="string" Value="[ProductVersion]" KeyPath="yes"/>
5858 <File Id="pandoc_citeprocEXE" Name="pandoc-citeproc.exe"
59− Source="..\cabal-dev\bin\pandoc-citeproc.exe" />
59+ Source="..\.cabal-sandbox\bin\pandoc-citeproc.exe" />
6060 </Component>
6161
6262 <Component Id="UpdatePathUser"