Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Quote nim executable before executing. #13316

Merged
merged 1 commit into from
Feb 2, 2020
Merged

Quote nim executable before executing. #13316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions koch.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ when false:

proc pdf(args="") =
exec("$# cc -r tools/nimweb.nim $# --pdf web/website.ini --putenv:nimversion=$#" %
[findNim(), args, VersionAsString], additionalPATH=findNim().splitFile.dir)
[findNim().quoteShell(), args, VersionAsString], additionalPATH=findNim().splitFile.dir)

# -------------- boot ---------------------------------------------------------

Expand Down Expand Up @@ -297,7 +297,7 @@ proc boot(args: string) =
let smartNimcache = (if "release" in args or "danger" in args: "nimcache/r_" else: "nimcache/d_") &
hostOS & "_" & hostCPU

let nimStart = findStartNim()
let nimStart = findStartNim().quoteShell()
for i in 0..2:
let defaultCommand = if useCpp: "cpp" else: "c"
let bootOptions = if args.len == 0 or args.startsWith("-"): defaultCommand else: ""
Expand Down Expand Up @@ -455,7 +455,7 @@ proc temp(args: string) =
"threads" notin programArgs and
"js" notin programArgs:
bootArgs.add " -d:leanCompiler"
let nimexec = findNim()
let nimexec = findNim().quoteShell()
exec(nimexec & " c -d:debug --debugger:native -d:nimBetterRun " & bootArgs & " " & (d / "compiler" / "nim"), 125)
copyExe(output, finalDest)
setCurrentDir(origDir)
Expand Down
16 changes: 8 additions & 8 deletions tools/kochdocs.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,16 @@ proc execCleanPath*(cmd: string,

proc nimexec*(cmd: string) =
# Consider using `nimCompile` instead
exec findNim() & " " & cmd
exec findNim().quoteShell() & " " & cmd

proc nimCompile*(input: string, outputDir = "bin", mode = "c", options = "") =
let output = outputDir / input.splitFile.name.exe
let cmd = findNim() & " " & mode & " -o:" & output & " " & options & " " & input
let cmd = findNim().quoteShell() & " " & mode & " -o:" & output & " " & options & " " & input
exec cmd

proc nimCompileFold*(desc, input: string, outputDir = "bin", mode = "c", options = "") =
let output = outputDir / input.splitFile.name.exe
let cmd = findNim() & " " & mode & " -o:" & output & " " & options & " " & input
let cmd = findNim().quoteShell() & " " & mode & " -o:" & output & " " & options & " " & input
execFold(desc, cmd)

const
Expand Down Expand Up @@ -299,15 +299,15 @@ proc buildDocSamples(nimArgs, destPath: string) =
##
## TODO: consider integrating into the existing generic documentation builders
## now that we have a single `doc` command.
exec(findNim() & " doc $# -o:$# $#" %
exec(findNim().quoteShell() & " doc $# -o:$# $#" %
[nimArgs, destPath / "docgen_sample.html", "doc" / "docgen_sample.nim"])

proc buildDoc(nimArgs, destPath: string) =
# call nim for the documentation:
var
commands = newSeq[string](rst2html.len + len(doc0) + len(doc) + withoutIndex.len)
i = 0
let nim = findNim()
let nim = findNim().quoteShell()
for d in items(rst2html):
commands[i] = nim & " rst2html $# --git.url:$# -o:$# --index:on $#" %
[nimArgs, gitUrl,
Expand Down Expand Up @@ -339,7 +339,7 @@ proc buildPdfDoc*(nimArgs, destPath: string) =
else:
const pdflatexcmd = "pdflatex -interaction=nonstopmode "
for d in items(pdf):
exec(findNim() & " rst2tex $# $#" % [nimArgs, d])
exec(findNim().quoteShell() & " rst2tex $# $#" % [nimArgs, d])
# call LaTeX twice to get cross references right:
exec(pdflatexcmd & changeFileExt(d, "tex"))
exec(pdflatexcmd & changeFileExt(d, "tex"))
Expand All @@ -356,9 +356,9 @@ proc buildPdfDoc*(nimArgs, destPath: string) =
removeFile(changeFileExt(d, "tex"))

proc buildJS() =
exec(findNim() & " js -d:release --out:$1 tools/nimblepkglist.nim" %
exec(findNim().quoteShell() & " js -d:release --out:$1 tools/nimblepkglist.nim" %
[webUploadOutput / "nimblepkglist.js"])
exec(findNim() & " js " & (docHackDir / "dochack.nim"))
exec(findNim().quoteShell() & " js " & (docHackDir / "dochack.nim"))

proc buildDocs*(args: string) =
const
Expand Down