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

fixes 'koch winrelease'

Browse source
This commit is contained in:
Araq 2017-05-18 13:07:36 +02:00
commit ecdc478dac
1 changed files with 10 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

32
koch.nim
View file

@ -152,6 +152,10 @@ proc tryExec(cmd: string): bool =
proc safeRemove(filename: string) = proc safeRemove(filename: string) =
if existsFile(filename): removeFile(filename) if existsFile(filename): removeFile(filename)
proc overwriteFile(source, dest: string) =
safeRemove(dest)
moveFile(source, dest)
proc copyExe(source, dest: string) = proc copyExe(source, dest: string) =
safeRemove(dest) safeRemove(dest)
copyFile(dest=dest, source=source) copyFile(dest=dest, source=source)
@ -388,33 +392,17 @@ proc clean(args: string) =
# -------------- builds a release --------------------------------------------- # -------------- builds a release ---------------------------------------------
proc patchConfig(lookFor, replaceBy: string) =
const
cfgFile = "config/nim.cfg"
try:
let cfg = readFile(cfgFile)
let newCfg = cfg.replace(lookFor, replaceBy)
if newCfg == cfg:
echo "Could not patch 'config/nim.cfg' [Error]"
echo "Reason: patch substring not found:"
echo lookFor
else:
writeFile(cfgFile, newCfg)
except IOError:
quit "Could not access 'config/nim.cfg' [Error]"
proc winReleaseArch(arch: string) = proc winReleaseArch(arch: string) =
doAssert arch in ["32", "64"] doAssert arch in ["32", "64"]
let cpu = if arch == "32": "i386" else: "amd64" let cpu = if arch == "32": "i386" else: "amd64"
template withMingw(path, body) = template withMingw(path, body) =
const orig = """#gcc.path = r"$nim\dist\mingw\bin"""" let prevPath = getEnv("PATH")
let replacePattern = """gcc.path = r"..\mingw$1\bin" # winrelease""" % arch putEnv("PATH", path & PathSep & prevPath)
patchConfig(orig, replacePattern)
try: try:
body body
finally: finally:
patchConfig(replacePattern, orig) putEnv("PATH", prevPath)
withMingw r"..\mingw" & arch & r"\bin": withMingw r"..\mingw" & arch & r"\bin":
# Rebuilding koch is necessary because it uses its pointer size to # Rebuilding koch is necessary because it uses its pointer size to
@ -422,7 +410,7 @@ proc winReleaseArch(arch: string) =
nimexec "c --out:koch_temp --cpu:$# koch" % cpu nimexec "c --out:koch_temp --cpu:$# koch" % cpu
exec "koch_temp boot -d:release --cpu:$#" % cpu exec "koch_temp boot -d:release --cpu:$#" % cpu
exec "koch_temp zip -d:release" exec "koch_temp zip -d:release"
moveFile r"build\nim-$#.zip" % VersionAsString, overwriteFile r"build\nim-$#.zip" % VersionAsString,
r"web\upload\download\nim-$#_x$#.zip" % [VersionAsString, arch] r"web\upload\download\nim-$#_x$#.zip" % [VersionAsString, arch]
proc winRelease() = proc winRelease() =
@ -431,8 +419,8 @@ proc winRelease() =
web(gaCode) web(gaCode)
withDir "web/upload/" & VersionAsString: withDir "web/upload/" & VersionAsString:
exec "7z a -tzip docs-$#.zip *.html" % VersionAsString exec "7z a -tzip docs-$#.zip *.html" % VersionAsString
moveFile "web/upload/$1/docs-$1.zip" % VersionAsString, overwriteFile "web/upload/$1/docs-$1.zip" % VersionAsString,
"web/upload/download/docs-$1.zip" % VersionAsString "web/upload/download/docs-$1.zip" % VersionAsString
when true: when true:
csource("-d:release") csource("-d:release")
when true: when true: