mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-04-27 09:43:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Araq/Nimrod into vm2

Browse Source 
Conflicts:
	web/news.txt
This commit is contained in:
Araq
2013-12-23 01:23:16 +01:00
parent 9145bcfbb6 52a8226edd
commit b76729df1c
35 changed files with 1047 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/niminst/niminst.nim
View File

@@ -14,7 +14,7 @@ when haveZipLib:
import zipfiles
import
os, strutils, parseopt, parsecfg, strtabs, streams, debcreation
os, osproc, strutils, parseopt, parsecfg, strtabs, streams, debcreation
const
maxOS = 20 # max number of OSes
@@ -486,7 +486,7 @@ proc setupDist(c: var TConfigData) =
if c.innoSetup.path.len == 0:
c.innoSetup.path = "iscc.exe"
var outcmd = if c.outdir.len == 0: "build" else: c.outdir
var cmd = "$# $# /O$# $#" % [quoteIfContainsWhite(c.innoSetup.path),
var cmd = "$# $# /O$# $#" % [quoteShell(c.innoSetup.path),
c.innoSetup.flags, outcmd, n]
echo(cmd)
if execShellCmd(cmd) == 0:
@@ -587,4 +587,3 @@ if actionZip in c.actions:
quit("libzip is not installed")
if actionDeb in c.actions:
debDist(c)