diff options
| author | Araq <rumpf_a@web.de> | 2017-02-07 01:32:21 +0100 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2017-02-07 01:32:21 +0100 |
| commit | 379bdeca06b42a7151a60ae14617117432ceb03d (patch) | |
| tree | bb42c41df4b02e8b018391d3484055f8527e3adb | |
| parent | 2d3385c22204091fa5fc2963b5c009ec0182715d (diff) | |
| download | Nim-379bdeca06b42a7151a60ae14617117432ceb03d.tar.gz | |
disable NSIS installers, ship with downloader.exe instead
| -rw-r--r-- | compiler/installer.ini | 2 | ||||
| -rw-r--r-- | koch.nim | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/compiler/installer.ini b/compiler/installer.ini index ebdbe43e6..31c6f7728 100644 --- a/compiler/installer.ini +++ b/compiler/installer.ini @@ -94,6 +94,8 @@ Files: "bin/vccexe.exe" Files: "koch.exe" Files: "finish.exe" +Files: "downloader.exe" + ; Files: "dist/mingw" Files: r"tools\start.bat" BinPath: r"bin;dist\mingw\bin;dist" diff --git a/koch.nim b/koch.nim index 1d0ece5ff..2b5e05207 100644 --- a/koch.nim +++ b/koch.nim @@ -223,6 +223,8 @@ proc bundleWinTools() = copyExe("tools/finish".exe, "finish".exe) removeFile("tools/finish".exe) 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) = bundleNimbleSrc() @@ -418,8 +420,11 @@ proc winReleaseArch(arch: string) = exec "koch_temp nsis -d:release" exec "koch_temp zip -d:release" - moveFile r"build\nim_$#.exe" % VersionAsString, - r"web\upload\download\nim-$#_x$#.exe" % [VersionAsString, arch] + 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, + r"web\upload\download\nim-$#_x$#.exe" % [VersionAsString, arch] moveFile r"build\nim-$#.zip" % VersionAsString, r"web\upload\download\nim-$#_x$#.zip" % [VersionAsString, arch] |