* Started integrating the new evaluation model into Nix.

* Cleaned up command-line syntax.

configure.ac

@@ -10,5 +10,11 @@ AC_CANONICAL_HOST
 AC_PROG_CC
 AC_PROG_CXX
 
+# Unix shell scripting should die a slow and painful death.
+AC_DEFINE_UNQUOTED(NIX_VALUES_DIR, "$(eval echo $prefix/values)", Nix values directory.)
+AC_DEFINE_UNQUOTED(NIX_STATE_DIR, "$(eval echo $localstatedir/nix)", Nix state directory.)
+AC_DEFINE_UNQUOTED(NIX_LOG_DIR, "$(eval echo $localstatedir/log/nix)", Nix log file directory.)
+
+AC_CONFIG_HEADER([config.h])
 AC_CONFIG_FILES([Makefile src/Makefile scripts/Makefile])
 AC_OUTPUT

src/Makefile.am

-bin_PROGRAMS = nix fix
+bin_PROGRAMS = nix # fix
 noinst_PROGRAMS = test
 
-AM_CXXFLAGS = -DSYSTEM=\"@host@\" -Wall
+AM_CXXFLAGS = -DSYSTEM=\"@host@\" -Wall -I..
 
-nix_SOURCES = nix.cc db.cc util.cc hash.cc md5.c
+nix_SOURCES = nix.cc util.cc hash.cc md5.c eval.cc values.cc globals.cc db.cc
 nix_LDADD = -ldb_cxx-4 -lATerm
 
 fix_SOURCES = fix.cc util.cc hash.cc md5.c
@@ -20,4 +20,4 @@ install-data-local:
 #	$(INSTALL) -d $(localstatedir)/nix/prebuilts/exports
 	$(INSTALL) -d $(localstatedir)/log/nix
 	$(INSTALL) -d $(prefix)/values
-	$(bindir)/nix init
+	$(bindir)/nix --init

src/eval.cc

@@ -279,7 +279,7 @@ Expr evalValue(Expr e)
         string fn = queryValuePath(evalHash(e2));
         ATerm e3 = ATreadFromNamedFile(fn.c_str());
         if (!e3) throw Error("reading aterm from " + fn);
-        return e3;
+        return evalValue(e3);
     }
 
     /* Execution primitive. */
@@ -298,8 +298,8 @@ Expr evalValue(Expr e)
         evalArgs(args, argsNF, env);
 
         Hash sourceHash = hashExpr(
-            ATmake("Exec(Str(<str>), Hash(<str>), [])",
-                buildPlatform.c_str(), ((string) prog).c_str()));
+            ATmake("Exec(Str(<str>), Hash(<str>), <term>)",
+                buildPlatform.c_str(), ((string) prog).c_str(), argsNF));
 
         /* Do we know a normal form for sourceHash? */
         Hash targetHash;

src/values.cc

@@ -19,6 +19,8 @@ static string absValuePath(string s)
 
 Hash addValue(string path)
 {
+    path = absPath(path);
+
     Hash hash = hashPath(path);
 
     string name;
@@ -79,7 +81,7 @@ string queryValuePath(Hash hash)
             return fn;
         }
 
-        throw Error("a file with hash " + (string) hash + " is requested, "
+        throw Error("a file with hash " + (string) hash + " is required, "
             "but it is not known to exist locally or on the network");
 #if 0
         if (checkedNet)
@@ -87,7 +89,7 @@ string queryValuePath(Hash hash)
                 " should have hash " + (string) hash + ", but it doesn't");
 
         if (!queryDB(nixDB, dbNetSources, hash, url))
-            throw Error("a file with hash " + (string) hash + " is requested, "
+            throw Error("a file with hash " + (string) hash + " is required, "
                 "but it is not known to exist locally or on the network");
 
         checkedNet = true;