/[svn]/Makefile.distrib

Diff of /Makefile.distrib

Parent Directory | Revision Log | View Patch Patch

-revision 672 by abate,
Tue Jul 10 17:53:24 2007 UTC
+revision 1221 by abate,
Tue Jul 10 18:32:22 2007 UTC
 Line 1
  include Makefile.conf
- VERSION = 0.1.2
+ VERSION = 0.2.0
+ all: cduce dtd2cduce validate cdo2ml cduce_lib.cma
+ ifeq ($(NATIVE),true)
+ all: cduce_lib.cmxa
+ endif
  PACKAGES = pxp-engine pxp-lex-iso88591 ulex camlp4 num cgi pcre netstring
  ifeq ($(PXP_WLEX), true)
-Line 8
+Line 13
    PACKAGES += pxp-lex-utf8
  endif
- SYNTAX = -I misc/ pa_extend.cmo q_symbol.cmo \
-   -symbol cduce_version=\"$(VERSION)\" \
-   -symbol build_date=\"$(shell date +%Y-%m-%d)\" \
-   -symbol session_dir=\"$(SESSION_DIR)\"
- ifeq ($(NATIVE), true)
+ # Call make with VERBOSE=true to get a trace of commands
-         SYNTAX += -symbol ocaml_compiler=\"native\"
+ VERBOSE=false
+ ifneq ($(VERBOSE), true)
+    HIDE=@
  else
-         SYNTAX += -symbol ocaml_compiler=\"bytecode\"
+    HIDE=
  endif
- ifeq ($(EXPAT), true)
+ # webiface can be made static to be able to move it more easily
-         PACKAGES += expat
+ # (to compile it on a machine which is not the web server)
-         SYNTAX += -symbol EXPAT=
+ # Seems to be some problems with statically linking curl
- endif
+ # EXTRA_OPTS_WEBIFACE = -ccopt -static
+ SYNTAX = -I misc/ q_symbol.cmo \
+   -symbol cduce_version=\"$(VERSION)\" \
+   -symbol build_date=\"$(shell date +%Y-%m-%d)\" \
+   -symbol session_dir=\"$(SESSION_DIR)\"
  SYNTAX_PARSER = -syntax camlp4o $(SYNTAX:%=-ppopt %)
- CAMLC_P = ocamlc
+ CAMLC_P = ocamlc -g
  DEPEND_OCAMLDEP = misc/q_symbol.cmo
  ifeq ($(PROFILE), true)
          CAMLOPT_P = ocamlopt -p
-Line 40
+Line 50
  endif
  OPT = -warn-error FPS
+ ANNOT =
+ INTERFACE =
+ ifeq ($(ANNOT), true)
+         OPT += -passopt -dtypes
+ endif
+ ifeq ($(INTERFACE), true)
+         OPT += -passopt -i
+ endif
  OCAMLFIND = ocamlfind
  CAMLC = $(OCAMLFIND) $(CAMLC_P) $(OPT) -package "$(PACKAGES)"
  CAMLOPT = $(OCAMLFIND) $(CAMLOPT_P) $(OPT) -package "$(PACKAGES)"
  ifeq ($(NATIVE), true)
          EXTENSION = cmx
+   EXTENSION_LIB = cmxa
+   COMPILE = $(CAMLOPT)
          LINK = $(CAMLOPT) -linkpkg gramlib.cmxa
+   SYNTAX += -symbol ocaml_compiler=\"bytecode\"
  else
          EXTENSION = cmo
+   EXTENSION_LIB = cma
+   COMPILE = $(CAMLC)
          LINK = $(CAMLC) -custom -linkpkg gramlib.cma
+   SYNTAX += -symbol ocaml_compiler=\"native\"
  endif
