Use versioned directory for windows release zipfile.

Also remove old make-windows-installer.bat, superseded
by GitHub actions workflow, and modify pandoc.wxs for
new paths.

2 files changed, 3 insertions, 32 deletions

diff --git a/windows/make-windows-installer.bat b/windows/make-windows-installer.bat
deleted file mode 100644
index a64af6621..000000000
--- a/windows/make-windows-installer.bat
+++ /dev/null
@@ -1,29 +0,0 @@
-@echo off

-stack install --test --ghc-options="-O2" --stack-yaml=..\stack.yaml

-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 --toc ..\MANUAL.txt -o MANUAL.html

-if %errorlevel% neq 0 exit /b %errorlevel%

-%BINPATH%\pandoc.exe -s ..\COPYING.md -t rtf -o COPYING.rtf

-if %errorlevel% neq 0 exit /b %errorlevel%

-copy ..\COPYRIGHT COPYRIGHT.txt

-for /f "tokens=1-2 delims= " %%a in ('%BINPATH%\pandoc.exe --version') do (

-  @set VERSION=%%b

-  goto :next

-  )

-:next

-if "%VERSION%" == "" (

-  echo Error: could not determine version number.

-  exit /b 1

-)

-echo Detected version %VERSION%

-echo Creating msi...

-candle -dVERSION=%VERSION% -dBINPATH=%BINPATH% *.wxs -out wixobj\

-if %errorlevel% neq 0 exit /b %errorlevel%

-light  -sw1076 -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -loc Pandoc-en-us.wxl -out pandoc-%VERSION%-windows.msi wixobj\*.wixobj

-if %errorlevel% neq 0 exit /b %errorlevel%

-echo Starting kSign: sign, then quit kSign to complete the build...

-kSign

-

-echo Copying to shared drive

-copy pandoc-%VERSION%-windows.msi \\VBOXSVR\WindowsShared\

diff --git a/windows/pandoc.wxs b/windows/pandoc.wxs
index dcdd3f582..cb996e76c 100644
--- a/windows/pandoc.wxs
+++ b/windows/pandoc.wxs
@@ -40,9 +40,9 @@
             <File Id="pandocEXE" Name="pandoc.exe"
                   Source="$(var.BINPATH)\pandoc.exe" />
             <File Id="pandocCOPYRIGHT" Name="COPYRIGHT.txt"
-                  Source="COPYRIGHT.txt" />
+                  Source="$(var.BINPATH)\COPYRIGHT.txt" />
             <File Id="pandocCOPYING" Name="COPYING.rtf"
-                  Source="COPYING.rtf" />
+                  Source="$(var.BINPATH)\COPYING.rtf" />
           </Component>
 
           <Component Id="CitationSupport"
@@ -58,7 +58,7 @@
           <Component Id="Documentation"
                      Guid="A8D54A76-1A3D-4647-8327-81B69D39D8A3">
             <File Id="pandocMANUAL" Name="Pandoc User's Guide.html"
-                  Source="MANUAL.html" KeyPath="yes">
+                  Source="$(var.BINPATH)\MANUAL.html" KeyPath="yes">
               <Shortcut Id="ApplicationStartMenuShortcut"
                         Directory="ApplicationProgramsFolder"
                         Name="Pandoc User’s Guide" Advertise="yes" />