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

Fix #12027 (#15519)

Browse source
This commit is contained in:
genotrance 2020-10-10 00:04:57 -05:00 • committed by GitHub
commit 442841037a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
koch.nim
View file

@ -78,7 +78,7 @@ Boot options:
Commands for core developers: Commands for core developers:
runCI runs continuous integration (CI), eg from travis runCI runs continuous integration (CI), eg from travis
docs [options] generates the full documentation docs [options] generates the full documentation
csource -d:release builds the C sources for installation csource -d:danger builds the C sources for installation
pdf builds the PDF documentation pdf builds the PDF documentation
zip builds the installation zip package zip builds the installation zip package
xz builds the installation tar.xz package xz builds the installation tar.xz package
@ -416,7 +416,7 @@ proc winRelease*() =
"web/upload/download/docs-$1.zip" % VersionAsString "web/upload/download/docs-$1.zip" % VersionAsString
when true: when true:
inFold "winrelease csource": inFold "winrelease csource":
csource("-d:release") csource("-d:danger")
when sizeof(pointer) == 4: when sizeof(pointer) == 4:
winReleaseArch "32" winReleaseArch "32"
when sizeof(pointer) == 8: when sizeof(pointer) == 8:
@ -561,7 +561,7 @@ proc runCI(cmd: string) =
proc pushCsources() = proc pushCsources() =
if not dirExists("../csources/.git"): if not dirExists("../csources/.git"):
quit "[Error] no csources git repository found" quit "[Error] no csources git repository found"
csource("-d:release") csource("-d:danger")
let cwd = getCurrentDir() let cwd = getCurrentDir()
try: try:
copyDir("build/c_code", "../csources/c_code") copyDir("build/c_code", "../csources/c_code")
@ -582,7 +582,7 @@ proc pushCsources() =
setCurrentDir(cwd) setCurrentDir(cwd)
proc testUnixInstall(cmdLineRest: string) = proc testUnixInstall(cmdLineRest: string) =
csource("-d:release " & cmdLineRest) csource("-d:danger" & cmdLineRest)
xz(false, cmdLineRest) xz(false, cmdLineRest)
let oldCurrentDir = getCurrentDir() let oldCurrentDir = getCurrentDir()
try: try:

2
tools/niminst/niminst.nim
View file

@ -605,7 +605,7 @@ proc xzDist(c: var ConfigData; windowsZip=false) =
if not windowsZip and not fileExists("build" / buildBatFile): if not windowsZip and not fileExists("build" / buildBatFile):
quit("No C sources found in ./build/, please build by running " & quit("No C sources found in ./build/, please build by running " &
"./koch csource -d:release.") "./koch csource -d:danger.")
if not windowsZip: if not windowsZip:
processFile(proj / buildBatFile, "build" / buildBatFile) processFile(proj / buildBatFile, "build" / buildBatFile)