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

niminst updates

Browse source
This commit is contained in:
Andreas Rumpf 2016-10-21 12:12:33 +02:00
commit b99333f53a
8 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

26
tools/niminst/niminst.nim
View file

@ -552,7 +552,7 @@ proc srcdist(c: var ConfigData) =
# --------------------- generate inno setup -----------------------------------
proc setupDist(c: var ConfigData) =
let scrpt = generateInnoSetup(c)
let n = "build" / "install_$#_$#.iss" % [toLower(c.name), c.version]
let n = "build" / "install_$#_$#.iss" % [toLowerAscii(c.name), c.version]
writeFile(n, scrpt, "\13\10")
when defined(windows):
if c.innosetup.path.len == 0:
@ -569,7 +569,7 @@ proc setupDist(c: var ConfigData) =
# --------------------- generate NSIS setup -----------------------------------
proc setupDist2(c: var ConfigData) =
let scrpt = generateNsisSetup(c)
let n = "build" / "install_$#_$#.nsi" % [toLower(c.name), c.version]
let n = "build" / "install_$#_$#.nsi" % [toLowerAscii(c.name), c.version]
writeFile(n, scrpt, "\13\10")
when defined(windows):
if c.nsisSetup.path.len == 0:
@ -586,7 +586,7 @@ proc setupDist2(c: var ConfigData) =
# ------------------ generate ZIP file ---------------------------------------
when haveZipLib:
proc zipDist(c: var ConfigData) =
var proj = toLower(c.name) & "-" & c.version
var proj = toLowerAscii(c.name) & "-" & c.version
var n = "$#.zip" % proj
if c.outdir.len == 0: n = "build" / n
else: n = c.outdir / n
@ -618,7 +618,7 @@ when haveZipLib:
quit("Cannot open for writing: " & n)
proc xzDist(c: var ConfigData; windowsZip=false) =
let proj = toLower(c.name) & "-" & c.version
let proj = toLowerAscii(c.name) & "-" & c.version
let tmpDir = if c.outdir.len == 0: "build" else: c.outdir
template processFile(destFile, src) =
@ -630,17 +630,17 @@ proc xzDist(c: var ConfigData; windowsZip=false) =
if not dirExists(destDir): createDir(destDir)
copyFileWithPermissions(src, dest)
if not existsFile("build" / buildBatFile32):
if not windowsZip and 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)
processFile(proj / makeFile, "build" / makeFile)
processFile(proj / installShFile, installShFile)
processFile(proj / deinstallShFile, deinstallShFile)
if not windowsZip:
processFile(proj / buildBatFile32, "build" / buildBatFile32)
processFile(proj / buildBatFile64, "build" / buildBatFile64)
processFile(proj / buildShFile, "build" / buildShFile)
processFile(proj / makeFile, "build" / makeFile)
processFile(proj / installShFile, installShFile)
processFile(proj / deinstallShFile, deinstallShFile)
for f in walkFiles(c.libpath / "lib/*.h"):
processFile(proj / "c_code" / extractFilename(f), f)
for osA in 1..c.oses.len:
@ -688,11 +688,11 @@ proc debDist(c: var ConfigData) =
echo("Copying source to tmp/niminst/deb/")
var currentSource = getCurrentDir()
var workingDir = getTempDir() / "niminst" / "deb"
var upstreamSource = (c.name.toLower() & "-" & c.version)
var upstreamSource = (c.name.toLowerAscii() & "-" & c.version)
createDir(workingDir / upstreamSource)
template copyNimDist(f, dest: string): stmt =
template copyNimDist(f, dest: string) =
createDir((workingDir / upstreamSource / dest).splitFile.dir)
copyFile(currentSource / f, workingDir / upstreamSource / dest)