From b3c18b8dd8156793db3022c020ada17c3017af37 Mon Sep 17 00:00:00 2001 From: Dominik Picheta Date: Sun, 16 Oct 2016 16:40:00 +0200 Subject: [PATCH] Improve niminst zip error message and fix CI build. --- ci/nsis_build.bat | 7 ++----- tools/niminst/niminst.nim | 4 ++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ci/nsis_build.bat b/ci/nsis_build.bat index 657b2b90a..bc3aea407 100644 --- a/ci/nsis_build.bat +++ b/ci/nsis_build.bat @@ -21,11 +21,8 @@ cd web\upload move /y docs-%NIMVER%.zip download cd ..\.. -Rem Build .zip file: -rem koch csources -d:release -rem koch xz -d:release -rem move /y build\nim-%NIMVER%.zip web\upload\download - +Rem Build csources +koch csources -d:release || exit /b rem Grab C sources and nimsuggest git clone --depth 1 https://github.com/nim-lang/csources.git diff --git a/tools/niminst/niminst.nim b/tools/niminst/niminst.nim index bb56c3dc1..feab698fd 100644 --- a/tools/niminst/niminst.nim +++ b/tools/niminst/niminst.nim @@ -630,6 +630,10 @@ proc xzDist(c: var ConfigData; windowsZip=false) = if not dirExists(destDir): createDir(destDir) copyFileWithPermissions(src, dest) + if not existsFile("build" / buildBatFile32): + quit("No C sources found in ./build/, please build by running " & + "./koch csource -d:release.") + processFile(proj / buildBatFile32, "build" / buildBatFile32) processFile(proj / buildBatFile64, "build" / buildBatFile64) processFile(proj / buildShFile, "build" / buildShFile)