diff options
| -rw-r--r-- | make/examples/not-so-simple-header-auto/default.nix | 6 | ||||
| -rw-r--r-- | make/lib/compile-c.sh | 1 | ||||
| -rw-r--r-- | make/lib/default.nix | 19 | ||||
| -rw-r--r-- | make/lib/find-includes.pl | 19 | ||||
| -rw-r--r-- | make/lib/find-includes.sh | 20 | ||||
| -rw-r--r-- | src/libexpr/primops.cc | 112 |
6 files changed, 147 insertions, 30 deletions
diff --git a/make/examples/not-so-simple-header-auto/default.nix b/make/examples/not-so-simple-header-auto/default.nix index 9e84b0c28a..521af7e89f 100644 --- a/make/examples/not-so-simple-header-auto/default.nix +++ b/make/examples/not-so-simple-header-auto/default.nix @@ -1,11 +1,13 @@ -let { +with import ../../lib; - inherit (import ../../lib) compileC findIncludes link; +let { hello = link {programName = "hello"; objects = compileC { main = ./foo/hello.c; localIncludes = "auto"; };}; +# body = findIncludes {main = ./foo/hello.c;}; + body = [hello]; } diff --git a/make/lib/compile-c.sh b/make/lib/compile-c.sh index 3558dd89ea..04d2595def 100644 --- a/make/lib/compile-c.sh +++ b/make/lib/compile-c.sh @@ -70,4 +70,5 @@ fi mkdir $out test "$prefix" && cd $prefix +ls -l gcc -Wall $cFlags -c $mainName -o $out/$mainName.o diff --git a/make/lib/default.nix b/make/lib/default.nix index a9b17d2ced..b2f26a9367 100644 --- a/make/lib/default.nix +++ b/make/lib/default.nix @@ -14,11 +14,13 @@ rec { builder = ./compile-c.sh; localIncludes = if localIncludes == "auto" then - import (findIncludes { - main = toString main; - hack = __currentTime; - inherit cFlags; - }) + dependencyClosure { + scanner = main: + import (findIncludes { + inherit main; + }); + startSet = [main]; + } else localIncludes; inherit main; @@ -36,10 +38,11 @@ rec { }; */ - findIncludes = {main, hack, cFlags ? ""}: stdenv.mkDerivation { + findIncludes = {main}: stdenv.mkDerivation { name = "find-includes"; - builder = ./find-includes.sh; - inherit main hack cFlags; + realBuilder = pkgs.perl ~ "bin/perl"; + args = [ ./find-includes.pl ]; + inherit main; }; link = {objects, programName ? "program", libraries ? []}: stdenv.mkDerivation { diff --git a/make/lib/find-includes.pl b/make/lib/find-includes.pl new file mode 100644 index 0000000000..f4f1f43239 --- /dev/null +++ b/make/lib/find-includes.pl @@ -0,0 +1,19 @@ +use strict; + +my $root = $ENV{"main"}; +my $out = $ENV{"out"}; + +open OUT, ">$out" or die "$!"; +print OUT "[\n"; + +open IN, "<$root" or die "$!"; +while (<IN>) { + if (/^\#include\s+\"(.*)\"/) { + print "DEP $1\n"; + print OUT "\"$1\"\n"; + } +} +close IN; + +print OUT "]\n"; +close OUT; diff --git a/make/lib/find-includes.sh b/make/lib/find-includes.sh deleted file mode 100644 index 4824207c29..0000000000 --- a/make/lib/find-includes.sh +++ /dev/null @@ -1,20 +0,0 @@ -. $stdenv/setup - -echo "finding includes of \`$(basename $main)'..." - -makefile=$NIX_BUILD_TOP/makefile - -mainDir=$(dirname $main) -(cd $mainDir && gcc $cFlags -MM $(basename $main) -MF $makefile) || false - -echo "[" >$out - -while read line; do - line=$(echo "$line" | sed 's/.*://') - for i in $line; do - fullPath=$(readlink -f $mainDir/$i) - echo " [ $fullPath \"$i\" ]" >>$out - done -done < $makefile - -echo "]" >>$out diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index 5736a7f916..f4e7b7b82b 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -410,6 +410,117 @@ static Expr primIsNull(EvalState & state, const ATermVector & args) } +static Path findDependency(Path start, string dep) +{ + if (dep[0] == '/') throw Error( + format("illegal absolute dependency `%1%'") % dep); + + Path p = canonPath(dirOf(start) + "/" + dep); + + if (pathExists(p)) + return p; + else + return ""; +} + + +/* Make path `p' relative to directory `pivot'. E.g., + relativise("/a/b/c", "a/b/x/y") => "../x/y". Both input paths + should be in absolute canonical form. */ +static string relativise(Path pivot, Path p) +{ + assert(pivot.size() > 0 && pivot[0] == '/'); + assert(p.size() > 0 && p[0] == '/'); + + if (pivot == p) return "."; + + /* `p' is in `pivot'? */ + Path pivot2 = pivot + "/"; + if (p.substr(0, pivot2.size()) == pivot2) { + return p.substr(pivot2.size()); + } + + /* Otherwise, `p' is in a parent of `pivot'. Find up till which + path component `p' and `pivot' match, and add an appropriate + number of `..' components. */ + unsigned int i = 1; + while (1) { + unsigned int j = pivot.find('/', i); + if (j == string::npos) break; + j++; + if (pivot.substr(0, j) != p.substr(0, j)) break; + i = j; + } + + string prefix; + unsigned int slashes = count(pivot.begin() + i, pivot.end(), '/') + 1; + while (slashes--) { + prefix += "../"; + } + + return prefix + p.substr(i); +} + + +static Expr primDependencyClosure(EvalState & state, const ATermVector & args) +{ + Expr attrs = evalExpr(state, args[0]); + + Expr scanner = queryAttr(attrs, "scanner"); + if (!scanner) throw Error("attribute `scanner' required"); + + Expr startSet = queryAttr(attrs, "startSet"); + if (!startSet) throw Error("attribute `startSet' required"); + ATermList startSet2 = evalList(state, startSet); + + Path pivot; + PathSet workSet; + for (ATermIterator i(startSet2); i; ++i) { + Path p = evalPath(state, *i); + workSet.insert(p); + pivot = dirOf(p); + } + + /* Construct the dependency closure by querying the dependency of + each path in `workSet', adding the dependencies to + `workSet'. */ + PathSet doneSet; + while (!workSet.empty()) { + Path path = *(workSet.begin()); + workSet.erase(path); + + if (doneSet.find(path) != doneSet.end()) continue; + doneSet.insert(path); + + /* Call the `scanner' function with `path' as argument. */ + printMsg(lvlError, format("finding dependencies in `%1%'") % path); + ATermList deps = evalList(state, makeCall(scanner, makePath(toATerm(path)))); + + /* Try to find the dependencies relative to the `path'. */ + for (ATermIterator i(deps); i; ++i) { + Path dep = findDependency(path, evalString(state, *i)); + if (dep == "") + printMsg(lvlError, format("did NOT find dependency `%1%'") % dep); + else { + printMsg(lvlError, format("found dependency `%1%'") % dep); + workSet.insert(dep); + } + } + } + + /* Return a list of the dependencies we've just found. */ + ATermList deps = ATempty; + for (PathSet::iterator i = doneSet.begin(); i != doneSet.end(); ++i) { + deps = ATinsert(deps, makeStr(toATerm(relativise(pivot, *i)))); + deps = ATinsert(deps, makePath(toATerm(*i))); + } + + printMsg(lvlError, format("RESULT is `%1%'") % makeList(deps)); + + return makeList(deps); +} + + /* Apply a function to every element of a list. */ static Expr primMap(EvalState & state, const ATermVector & args) { @@ -469,6 +580,7 @@ void EvalState::addPrimOps() addPrimOp("baseNameOf", 1, primBaseNameOf); addPrimOp("toString", 1, primToString); addPrimOp("isNull", 1, primIsNull); + addPrimOp("dependencyClosure", 1, primDependencyClosure); addPrimOp("map", 2, primMap); addPrimOp("removeAttrs", 2, primRemoveAttrs); |