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

fix linenoise regression (#13395)

Browse source 
* fix nightlies linenoise regression

* fix other installers
This commit is contained in:
Timothee Cour 2020-02-12 01:35:00 -08:00 • committed by GitHub
commit 2b368bcdd7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
tools/niminst/niminst.nim
View file

@ -505,12 +505,20 @@ proc writeInstallScripts(c: var ConfigData) =
writeFile(deinstallShFile, generateDeinstallScript(c), "\10") writeFile(deinstallShFile, generateDeinstallScript(c), "\10")
inclFilePermissions(deinstallShFile, {fpUserExec, fpGroupExec, fpOthersExec}) inclFilePermissions(deinstallShFile, {fpUserExec, fpGroupExec, fpOthersExec})
template gatherFiles(fun, libpath, outDir) =
block:
template copySrc(src) =
let dst = outDir / extractFilename(src)
when false: echo (dst, dst)
fun(src, dst)
for f in walkFiles(libpath / "lib/*.h"): copySrc(f)
copySrc(libpath / "lib/wrappers/linenoise/linenoise.h")
proc srcdist(c: var ConfigData) = proc srcdist(c: var ConfigData) =
if not existsDir(getOutputDir(c) / "c_code"): let cCodeDir = getOutputDir(c) / "c_code"
createDir(getOutputDir(c) / "c_code") if not existsDir(cCodeDir): createDir(cCodeDir)
for x in walkFiles(c.libpath / "lib/*.h"): gatherFiles(copyFile, c.libpath, cCodeDir)
when false: echo(getOutputDir(c) / "c_code" / extractFilename(x))
copyFile(dest=getOutputDir(c) / "c_code" / extractFilename(x), source=x)
var winIndex = -1 var winIndex = -1
var intel32Index = -1 var intel32Index = -1
var intel64Index = -1 var intel64Index = -1
@ -603,8 +611,9 @@ when haveZipLib:
addFile(z, proj / makeFile, "build" / makeFile) addFile(z, proj / makeFile, "build" / makeFile)
addFile(z, proj / installShFile, installShFile) addFile(z, proj / installShFile, installShFile)
addFile(z, proj / deinstallShFile, deinstallShFile) addFile(z, proj / deinstallShFile, deinstallShFile)
for f in walkFiles(c.libpath / "lib/*.h"):
addFile(z, proj / "c_code" / extractFilename(f), f) template addFileAux(src, dst) = addFile(z, dst, src)
gatherFiles(addFileAux, c.libpath, proj / "c_code")
for osA in 1..c.oses.len: for osA in 1..c.oses.len:
for cpuA in 1..c.cpus.len: for cpuA in 1..c.cpus.len:
var dir = buildDir(osA, cpuA) var dir = buildDir(osA, cpuA)
@ -647,8 +656,8 @@ proc xzDist(c: var ConfigData; windowsZip=false) =
processFile(proj / makeFile, "build" / makeFile) processFile(proj / makeFile, "build" / makeFile)
processFile(proj / installShFile, installShFile) processFile(proj / installShFile, installShFile)
processFile(proj / deinstallShFile, deinstallShFile) processFile(proj / deinstallShFile, deinstallShFile)
for f in walkFiles(c.libpath / "lib/*.h"): template processFileAux(src, dst) = processFile(dst, src)
processFile(proj / "c_code" / extractFilename(f), f) gatherFiles(processFileAux, c.libpath, proj / "c_code")
for osA in 1..c.oses.len: for osA in 1..c.oses.len:
for cpuA in 1..c.cpus.len: for cpuA in 1..c.cpus.len:
var dir = buildDir(osA, cpuA) var dir = buildDir(osA, cpuA)
@ -722,8 +731,7 @@ proc debDist(c: var ConfigData) =
copyNimDist(makeFile, makeFile) copyNimDist(makeFile, makeFile)
copyNimDist(installShFile, installShFile) copyNimDist(installShFile, installShFile)
createDir(workingDir / upstreamSource / "build") createDir(workingDir / upstreamSource / "build")
for f in walkFiles(c.libpath / "lib/*.h"): gatherFiles(copyNimDist, c.libpath, "build")
copyNimDist(f, "build" / extractFilename(f))
for osA in 1..c.oses.len: for osA in 1..c.oses.len:
for cpuA in 1..c.cpus.len: for cpuA in 1..c.cpus.len:
var dir = buildDir(osA, cpuA) var dir = buildDir(osA, cpuA)