- all: cduce dtd2cduce
+ INSTALL := $(shell which install)
+ ifeq ($(NATIVE),true)
+ .PHONY: cduce_lib.cma
+ cduce_lib.cma:
+         $(HIDE)$(MAKE) NATIVE=false $@
+ endif
+ install: all install_lib
+         $(HIDE)mkdir -p $(BINDIR)
+         $(HIDE)mkdir -p $(MANDIR)/man1
+         @echo "Install binaries"
+         $(HIDE)$(INSTALL) -m755 cduce$(EXE) dtd2cduce$(EXE) \
+                          validate$(EXE) cdo2ml$(EXE) $(BINDIR)/
+         $(HIDE)(cd doc; $(MAKE) install INSTALL=$(INSTALL) MANDIR=$(MANDIR) HIDE=$(HIDE))
+ install_lib:
+         @echo "Build META"
+         $(HIDE)echo 'version="$(VERSION)"' > META
+         $(HIDE)echo 'requires="$(PACKAGES) camlp4.gramlib"' >> META
+         $(HIDE)echo 'description="Runtime support for CDuce"' >> META
+         $(HIDE)echo 'archive(byte)="cduce_lib.cma"' >> META
+         $(HIDE)echo 'archive(native)="cduce_lib.cmxa"' >> META
+         $(HIDE)-$(OCAMLFIND) remove cduce
+         $(HIDE)-$(OCAMLFIND) install cduce META \
+          cduce_lib.cmi $(wildcard *.cma) $(wildcard *.cmxa) $(wildcard *.a) \
- install: all
-         mkdir -p $(PREFIX)/bin/
-         mkdir -p $(PREFIX)/man/man1/
-         install -m755 cduce dtd2cduce $(PREFIX)/bin/
-         install -m644 doc/cduce.1 $(PREFIX)/man/man1/
  uninstall:
-         rm  $(PREFIX)/bin/cduce $(PREFIX)/bin/dtd2cduce $(PREFIX)/man/man1/cduce.1
+         rm -f $(BINDIR)/cduce$(EXE) $(BINDIR)/dtd2cduce$(EXE) \
+           $(BINDIR)/validate$(EXE) $(BINDIR)/cdo2ml$(EXE)
+         rm -f $(MANDIR)/man1/cduce.1 $(MANDIR)/man1/dtd2cduce.1 \
+           $(MANDIR)/man1/validate.1 $(MANDIR)/man1/cdo2ml.1
+         ocamlfind remove cduce
+ help:
+         @echo "GOALS"
+         @echo "  cduce : compiles the CDuce command line interpreter"
+         @echo "  dtd2cduce : compiles the dtd2cduce tools"
+         @echo "  validate : compiles the schema validation tool"
+         @echo "  webiface : compiles the CDuce web interface interpreter (CGI script)"
+         @echo "  webpages : compiles in web/www/ the files for the CDuce website"
+         @echo "             (including the tutorial and manual)"
+         @echo "  install_web : compiles webiface and webpages, and install everything"
+         @echo "  all : equivalent to (make cduce dtd2cduce validate)"
+         @echo "  install : install cduce dtd2cduce, validate et man pages"
+         @echo "  clean :  back to the starting point"
+         @echo "  uninstall : remove installed files"
  # Source directories
- DIRS = misc parser schema typing types runtime driver module
+ DIRS = misc parser schema typing types compile runtime driver query ocamliface
- CLEAN_DIRS = $(DIRS) tools tests
+ CLEAN_DIRS = $(DIRS) cdo2cmo tools tests
  # Objects to build
+ SCHEMA_OBJS = \
+  schema/schema_types.cmo \
+  schema/schema_xml.cmo \
+  schema/schema_common.cmo \
+  schema/schema_builtin.cmo \
+  schema/schema_validator.cmo \
+  schema/schema_parser.cmo \
  OBJECTS = \
+  driver/config.cmo \
+  misc/stats.cmo \
   misc/serialize.cmo misc/custom.cmo \
   misc/state.cmo misc/pool.cmo misc/encodings.cmo misc/bool.cmo \
