add install only dependencies
This commit is contained in:
tormund
parent
e29b915d9c
commit
cec74dbdcc
2 changed files with 90 additions and 82 deletions
169
src/nimble.nim
169
src/nimble.nim
|
|
@ -363,101 +363,106 @@ proc installFromDir(dir: string, latest: bool, options: Options,
|
||||||
let realDir = pkgInfo.getRealDir()
|
let realDir = pkgInfo.getRealDir()
|
||||||
let binDir = options.getBinDir()
|
let binDir = options.getBinDir()
|
||||||
let pkgsDir = options.getPkgsDir()
|
let pkgsDir = options.getPkgsDir()
|
||||||
|
var deps_options = options
|
||||||
|
deps_options.depsOnly = false
|
||||||
|
|
||||||
# Dependencies need to be processed before the creation of the pkg dir.
|
# Dependencies need to be processed before the creation of the pkg dir.
|
||||||
result.paths = processDeps(pkginfo, options)
|
result.paths = processDeps(pkginfo, deps_options)
|
||||||
|
|
||||||
echo("Installing ", pkginfo.name, "-", pkginfo.version)
|
if not options.depsOnly:
|
||||||
|
echo("Installing ", pkginfo.name, "-", pkginfo.version)
|
||||||
|
|
||||||
# Build before removing an existing package (if one exists). This way
|
# Build before removing an existing package (if one exists). This way
|
||||||
# if the build fails then the old package will still be installed.
|
# if the build fails then the old package will still be installed.
|
||||||
if pkgInfo.bin.len > 0: buildFromDir(pkgInfo, result.paths, true)
|
if pkgInfo.bin.len > 0: buildFromDir(pkgInfo, result.paths, true)
|
||||||
|
|
||||||
let versionStr = (if latest: "" else: '-' & pkgInfo.version)
|
let versionStr = (if latest: "" else: '-' & pkgInfo.version)
|
||||||
let pkgDestDir = pkgsDir / (pkgInfo.name & versionStr)
|
let pkgDestDir = pkgsDir / (pkgInfo.name & versionStr)
|
||||||
if existsDir(pkgDestDir) and existsFile(pkgDestDir / "nimblemeta.json"):
|
if existsDir(pkgDestDir) and existsFile(pkgDestDir / "nimblemeta.json"):
|
||||||
if not options.prompt(pkgInfo.name & versionStr &
|
if not options.prompt(pkgInfo.name & versionStr &
|
||||||
" already exists. Overwrite?"):
|
" already exists. Overwrite?"):
|
||||||
quit(QuitSuccess)
|
quit(QuitSuccess)
|
||||||
removePkgDir(pkgDestDir, options)
|
removePkgDir(pkgDestDir, options)
|
||||||
# Remove any symlinked binaries
|
# Remove any symlinked binaries
|
||||||
for bin in pkgInfo.bin:
|
for bin in pkgInfo.bin:
|
||||||
# TODO: Check that this binary belongs to the package being installed.
|
# TODO: Check that this binary belongs to the package being installed.
|
||||||
when defined(windows):
|
when defined(windows):
|
||||||
removeFile(binDir / bin.changeFileExt("cmd"))
|
removeFile(binDir / bin.changeFileExt("cmd"))
|
||||||
removeFile(binDir / bin.changeFileExt(""))
|
removeFile(binDir / bin.changeFileExt(""))
|
||||||
# TODO: Remove this later.
|
# TODO: Remove this later.
|
||||||
# Remove .bat file too from previous installs.
|
# Remove .bat file too from previous installs.
|
||||||
removeFile(binDir / bin.changeFileExt("bat"))
|
removeFile(binDir / bin.changeFileExt("bat"))
|
||||||
else:
|
else:
|
||||||
removeFile(binDir / bin)
|
removeFile(binDir / bin)
|
||||||
|
|
||||||
## Will contain a list of files which have been installed.
|
## Will contain a list of files which have been installed.
|
||||||
var filesInstalled: HashSet[string]
|
var filesInstalled: HashSet[string]
|
||||||
|
|
||||||
createDir(pkgDestDir)
|
createDir(pkgDestDir)
|
||||||
if pkgInfo.bin.len > 0:
|
if pkgInfo.bin.len > 0:
|
||||||
createDir(binDir)
|
createDir(binDir)
|
||||||
# Copy all binaries and files that are not skipped
|
# Copy all binaries and files that are not skipped
|
||||||
filesInstalled = copyFilesRec(realDir, realDir, pkgDestDir, options,
|
filesInstalled = copyFilesRec(realDir, realDir, pkgDestDir, options,
|
||||||
pkgInfo)
|
pkgInfo)
|
||||||
# Set file permissions to +x for all binaries built,
|
# Set file permissions to +x for all binaries built,
|
||||||
# and symlink them on *nix OS' to $nimbleDir/bin/
|
# and symlink them on *nix OS' to $nimbleDir/bin/
|
||||||
for bin in pkgInfo.bin:
|
for bin in pkgInfo.bin:
|
||||||
if not existsFile(pkgDestDir / bin):
|
if not existsFile(pkgDestDir / bin):
|
||||||
filesInstalled.incl copyFileD(pkgInfo.getOutputDir(bin),
|
filesInstalled.incl copyFileD(pkgInfo.getOutputDir(bin),
|
||||||
pkgDestDir / bin)
|
pkgDestDir / bin)
|
||||||
|
|
||||||
let currentPerms = getFilePermissions(pkgDestDir / bin)
|
let currentPerms = getFilePermissions(pkgDestDir / bin)
|
||||||
setFilePermissions(pkgDestDir / bin, currentPerms + {fpUserExec})
|
setFilePermissions(pkgDestDir / bin, currentPerms + {fpUserExec})
|
||||||
let cleanBin = bin.extractFilename
|
let cleanBin = bin.extractFilename
|
||||||
when defined(unix):
|
when defined(unix):
|
||||||
# TODO: Verify that we are removing an old bin of this package, not
|
# TODO: Verify that we are removing an old bin of this package, not
|
||||||
# some other package's binary!
|
# some other package's binary!
|
||||||
if existsFile(binDir / cleanBin): removeFile(binDir / cleanBin)
|
if existsFile(binDir / cleanBin): removeFile(binDir / cleanBin)
|
||||||
echo("Creating symlink: ", pkgDestDir / bin, " -> ", binDir / cleanBin)
|
echo("Creating symlink: ", pkgDestDir / bin, " -> ", binDir / cleanBin)
|
||||||
createSymlink(pkgDestDir / bin, binDir / cleanBin)
|
createSymlink(pkgDestDir / bin, binDir / cleanBin)
|
||||||
elif defined(windows):
|
elif defined(windows):
|
||||||
# There is a bug on XP, described here:
|
# There is a bug on XP, described here:
|
||||||
# http://stackoverflow.com/questions/2182568/batch-script-is-not-executed-if-chcp-was-called
|
# http://stackoverflow.com/questions/2182568/batch-script-is-not-executed-if-chcp-was-called
|
||||||
# But this workaround brokes code page on newer systems, so we need to detect OS version
|
# But this workaround brokes code page on newer systems, so we need to detect OS version
|
||||||
var osver = OSVERSIONINFO()
|
var osver = OSVERSIONINFO()
|
||||||
osver.dwOSVersionInfoSize = cast[DWORD](sizeof(OSVERSIONINFO))
|
osver.dwOSVersionInfoSize = cast[DWORD](sizeof(OSVERSIONINFO))
|
||||||
if GetVersionExA(osver) == WINBOOL(0):
|
if GetVersionExA(osver) == WINBOOL(0):
|
||||||
raise newException(NimbleError,
|
raise newException(NimbleError,
|
||||||
"Can't detect OS version: GetVersionExA call failed")
|
"Can't detect OS version: GetVersionExA call failed")
|
||||||
let fixChcp = osver.dwMajorVersion <= 5
|
let fixChcp = osver.dwMajorVersion <= 5
|
||||||
|
|
||||||
let dest = binDir / cleanBin.changeFileExt("cmd")
|
let dest = binDir / cleanBin.changeFileExt("cmd")
|
||||||
echo("Creating stub: ", pkgDestDir / bin, " -> ", dest)
|
echo("Creating stub: ", pkgDestDir / bin, " -> ", dest)
|
||||||
var contents = "@"
|
var contents = "@"
|
||||||
if options.config.chcp:
|
if options.config.chcp:
|
||||||
if fixChcp:
|
if fixChcp:
|
||||||
contents.add "chcp 65001 > nul && "
|
contents.add "chcp 65001 > nul && "
|
||||||
else: contents.add "chcp 65001 > nul\n@"
|
else: contents.add "chcp 65001 > nul\n@"
|
||||||
contents.add "\"" & pkgDestDir / bin & "\" %*\n"
|
contents.add "\"" & pkgDestDir / bin & "\" %*\n"
|
||||||
writeFile(dest, contents)
|
writeFile(dest, contents)
|
||||||
# For bash on Windows (Cygwin/Git bash).
|
# For bash on Windows (Cygwin/Git bash).
|
||||||
let bashDest = dest.changeFileExt("")
|
let bashDest = dest.changeFileExt("")
|
||||||
echo("Creating Cygwin stub: ", pkgDestDir / bin, " -> ", bashDest)
|
echo("Creating Cygwin stub: ", pkgDestDir / bin, " -> ", bashDest)
|
||||||
writeFile(bashDest, "\"$(cygpath '" & pkgDestDir / bin & "')\" \"$@\"\l")
|
writeFile(bashDest, "\"$(cygpath '" & pkgDestDir / bin & "')\" \"$@\"\l")
|
||||||
else:
|
else:
|
||||||
{.error: "Sorry, your platform is not supported.".}
|
{.error: "Sorry, your platform is not supported.".}
|
||||||
else:
|
else:
|
||||||
filesInstalled = copyFilesRec(realDir, realDir, pkgDestDir, options,
|
filesInstalled = copyFilesRec(realDir, realDir, pkgDestDir, options,
|
||||||
pkgInfo)
|
pkgInfo)
|
||||||
|
|
||||||
# Save a nimblemeta.json file.
|
# Save a nimblemeta.json file.
|
||||||
saveNimbleMeta(pkgDestDir, url, filesInstalled)
|
saveNimbleMeta(pkgDestDir, url, filesInstalled)
|
||||||
|
|
||||||
# Save the nimble data (which might now contain reverse deps added in
|
# Save the nimble data (which might now contain reverse deps added in
|
||||||
# processDeps).
|
# processDeps).
|
||||||
saveNimbleData(options)
|
saveNimbleData(options)
|
||||||
|
|
||||||
|
echo(pkgInfo.name & " installed successfully.")
|
||||||
|
# Return the paths to the dependencies of this package.
|
||||||
|
result.paths.add pkgDestDir
|
||||||
|
|
||||||
# Return the paths to the dependencies of this package.
|
|
||||||
result.paths.add pkgDestDir
|
|
||||||
result.pkg = pkgInfo
|
result.pkg = pkgInfo
|
||||||
|
|
||||||
echo(pkgInfo.name & " installed successfully.")
|
|
||||||
|
|
||||||
proc getNimbleTempDir(): string =
|
proc getNimbleTempDir(): string =
|
||||||
## Returns a path to a temporary directory.
|
## Returns a path to a temporary directory.
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ import nimblepkg/config, nimblepkg/version,
|
||||||
type
|
type
|
||||||
Options* = object
|
Options* = object
|
||||||
forcePrompts*: ForcePrompt
|
forcePrompts*: ForcePrompt
|
||||||
|
depsOnly*: bool
|
||||||
queryVersions*: bool
|
queryVersions*: bool
|
||||||
queryInstalled*: bool
|
queryInstalled*: bool
|
||||||
action*: Action
|
action*: Action
|
||||||
|
|
@ -83,6 +84,7 @@ Options:
|
||||||
--ver Query remote server for package version
|
--ver Query remote server for package version
|
||||||
information when searching or listing packages
|
information when searching or listing packages
|
||||||
--nimbleDir dirname Set the Nimble directory.
|
--nimbleDir dirname Set the Nimble directory.
|
||||||
|
-d --depsOnly Install only dependencies.
|
||||||
|
|
||||||
For more information read the Github readme:
|
For more information read the Github readme:
|
||||||
https://github.com/nim-lang/nimble#readme
|
https://github.com/nim-lang/nimble#readme
|
||||||
|
|
@ -254,6 +256,7 @@ proc parseFlag*(flag, val: string, result: var Options) =
|
||||||
of "ver": result.queryVersions = true
|
of "ver": result.queryVersions = true
|
||||||
of "nimbledir": result.config.nimbleDir = val # overrides option from file
|
of "nimbledir": result.config.nimbleDir = val # overrides option from file
|
||||||
of "installed", "i": result.queryInstalled = true
|
of "installed", "i": result.queryInstalled = true
|
||||||
|
of "depsOnly", "d": result.depsOnly = true
|
||||||
else:
|
else:
|
||||||
raise newException(NimbleError, "Unknown option: --" & flag)
|
raise newException(NimbleError, "Unknown option: --" & flag)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue