Fixes #7
This commit is contained in:
parent
eeea3fc211
commit
05d662152a
2 changed files with 4 additions and 3 deletions
|
|
@ -242,9 +242,10 @@ proc installFromDir(dir: string, latest: bool): string =
|
||||||
# Dependencies need to be processed before the creation of the pkg dir.
|
# Dependencies need to be processed before the creation of the pkg dir.
|
||||||
let paths = processDeps(pkginfo)
|
let paths = processDeps(pkginfo)
|
||||||
|
|
||||||
|
if pkgInfo.bin.len > 0: buildFromDir(pkgInfo, paths)
|
||||||
|
|
||||||
createDir(pkgDestDir)
|
createDir(pkgDestDir)
|
||||||
if pkgInfo.bin.len > 0:
|
if pkgInfo.bin.len > 0:
|
||||||
buildFromDir(pkgInfo, paths)
|
|
||||||
createDir(binDir)
|
createDir(binDir)
|
||||||
# Copy all binaries and files that are not skipped
|
# Copy all binaries and files that are not skipped
|
||||||
copyFilesRec(realDir, realDir, pkgDestDir, pkgInfo)
|
copyFilesRec(realDir, realDir, pkgDestDir, pkgInfo)
|
||||||
|
|
|
||||||
|
|
@ -3,14 +3,14 @@
|
||||||
#
|
#
|
||||||
# Various miscellaneous utility functions reside here.
|
# Various miscellaneous utility functions reside here.
|
||||||
import osproc, pegs, strutils, os
|
import osproc, pegs, strutils, os
|
||||||
import version
|
import version, common
|
||||||
|
|
||||||
# TODO: Merge with common.nim?
|
# TODO: Merge with common.nim?
|
||||||
|
|
||||||
proc doCmd*(cmd: string) =
|
proc doCmd*(cmd: string) =
|
||||||
let exitCode = execCmd(cmd)
|
let exitCode = execCmd(cmd)
|
||||||
if exitCode != QuitSuccess:
|
if exitCode != QuitSuccess:
|
||||||
quit("Execution failed with exit code " & $exitCode, QuitFailure)
|
raise newException(EBabel, "Execution failed with exit code " & $exitCode)
|
||||||
|
|
||||||
template cd*(dir: string, body: stmt) =
|
template cd*(dir: string, body: stmt) =
|
||||||
## Sets the current dir to ``dir``, executes ``body`` and restores the
|
## Sets the current dir to ``dir``, executes ``body`` and restores the
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue