aboutsummaryrefslogtreecommitdiffhomepage
path: root/build_win.bat
diff options
context:
space:
mode:
authorCalvin Rose <calsrose@gmail.com>2019-12-19 13:18:46 -0500
committerCalvin Rose <calsrose@gmail.com>2019-12-19 13:18:46 -0500
commit3492ed6d88c658bb579e6ede0f1b8c9a97ffdb26 (patch)
tree119a2195c35c628af4211786c162c208a5e1d5ce /build_win.bat
parentAdd array/fill (diff)
Windows installer pulls version from interpreter.
This should make version updates simpler. Also try an make installer write to ProgramFiles instead of ProgramFiles (x86) for 64 bit build.
Diffstat (limited to 'build_win.bat')
-rw-r--r--build_win.bat6
1 files changed, 5 insertions, 1 deletions
diff --git a/build_win.bat b/build_win.bat
index e1013c01..5d4b5713 100644
--- a/build_win.bat
+++ b/build_win.bat
@@ -157,7 +157,11 @@ copy auxbin\jpm dist\jpm
copy tools\jpm.bat dist\jpm.bat
@rem Create installer
-"C:\Program Files (x86)\NSIS\makensis.exe" janet-installer.nsi
+janet.exe -e "(print janet/version)" > build\version.txt
+janet.exe -e "(print (= (os/arch) :x64))" > build\64bit.txt
+set /p JANET_VERSION= < build\version.txt
+set /p SIXTYFOUR= < build\64bit.txt
+"C:\Program Files (x86)\NSIS\makensis.exe" janet-installer.nsi /DVERSION=%JANET_VERSION% /DSIXTYFOUR=%SIXTYFOUR%
exit /b 0
@rem Run the installer. (Installs to the local user with default settings)