aboutsummaryrefslogtreecommitdiff
path: root/src/nix-store
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2005-01-25 10:55:33 +0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2005-01-25 10:55:33 +0000
commit80faa2f98af8616ab89ac2af63431b887a84fb32 (patch)
treeeb24971c4f7dfe23b1927c055a68f7d4cec47ba2 /src/nix-store
parent6a0a2d559336b3a7a165fb0f87f5e70caa9d8d72 (diff)
* In nix-store: change `--build' back to `--realise'. Also brought
back the query flag `--force-realise'. * Fixed some of the tests.
Diffstat (limited to 'src/nix-store')
-rw-r--r--src/nix-store/help.txt2
-rw-r--r--src/nix-store/main.cc46
2 files changed, 36 insertions, 12 deletions
diff --git a/src/nix-store/help.txt b/src/nix-store/help.txt
index 1bd752fc1..deef23ff8 100644
--- a/src/nix-store/help.txt
+++ b/src/nix-store/help.txt
@@ -4,7 +4,7 @@ nix-store [OPTIONS...] [ARGUMENTS...]
Operations:
- --build / -b: build a Nix derivation
+ --realise / -r: build a Nix derivation
--add / -A: copy a path to the Nix store
--query / -q: query information
diff --git a/src/nix-store/main.cc b/src/nix-store/main.cc
index e922a9755..addf9c7d0 100644
--- a/src/nix-store/main.cc
+++ b/src/nix-store/main.cc
@@ -27,19 +27,39 @@ static Path findOutput(const Derivation & drv, string id)
}
-/* Build the given derivations. */
-static void opBuild(Strings opFlags, Strings opArgs)
+/* Realisation the given path. For a derivation that means build it;
+ for other paths it means ensure their validity. */
+static Path realisePath(const Path & path)
+{
+ if (isDerivation(path)) {
+ PathSet paths;
+ paths.insert(path);
+ buildDerivations(paths);
+ return findOutput(derivationFromPath(path), "out");
+ } else {
+ ensurePath(path);
+ return path;
+ }
+}
+
+
+/* Realise the given paths. */
+static void opRealise(Strings opFlags, Strings opArgs)
{
if (!opFlags.empty()) throw UsageError("unknown flag");
- buildDerivations(PathSet(opArgs.begin(), opArgs.end()));
+ if (opArgs.size() > 1) {
+ PathSet drvPaths;
+ for (Strings::iterator i = opArgs.begin();
+ i != opArgs.end(); i++)
+ if (isDerivation(*i))
+ drvPaths.insert(*i);
+ buildDerivations(drvPaths);
+ }
for (Strings::iterator i = opArgs.begin();
i != opArgs.end(); i++)
- {
- Derivation drv = derivationFromPath(*i);
- cout << format("%1%\n") % findOutput(drv, "out");
- }
+ cout << format("%1%\n") % realisePath(*i);
}
@@ -54,8 +74,9 @@ static void opAdd(Strings opFlags, Strings opArgs)
}
-static Path maybeUseOutput(const Path & storePath, bool useOutput)
+static Path maybeUseOutput(const Path & storePath, bool useOutput, bool forceRealise)
{
+ if (forceRealise) realisePath(storePath);
if (useOutput && isDerivation(storePath)) {
Derivation drv = derivationFromPath(storePath);
return findOutput(drv, "out");
@@ -78,6 +99,7 @@ static void opQuery(Strings opFlags, Strings opArgs)
enum { qOutputs, qRequisites, qReferences, qReferers, qGraph } query = qOutputs;
bool useOutput = false;
bool includeOutputs = false;
+ bool forceRealise = false;
for (Strings::iterator i = opFlags.begin();
i != opFlags.end(); i++)
@@ -87,6 +109,7 @@ static void opQuery(Strings opFlags, Strings opArgs)
else if (*i == "--referers") query = qReferers;
else if (*i == "--graph") query = qGraph;
else if (*i == "--use-output" || *i == "-u") useOutput = true;
+ else if (*i == "--force-realise" || *i == "-f") forceRealise = true;
else if (*i == "--include-outputs") includeOutputs = true;
else throw UsageError(format("unknown flag `%1%'") % *i);
@@ -96,6 +119,7 @@ static void opQuery(Strings opFlags, Strings opArgs)
for (Strings::iterator i = opArgs.begin();
i != opArgs.end(); i++)
{
+ if (forceRealise) realisePath(*i);
Derivation drv = derivationFromPath(*i);
cout << format("%1%\n") % findOutput(drv, "out");
}
@@ -109,7 +133,7 @@ static void opQuery(Strings opFlags, Strings opArgs)
for (Strings::iterator i = opArgs.begin();
i != opArgs.end(); i++)
{
- Path path = maybeUseOutput(*i, useOutput);
+ Path path = maybeUseOutput(*i, useOutput, forceRealise);
if (query == qRequisites)
storePathRequisites(path, includeOutputs, paths);
else if (query == qReferences) queryReferences(path, paths);
@@ -340,8 +364,8 @@ void run(Strings args)
Operation oldOp = op;
- if (arg == "--build" || arg == "-b")
- op = opBuild;
+ if (arg == "--realise" || arg == "-r")
+ op = opRealise;
else if (arg == "--add" || arg == "-A")
op = opAdd;
else if (arg == "--query" || arg == "-q")