-  misc/pretty.cmo misc/ns.cmo \
+  misc/pretty.cmo misc/ns.cmo misc/inttbl.cmo misc/imap.cmo \
   \
   types/sortedList.cmo types/boolean.cmo types/ident.cmo \
   types/intervals.cmo types/chars.cmo types/atoms.cmo \
-Line 82
+Line 155
   types/types.cmo types/patterns.cmo types/sequence.cmo \
   types/sample.cmo types/builtin_defs.cmo \
   \
+  compile/lambda.cmo \
   runtime/value.cmo \
   \
-  schema/schema_types.cmo schema/schema_xml.cmo schema/schema_builtin.cmo \
+  $(SCHEMA_OBJS) \
-  schema/schema_validator.cmo schema/schema_parser.cmo \
   \
-  parser/location.cmo parser/ulexer.cmo parser/ast.cmo parser/parser.cmo \
+  parser/location.cmo parser/url.cmo parser/ulexer.cmo parser/ast.cmo parser/parser.cmo \
   \
+  types/externals.cmo \
   typing/typed.cmo typing/typer.cmo \
   \
   runtime/load_xml.cmo runtime/run_dispatch.cmo \
+  runtime/explain.cmo \
   runtime/print_xml.cmo runtime/eval.cmo \
+  compile/compile.cmo \
+  compile/operators.cmo \
   \
-  types/builtin.cmo driver/cduce.cmo
+  types/builtin.cmo \
+  driver/librarian.cmo \
+  driver/cduce.cmo
+ ML_INTERFACE_OBJS = \
+   ocamliface/caml_cduce.cmo ocamliface/mltypes.cmo ocamliface/mlstub.cmo
+ ifneq ($(ML_INTERFACE), false)
+   OBJECTS += $(ML_INTERFACE_OBJS)
+ endif
+ ifneq ($(CURL), false)
+   OBJECTS += parser/cduce_curl.cmo
+   PACKAGES += curl
+ endif
+ ifneq ($(NETCLIENT), false)
+   OBJECTS += parser/cduce_netclient.cmo
+   PACKAGES += netclient
+ endif
+ OBJECTS += runtime/cduce_pxp.cmo
+ ifeq ($(EXPAT), true)
+   OBJECTS += runtime/cduce_expat.cmo
+   PACKAGES += expat
+ endif
+ CQL_OBJECTS= query/query.cmo query/query_parse.cmo
+ CQL_OBJECTS_RUN = query/query_run.cmo
- CDUCE = $(OBJECTS) driver/run.cmo
+ VALIDATE_OBJECTS := $(shell for o in $(OBJECTS); do echo $$o; if [ "$$o" = "schema/schema_parser.cmo" ]; then exit 0; fi; done) # all objects until schema_parser.cmo
- WEBIFACE  = $(OBJECTS) driver/examples.cmo driver/webiface.cmo
+ CDUCE = $(OBJECTS) $(CQL_OBJECTS) driver/run.cmo $(CQL_OBJECTS_RUN)
+ WEBIFACE  = $(OBJECTS) $(CQL_OBJECTS) driver/examples.cmo driver/webiface.cmo
  DTD2CDUCE = tools/dtd2cduce.cmo
- ALL_OBJECTS = $(OBJECTS) \
+ ALL_OBJECTS = $(OBJECTS) $(CQL_OBJECTS) \
   driver/run.cmo driver/examples.cmo driver/webiface.cmo \
-  tools/dtd2cduce.cmo
+  tools/dtd2cduce.cmo tools/validate.cmo \
+  $(ML_INTERFACE_OBJS) parser/cduce_curl.cmo \
+  parser/cduce_netclient.cmo \
+  runtime/cduce_expat.cmo \
+  $(CQL_OBJECTS_RUN)
+ ALL_INTERFACES = schema/schema_types.mli
- DEPEND = $(ALL_OBJECTS:.cmo=.ml) $(ALL_OBJECTS:.cmo=.mli)
+ DEPEND = $(ALL_OBJECTS:.cmo=.ml) $(ALL_OBJECTS:.cmo=.mli) $(ALL_INTERFACES)
  INCLUDES = $(DIRS:%=-I %)
  cduce: $(CDUCE:.cmo=.$(EXTENSION))
