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

Improve niminst zip error message and fix CI build.

Browse source
This commit is contained in:
Dominik Picheta 2016-10-16 16:40:00 +02:00
commit b3c18b8dd8
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ci/nsis_build.bat
View file

@ -21,11 +21,8 @@ cd web\upload
move /y docs-%NIMVER%.zip download move /y docs-%NIMVER%.zip download
cd ..\.. cd ..\..
Rem Build .zip file: Rem Build csources
rem koch csources -d:release koch csources -d:release || exit /b
rem koch xz -d:release
rem move /y build\nim-%NIMVER%.zip web\upload\download
rem Grab C sources and nimsuggest rem Grab C sources and nimsuggest
git clone --depth 1 https://github.com/nim-lang/csources.git git clone --depth 1 https://github.com/nim-lang/csources.git

4
tools/niminst/niminst.nim
View file

@ -630,6 +630,10 @@ proc xzDist(c: var ConfigData; windowsZip=false) =
if not dirExists(destDir): createDir(destDir) if not dirExists(destDir): createDir(destDir)
copyFileWithPermissions(src, dest) 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 / buildBatFile32, "build" / buildBatFile32)
processFile(proj / buildBatFile64, "build" / buildBatFile64) processFile(proj / buildBatFile64, "build" / buildBatFile64)
processFile(proj / buildShFile, "build" / buildShFile) processFile(proj / buildShFile, "build" / buildShFile)