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

niminst: bugfixes; documentation changes

Browse source
This commit is contained in:
Araq 2012-01-15 01:03:57 +01:00
commit f58cc49672
9 changed files with 70 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tools/niminst/buildbat.tmpl
View file

@ -15,7 +15,7 @@ ECHO %CC% %COMP_FLAGS% -Ibuild -c ?{f} -o ?{changeFileExt(f, "o")}
# linkCmd.add(" " & changeFileExt(f, "o"))
# end for
ECHO %LINKER% %LINK_FLAGS% -o ?{c.binPaths[0]}\?{toLower(c.name)}.exe ?linkCmd
%LINKER% %LINK_FLAGS% -o ?{c.binPaths[0]}\?{toLower(c.name)}.exe ?linkCmd
ECHO %LINKER% %LINK_FLAGS% -o ?{firstBinPath(c)\toLower(c.name)}.exe ?linkCmd
%LINKER% %LINK_FLAGS% -o ?{firstBinPath(c)\toLower(c.name)}.exe ?linkCmd
ECHO SUCCESS

4
tools/niminst/buildsh.tmpl
View file

@ -90,8 +90,8 @@ case $myos in
$CC $COMP_FLAGS -Ibuild -c ?{f} -o ?{changeFileExt(f, "o")} || exit 1
# add(linkCmd, " \\\n" & changeFileExt(f, "o"))
# end for
echo "$LINKER $LINK_FLAGS -o ?{c.binPaths[0]}/?{toLower(c.name)} ?linkCmd"
$LINKER $LINK_FLAGS -o ?{c.binPaths[0]}/?{toLower(c.name)} ?linkCmd || exit 1
echo "$LINKER $LINK_FLAGS -o ?{firstBinPath(c)/toLower(c.name)} ?linkCmd"
$LINKER $LINK_FLAGS -o ?{firstBinPath(c)/toLower(c.name)} ?linkCmd || exit 1
;;
# end for
*)

7
tools/niminst/niminst.nim
View file

@ -86,6 +86,13 @@ proc initConfigData(c: var TConfigData) =
c.uninstallScript = false
c.vars = newStringTable(modeStyleInsensitive)
proc firstBinPath(c: TConfigData): string =
if c.binPaths.len > 0: result = c.binPaths[0]
else: result = ""
proc `\`(a, b: string): string =
result = if a.len == 0: b else: a & '\\' & b
proc skipRoot(f: string): string =
# "abc/def/xyz" --> "def/xyz"
var i = 0