X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Goalfile.in;h=32ff7b577a7224f0558fcc951f404411595fbff9;hb=17dc1d6e0ec8f194df3dd74a7033303ad9ff739c;hp=3a41cbf414fb6a0c8def9a2ee7d8b45decf1b464;hpb=00dfdab0481c531b8608a157dc4c4991f319d7f7;p=goals.git

diff --git a/Goalfile.in b/Goalfile.in
index 3a41cbf..32ff7b5 100644
--- a/Goalfile.in
+++ b/Goalfile.in
@@ -18,7 +18,7 @@
 
 include "ocaml.gl"
 
-let subdirs = [ "m4", "src", "stdlib", "docs", "tests" ]
+let subdirs = [ "m4", "src", "stdlib", "docs", "man", "tests" ]
 
 goal all = : "Goalfile", tool, documentation;
 
@@ -29,15 +29,18 @@ goal all = : "Goalfile", tool, documentation;
     ./config.status %@
 }
 
-goal clean = {
-    for d in %subdirs; do
-        pushd $d
-        rm -f *~
-        rm -f *.cmi *.cmo *.cmx *.o
-        popd
-    done
+goal clean = : wrap ("clean-subdir", subdirs), clean-subdir ("."), clean-other
+
+goal clean-subdir (dir) = {
+    cd %dir
+    rm -f *~
+    rm -f *.cmi *.cmo *.cmx *.o
+}
+
+goal clean-other = {
     rm -f src/parser.ml src/parser.mli src/lexer.ml src/parser.conflicts
-    rm -f docs/*.1
+    rm -f man/*.1 man/*.5
+    rm -f tests/*.log
 
     # We don't delete src/goals because it is required to do builds.
     # If you want to really delete it, use the maintainer-clean rule.
@@ -50,32 +53,40 @@ goal maintainer-clean = : clean {
 #----------------------------------------------------------------------
 # Build the goals tool itself.
 
+let CC = "@CC@"
+let OCAMLLIB = "@OCAMLLIB@"
 let MENHIR = "@MENHIR@"
 let OCAMLDEP = "@OCAMLDEP@"
 let OCAMLFIND = "@OCAMLFIND@"
 let OCAMLLEX = "@OCAMLLEX@"
-# XXX
-let OCAMLFLAGS = [ "-g", "-safe-string", "-warn-error", "CDEFLMPSUVYZX+52-3" ]
-let OCAMLPACKAGES = [ "-package", "str,unix", "-I", "src" ]
-#let OCAMLFLAGS = "@OCAMLFLAGS@"
-#let OCAMLPACKAGES = "@OCAMLPACKAGES@"
+let CFLAGS = join (split ("@CFLAGS@"), ["-I%OCAMLLIB", "-I."])
+let OCAMLFLAGS = split ("@OCAMLFLAGS@")
+let OCAMLPACKAGES = join (split ("@OCAMLPACKAGES@"), ["-I", "src"])
 
 let objects = [
     # These must be in dependency order.
     "src/config.cmx",
+    "src/utils-c.o",
     "src/utils.cmx",
     "src/cmdline.cmx",
+    "src/jobs.cmx",
     "src/ast.cmx",
     "src/parser.cmx",
     "src/lexer.cmx",
     "src/parse.cmx",
     "src/eval.cmx",
+    "src/deps.cmx",
     "src/run.cmx",
     "src/main.cmx"
 ]
 
 goal tool = : ocaml_link ("src/goals", objects) ;
 
+# C code.
+"src/utils-c.o" : "src/utils-c.c" {
+    %CC %CFLAGS -c %< -o %@
+}
+
 # Parser.
 "src/parser.mli", "src/parser.ml" : "src/parser.mly" {
     %MENHIR --explain %<
@@ -110,14 +121,41 @@ goal depend =
 
 let POD2MAN = "@POD2MAN@"
 
-goal documentation = : pod2man ("goals")
+goal documentation = : pod2man ("goals", "1"),
+                       pod2man ("Goalfile", "5")
 
-goal pod2man (page) =
-"docs/%page.1" : "docs/%page.pod" {
+goal pod2man (page, section) =
+"man/%page.%section" : "docs/%page.pod" {
     rm -f %@ %@-t
+    mkdir -p man
     %POD2MAN \
+        -u \
         -c "goals" \
         --release "@PACKAGE_NAME@-@PACKAGE_VERSION@" \
-        --section 1 %< > %@-t
+        --section %section %< > %@-t
     mv %@-t %@
-}
\ No newline at end of file
+}
+
+#----------------------------------------------------------------------
+# Tests.
+
+let tests = wrap ("test", wildcard ("tests/*.sh"))
+
+goal check () = : tests
+
+goal test (name) = @{
+    t=`basename %name`
+    cd tests
+    if ../run ./$t > $t.log 2>&1; then
+        start_green
+        echo -n "PASS: "
+        end_colour
+        echo $t
+    else
+        start_red
+        echo -n "FAIL: "
+        end_colour
+        echo $t
+        exit 1
+    fi
+}