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

Rename C sources dir to c_code.

Browse source
This commit is contained in:
Dominik Picheta 2014-01-12 21:48:57 +00:00
commit 429d337ef6
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tools/niminst/buildbat.tmpl
View file

@ -17,8 +17,8 @@ REM call the compiler:
# var linkCmd = "" # var linkCmd = ""
# for ff in items(c.cfiles[winIndex][cpuIndex]): # for ff in items(c.cfiles[winIndex][cpuIndex]):
# let f = ff.toWin # let f = ff.toWin
ECHO %CC% %COMP_FLAGS% -Inimcache -c ?{f} -o ?{changeFileExt(f, "o")} ECHO %CC% %COMP_FLAGS% -Ic_code -c ?{f} -o ?{changeFileExt(f, "o")}
%CC% %COMP_FLAGS% -Inimcache -c ?{f} -o ?{changeFileExt(f, "o")} %CC% %COMP_FLAGS% -Ic_code -c ?{f} -o ?{changeFileExt(f, "o")}
# linkCmd.add(" " & changeFileExt(f, "o")) # linkCmd.add(" " & changeFileExt(f, "o"))
# end for # end for

4
tools/niminst/buildsh.tmpl
View file

@ -128,8 +128,8 @@ case $myos in
# var linkCmd = "" # var linkCmd = ""
# for ff in items(c.cfiles[osA][cpuA]): # for ff in items(c.cfiles[osA][cpuA]):
# let f = ff.toUnix # let f = ff.toUnix
echo "$CC $COMP_FLAGS -Inimcache -c ?{f} -o ?{changeFileExt(f, "o")}" echo "$CC $COMP_FLAGS -Ic_code -c ?{f} -o ?{changeFileExt(f, "o")}"
$CC $COMP_FLAGS -Inimcache -c ?{f} -o ?{changeFileExt(f, "o")} $CC $COMP_FLAGS -Ic_code -c ?{f} -o ?{changeFileExt(f, "o")}
# add(linkCmd, " \\\n" & changeFileExt(f, "o")) # add(linkCmd, " \\\n" & changeFileExt(f, "o"))
# end for # end for
echo "$LINKER -o ?{"$binDir/" & toLower(c.name)} ?linkCmd $LINK_FLAGS" echo "$LINKER -o ?{"$binDir/" & toLower(c.name)} ?linkCmd $LINK_FLAGS"

10
tools/niminst/niminst.nim
View file

@ -392,7 +392,7 @@ proc readCFiles(c: var TConfigData, osA, cpuA: int) =
quit("Cannot open: " & f) quit("Cannot open: " & f)
proc buildDir(os, cpu: int): string = proc buildDir(os, cpu: int): string =
return "nimcache" / ($os & "_" & $cpu) return "c_code" / ($os & "_" & $cpu)
proc getOutputDir(c: var TConfigData): string = proc getOutputDir(c: var TConfigData): string =
if c.outdir.len > 0: c.outdir else: "build" if c.outdir.len > 0: c.outdir else: "build"
@ -432,11 +432,11 @@ proc writeInstallScripts(c: var TConfigData) =
writeFile(deinstallShFile, generateDeinstallScript(c), "\10") writeFile(deinstallShFile, generateDeinstallScript(c), "\10")
proc srcdist(c: var TConfigData) = proc srcdist(c: var TConfigData) =
if not existsDir(getOutputDir(c) / "nimcache"): if not existsDir(getOutputDir(c) / "c_code"):
createDir(getOutputDir(c) / "nimcache") createDir(getOutputDir(c) / "c_code")
for x in walkFiles(c.libpath / "lib/*.h"): for x in walkFiles(c.libpath / "lib/*.h"):
echo(getOutputDir(c) / "nimcache" / extractFilename(x)) echo(getOutputDir(c) / "c_code" / extractFilename(x))
copyFile(dest=getOutputDir(c) / "nimcache" / extractFilename(x), source=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