-         $(LINK) $(INCLUDES) -o $@ $^
+         @echo "Build $@"
+         $(HIDE)$(LINK) $(INCLUDES) -o $@ $^ $(EXTRA_LINK_OPTS)
+ cduce_packed.ml: $(CDUCE:.cmo=.ml)
+         rm -f cduce_packed.ml
+         ocaml tools/pack.ml $^ > cduce_packed.ml
+ cduce_packed: cduce_packed.$(EXTENSION)
+         $(LINK) $(INCLUDES) -o $@ $^ $(EXTRA_LINK_OPTS)
+ cduce_lib.$(EXTENSION_LIB): $(OBJECTS:.cmo=.$(EXTENSION))
+         @echo "Pack cduce_lib.$(EXTENSION)"
+         $(HIDE)$(COMPILE) -o cduce_lib.$(EXTENSION) -pack $^
+         @echo "Build $@"
+         $(HIDE)$(COMPILE) -a -o $@ cduce_lib.$(EXTENSION)
  webiface: $(WEBIFACE:.cmo=.$(EXTENSION))
-         $(LINK) $(INCLUDES) -o $@ $^ -ccopt -static
+         @echo "Build $@"
- # webiface is made static to be able to move it more easily
+         $(HIDE)$(LINK) -verbose $(INCLUDES) -o $@ $^ $(EXTRA_OPTS_WEBIFACE)
- # (to compile it on a machine which is not the web server)
  dtd2cduce: $(DTD2CDUCE:.cmo=.$(EXTENSION))
-         $(LINK) $(INCLUDES) -o $@ $^
+         @echo "Build $@"
+         $(HIDE)$(LINK) $(INCLUDES) -o $@ $^
- validate: $(OBJECTS:.cmo=.$(EXTENSION)) tools/validate.ml
+ validate: $(VALIDATE_OBJECTS:.cmo=.$(EXTENSION)) tools/validate.$(EXTENSION)
-         $(LINK) $(INCLUDES) -o $@ $^
+         @echo "Build $@"
+         $(HIDE)$(LINK) $(INCLUDES) -o $@ $^
+ cdo2ml: ocamliface/cdo2ml.ml
+         @echo "Build $@"
+         $(HIDE)ocamlc -o $@ -pp camlp4o -I +camlp4 camlp4.cma pr_o.cmo $^
  .PHONY: compute_depend
  compute_depend: $(DEPEND_OCAMLDEP)
+         echo $(DEPEND)
          @echo "Computing dependencies ..."
-         ocamlfind ocamldep -package "$(PACKAGES)" $(INCLUDES) $(SYNTAX_PARSER) $(DEPEND) | \
+         ocamlfind ocamldep -package "$(PACKAGES)" \
-         sed -e "s|: |: misc/q_symbol.cmo |" > depend
+                 $(INCLUDES) $(SYNTAX_PARSER) $(DEPEND) > depend
  clean:
          for i in $(CLEAN_DIRS); do \
-         (cd $$i; rm -f *.cmi *.cmo *.cma *.cmx *.o *~); \
+         (cd $$i; rm -f *.cmi *.cmo *.cma *.cmx *.o *.a *.cmxa *~); \
          done
-         (cd expat; $(MAKE) clean)
+         rm -f ocamliface/cmi2ml ocamliface/asttypes.ml
          rm -f `find . -name "*~"`
