jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

disable NSIS installers, ship with downloader.exe instead

Browse source
This commit is contained in:
Araq 2017-02-07 01:32:21 +01:00
commit 379bdeca06
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/installer.ini
View file

@ -94,6 +94,8 @@ Files: "bin/vccexe.exe"
Files: "koch.exe" Files: "koch.exe"
Files: "finish.exe" Files: "finish.exe"
Files: "downloader.exe"
; Files: "dist/mingw" ; Files: "dist/mingw"
Files: r"tools\start.bat" Files: r"tools\start.bat"
BinPath: r"bin;dist\mingw\bin;dist" BinPath: r"bin;dist\mingw\bin;dist"

5
koch.nim
View file

@ -223,6 +223,8 @@ proc bundleWinTools() =
copyExe("tools/finish".exe, "finish".exe) copyExe("tools/finish".exe, "finish".exe)
removeFile("tools/finish".exe) removeFile("tools/finish".exe)
nimexec("c -o:bin/vccexe.exe tools/vccenv/vccexe") nimexec("c -o:bin/vccexe.exe tools/vccenv/vccexe")
nimexec("c --cc:vcc --app:gui -o:downloader.exe --noNimblePath " &
"--path:..\ui tools\downloader.nim")
proc zip(args: string) = proc zip(args: string) =
bundleNimbleSrc() bundleNimbleSrc()
@ -418,6 +420,9 @@ proc winReleaseArch(arch: string) =
exec "koch_temp nsis -d:release" exec "koch_temp nsis -d:release"
exec "koch_temp zip -d:release" exec "koch_temp zip -d:release"
when false:
# we now disable the NSIS installer as it cannot download from https
# and is broken in so many different ways it's not funny anymore:
moveFile r"build\nim_$#.exe" % VersionAsString, moveFile r"build\nim_$#.exe" % VersionAsString,
r"web\upload\download\nim-$#_x$#.exe" % [VersionAsString, arch] r"web\upload\download\nim-$#_x$#.exe" % [VersionAsString, arch]
moveFile r"build\nim-$#.zip" % VersionAsString, moveFile r"build\nim-$#.zip" % VersionAsString,