X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=Goalfile.in;h=d28b9312342809ca02ad82cdee707291b44a8c6f;hb=915b9bff547705bf9df287ffb2a057eeaec4ca02;hp=187ced3fadc5b53a660789ec00857e89176566f5;hpb=d2a50cddaf47e1b83757f679eaea8c995ab5a462;p=goals.git diff --git a/Goalfile.in b/Goalfile.in index 187ced3..d28b931 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,44 @@ 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 CFLAGS = [ "-g", "-O2", "-I%OCAMLLIB", "-I." ] +#let CFLAGS = "@CFLAGS@ -I%OCAMLLIB -I." let OCAMLFLAGS = [ "-g", "-safe-string", "-warn-error", "CDEFLMPSUVYZX+52-3" ] -let OCAMLPACKAGES = [ "-package", "str,unix", "-I", "src" ] +let OCAMLPACKAGES = [ "-package", "str,unix,threads", "-I", "src", "-thread" ] #let OCAMLFLAGS = "@OCAMLFLAGS@" #let OCAMLPACKAGES = "@OCAMLPACKAGES@" 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,15 +125,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 +}