-         rm -f *.cmi *.cmo *.cma *.cmx *.a *.cmxa *.o *~
+         rm -f *.cmi *.cmo *.cma *.cmx *.a *.cmxa *.o *~ META
-         rm -f cduce ocamlprof.dump
+         rm -f cduce$(EXE) ocamlprof.dump
-         rm -f dtd2cduce pool webiface validate
+         rm -f dtd2cduce$(EXE) webiface$(EXE) validate$(EXE) cdo2ml$(EXE)
          rm -Rf prepro package
          rm -f web/www/*.html web/*~
+         rm -f web/*.cdo
+         rm -f configure.log
+ distclean: clean
+         rm -f Makefile.conf
+ ocamliface/mltypes.$(EXTENSION)): ocamliface/caml_cduce.$(EXTENSION)
+ $(ALL_OBJECTS:.cmo=.$(EXTENSION)): misc/q_symbol.cmo
+ $(ALL_INTERFACES): misc/q_symbol.cmo
  .SUFFIXES: .ml .mli .cmo .cmi .cmx
  misc/q_symbol.cmo: misc/q_symbol.ml
-         $(CAMLC) -c -pp 'camlp4o pa_extend.cmo q_MLast.cmo' $<
+         @echo "Build $@"
+         $(HIDE)$(CAMLC) -c -pp 'camlp4o pa_extend.cmo q_MLast.cmo' $<
  .ml.cmo:
-         $(CAMLC) -c $(INCLUDES) $(SYNTAX_PARSER) $<
+         @echo "Build $@"
+         $(HIDE)$(CAMLC) -c $(INCLUDES) $(SYNTAX_PARSER) $<
  .ml.cmx:
-         $(CAMLOPT) -c $(SYNTAX_PARSER) $(INCLUDES) $<
+         @echo "Build $@"
+         $(HIDE)$(CAMLOPT) -c $(SYNTAX_PARSER) $(INCLUDES) $<
  .mli.cmi:
-         $(CAMLC) -c $(SYNTAX_PARSER) $(INCLUDES) $<
+         @echo "Build $@"
+         $(HIDE)$(CAMLC) -c $(SYNTAX_PARSER) $(INCLUDES) $<
  include depend
  # CDuce-generated files
  driver/examples.ml: cduce web/examples/build.cd web/examples/examples.xml
-         (cd web/examples; ../../cduce --quiet build.cd --arg examples.xml)
+         (cd web/examples; ../../cduce build.cd --arg examples.xml)
- webpages: cduce web/site.cd
+ webpages: cduce web/site.cdo
-         (cd web; ../cduce --quiet site.cd --arg site.xml)
+         (cd web; ../cduce --run site.cdo --arg site.xml)
+ web/site.cdo: cduce web/xhtml.cdo web/site.cd
+         ./cduce -I web/ --compile web/site.cd
+ web/xhtml.cdo: cduce web/xhtml.cd
+         ./cduce -I web/ --compile web/xhtml.cd
  website: webpages webiface
  install_web: website
          cp  web/www/*.html web/cduce.css  $(HTML_DIR)/
-         cp CHANGES $(HTML_DIR)/
+         cp CHANGES  INSTALL INSTALL.WIN32 $(HTML_DIR)/
          cp webiface $(CGI_DIR)/cduce
          if test ! -d "$(HTML_DIR)/img" ; then \
            mkdir $(HTML_DIR)/img; \
          fi;
          cp web/img/*.*  $(HTML_DIR)/img
+ ### Pack OCaml modules for the CDuce/OCaml interface
+ ocamliface/caml_cduce.cmo:
+         @cd ocamliface; \
+         $(MAKE) PREFIX=$(ML_MODULES) MODEL=$(ML_INTERFACE) \
+                 HIDE=$(HIDE) caml_cduce.cmo
+ ocamliface/caml_cduce.cmx:
+         @cd ocamliface; \
+         $(MAKE) PREFIX=$(ML_MODULES) MODEL=$(ML_INTERFACE) \
+                 HIDE=$(HIDE) caml_cduce.cmx

 Legend:



Removed from v.672
 


changed lines


 
Added in v.1221
 Legend:



Removed from v.672
 


changed lines


 
Added in v.1221
-Removed from v.672
+Added in v.1221

CVS Admin">CVS Admin	ViewVC Help
Powered by ViewVC 1.1.5