/[svn]/cduce/trunk/Makefile.distrib

Diff of /cduce/trunk/Makefile.distrib

Parent Directory | Revision Log | View Patch Patch

-revision 1287 by abate,
Tue Jul 10 18:37:31 2007 UTC
+revision 1628 by abate,
Tue Jul 10 19:09:24 2007 UTC
 Line 1
  include Makefile.conf
- VERSION = 0.2.1+1
+ VERSION = 0.3.2
- all: cduce dtd2cduce validate cdo2ml cduce_lib.cma
+ ALL_TARGET=cduce cduce_lib.cma
- ifeq ($(NATIVE),true)
+ INSTALL_BINARIES=cduce$(EXE)
- all: cduce_lib.cmxa
+ ifneq ($(ML_INTERFACE), false)
+   ALL_TARGET += cdo2ml mlcduce_wrapper
+   INSTALL_BINARIES += cdo2ml$(EXE) mlcduce_wrapper$(EXE) cduce_mktop
  endif
- PACKAGES = pxp-engine pxp-lex-iso88591 ulex camlp4 num cgi pcre netstring
- ifeq ($(PXP_WLEX), true)
+ all: $(ALL_TARGET)
-   PACKAGES += pxp-wlex-utf8
+ ifeq ($(NATIVE),true)
- else
+ all: cduce_lib.cmxa
-   PACKAGES += pxp-lex-utf8
  endif
+ PACKAGES = ulex camlp4 cgi pcre num netstring
  # Call make with VERBOSE=true to get a trace of commands
-Line 24
+Line 27
     HIDE=
  endif
- # webiface can be made static to be able to move it more easily
- # (to compile it on a machine which is not the web server)
- # Seems to be some problems with statically linking curl
- # EXTRA_OPTS_WEBIFACE = -ccopt -static
  SYNTAX = -I misc/ q_symbol.cmo \
    -symbol cduce_version=\"$(VERSION)\" \
-Line 65
+Line 64
  ifeq ($(NATIVE), true)
    EXTENSION = cmx
    EXTENSION_LIB = cmxa
+   CAML=ocamlopt
    COMPILE = $(CAMLOPT)
    LINK = $(CAMLOPT) -linkpkg gramlib.cmxa
    SYNTAX += -symbol ocaml_compiler=\"native\"
 Line 72
    EXTENSION = cmo
    EXTENSION_LIB = cma
    COMPILE = $(CAMLC)
+   CAML=ocamlc
    LINK = $(CAMLC) -custom -linkpkg gramlib.cma
    SYNTAX += -symbol ocaml_compiler=\"bytecode\"
  endif
- INSTALL := $(shell which install)
+ INSTALL := install
  ifeq ($(NATIVE),true)
  .PHONY: cduce_lib.cma
 Line 86
          $(HIDE)$(MAKE) NATIVE=false $@
  endif
- install: all install_lib
+ install: all install_bin install_lib install_doc
-         $(HIDE)mkdir -p $(BINDIR)
-         $(HIDE)mkdir -p $(MANDIR)/man1
+ install_bin:
          @echo "Install binaries"
-         $(HIDE)$(INSTALL) -m755 cduce$(EXE) dtd2cduce$(EXE) \
+         $(HIDE)mkdir -p $(BINDIR)
-                          validate$(EXE) cdo2ml$(EXE) $(BINDIR)/
+         $(HIDE)$(INSTALL) -m755 $(INSTALL_BINARIES) $(BINDIR)/
-         $(HIDE)(cd doc; $(MAKE) install INSTALL=$(INSTALL) MANDIR=$(MANDIR) HIDE=$(HIDE))
  install_lib:
          @echo "Build META"
-         $(HIDE)echo 'version="$(VERSION)"' > META
+         $(HIDE)(sed "s/%REQ%/$(PACKAGES)/" < META.in | sed "s/%VER%/$(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) \
  uninstall:
-         rm -f $(BINDIR)/cduce$(EXE) $(BINDIR)/dtd2cduce$(EXE) \
+         rm -f $(BINDIR)/cduce$(EXE) \
-           $(BINDIR)/validate$(EXE) $(BINDIR)/cdo2ml$(EXE)
+           $(BINDIR)/cdo2ml$(EXE) \
-         rm -f $(MANDIR)/man1/cduce.1 $(MANDIR)/man1/dtd2cduce.1 \
+           $(BINDIR)/mlcduce_wrapper$(EXE) $(BINDIR)/cduce_mktop
-           $(MANDIR)/man1/validate.1 $(MANDIR)/man1/cdo2ml.1
+         rm -f $(MANDIR)/man1/cduce.1 \
+           $(MANDIR)/man1/cdo2ml.1
+         rm -Rf $(DOCDIR)
          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 "  doc : build the documentation"
-         @echo "  webiface : compiles the CDuce web interface interpreter (CGI script)"
+         @echo "  all : build binaries and libraries"
-         @echo "  webpages : compiles in web/www/ the files for the CDuce website"
+         @echo "  install : install binaries, man pages, documentation"
-         @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"
-Line 135
+Line 129
  # Objects to build
  SCHEMA_OBJS = \
+  schema/schema_pcre.cmo \
   schema/schema_types.cmo \
   schema/schema_xml.cmo \
   schema/schema_common.cmo \
   schema/schema_builtin.cmo \
   schema/schema_validator.cmo \
   schema/schema_parser.cmo \
+  schema/schema_converter.cmo
  OBJECTS = \
   driver/config.cmo \
-Line 148
+Line 144
   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/inttbl.cmo misc/imap.cmo \
+  misc/html.cmo \
   \
   types/sortedList.cmo types/boolean.cmo types/ident.cmo \
-  types/intervals.cmo types/chars.cmo types/atoms.cmo \
+  types/intervals.cmo \
+  types/chars.cmo types/atoms.cmo \
   types/normal.cmo \
-  types/types.cmo types/patterns.cmo types/sequence.cmo \
+  types/types.cmo types/sample.cmo types/sequence.cmo types/patterns.cmo \
-  types/sample.cmo types/builtin_defs.cmo \
+  types/builtin_defs.cmo \
   \
   compile/lambda.cmo \
   runtime/value.cmo \
   \
-  $(SCHEMA_OBJS) \
+  parser/location.cmo  parser/url.cmo \
   \
-  parser/location.cmo parser/url.cmo parser/ulexer.cmo parser/ast.cmo parser/parser.cmo \
+  parser/ulexer.cmo parser/ast.cmo parser/parser.cmo \
   \
   types/externals.cmo \
   typing/typed.cmo typing/typer.cmo \
   \
+  $(SCHEMA_OBJS) \
+  \
   runtime/load_xml.cmo runtime/run_dispatch.cmo \
   runtime/explain.cmo \
   runtime/print_xml.cmo runtime/eval.cmo \
 Line 173
   \
   types/builtin.cmo \
   driver/librarian.cmo \
-  driver/cduce.cmo
+  driver/cduce.cmo \
+  runtime/system.cmo
+ schema/schema_types.ml: schema/schema_types.mli
+         cp $^ $@
  ML_INTERFACE_OBJS = \
-   ocamliface/caml_cduce.cmo ocamliface/mltypes.cmo ocamliface/mlstub.cmo
+   ocamliface/caml_cduce.cmo \
+   ocamliface/mltypes.cmo ocamliface/mlstub.cmo
  ifneq ($(ML_INTERFACE), false)
    OBJECTS += $(ML_INTERFACE_OBJS)
-Line 191
+Line 196
    PACKAGES += netclient
  endif
- OBJECTS += runtime/cduce_pxp.cmo
+ PXP_PACK=pxp-engine pxp-lex-iso88591
+ ifeq ($(PXP_WLEX), true)
+   PXP_PACK += pxp-wlex-utf8
+ else
+   PXP_PACK += pxp-lex-utf8
+ endif
+ ifeq ($(PXP),true)
+   OBJECTS += runtime/cduce_pxp.cmo
+   PACKAGES += $(PXP_PACK)
+ endif
  ifeq ($(EXPAT), true)
    OBJECTS += runtime/cduce_expat.cmo
    PACKAGES += expat
  endif
- CQL_OBJECTS= query/query_aggregates.cmo query/query.cmo query/query_parse.cmo
+ #CQL_OBJECTS= query/query_aggregates.cmo query/query.cmo query/query_parse.cmo
- CQL_OBJECTS_RUN = query/query_run.cmo
+ #CQL_OBJECTS_RUN = query/query_run.cmo
+ CQL_OBJECTS= query/query_aggregates.cmo
+ CQL_OBJECTS_RUN=
  OBJECTS += $(CQL_OBJECTS)
  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
- CDUCE = $(OBJECTS) driver/run.cmo $(CQL_OBJECTS_RUN)
+ OBJECTS += $(CQL_OBJECTS_RUN)
- WEBIFACE  = $(OBJECTS) driver/examples.cmo driver/webiface.cmo
+ OBJECTS += driver/run.cmo
- DTD2CDUCE = tools/dtd2cduce.cmo
+ CDUCE = $(OBJECTS) driver/start.cmo
  ALL_OBJECTS = $(OBJECTS) \
-  driver/run.cmo driver/examples.cmo driver/webiface.cmo \
+  driver/start.cmo driver/examples.cmo \
-  tools/dtd2cduce.cmo tools/validate.cmo \
+  driver/webiface.cmo driver/evaluator.cmo \
+  tools/validate.cmo \
   $(ML_INTERFACE_OBJS) parser/cduce_curl.cmo \
   parser/cduce_netclient.cmo \
-  runtime/cduce_expat.cmo \
+  runtime/cduce_expat.cmo runtime/cduce_pxp.cmo
-  $(CQL_OBJECTS_RUN)
  ALL_INTERFACES = schema/schema_types.mli
  DEPEND = $(ALL_OBJECTS:.cmo=.ml) $(ALL_OBJECTS:.cmo=.mli) $(ALL_INTERFACES)
-Line 241
+Line 258
          @echo "Build $@"
          $(HIDE)$(COMPILE) -a -o $@ cduce_lib.$(EXTENSION)
+ dtd2cduce: tools/dtd2cduce.ml
- webiface: $(WEBIFACE:.cmo=.$(EXTENSION))
          @echo "Build $@"
-         $(HIDE)$(LINK) -verbose $(INCLUDES) -o $@ $^ $(EXTRA_OPTS_WEBIFACE)
+         $(HIDE)$(OCAMLFIND) $(CAML) -o $@ -ccopt -static -package "$(PXP_PACK) cgi" -linkpkg $^
- dtd2cduce: $(DTD2CDUCE:.cmo=.$(EXTENSION))
+ cduce_validate: $(VALIDATE_OBJECTS:.cmo=.$(EXTENSION)) tools/validate.$(EXTENSION)
          @echo "Build $@"
          $(HIDE)$(LINK) $(INCLUDES) -o $@ $^
- validate: $(VALIDATE_OBJECTS:.cmo=.$(EXTENSION)) tools/validate.$(EXTENSION)
+ mlcduce_wrapper: $(OBJECTS) ocamliface/mlcduce_wrapper.ml
          @echo "Build $@"
-         $(HIDE)$(LINK) $(INCLUDES) -o $@ $^
+         $(HIDE)$(CAMLC) -linkpkg $(INCLUDES) -o $@ odyl.cma camlp4.cma pr_o.cmo $^ $(EXTRA_LINK_OPTS)
  cdo2ml: ocamliface/cdo2ml.ml
          @echo "Build $@"
-Line 272
+Line 288
          rm -f `find . -name "*~"`
          rm -f *.cmi *.cmo *.cma *.cmx *.a *.cmxa *.o *~ META
          rm -f cduce$(EXE) ocamlprof.dump
-         rm -f dtd2cduce$(EXE) webiface$(EXE) validate$(EXE) cdo2ml$(EXE)
+         rm -f dtd2cduce$(EXE) webiface$(EXE) cduce_validate$(EXE) \
+                 cdo2ml$(EXE) mlcduce_wrapper$(EXE) evaluator$(EXE)
          rm -Rf prepro package
          rm -f web/www/*.html web/*~
          rm -f web/*.cdo
          rm -f configure.log
+         rm -rf web/doc
+         rm -f META
  distclean: clean
          rm -f Makefile.conf
-Line 306
+Line 325
  include depend
- # CDuce-generated files
+ # Documentation
- driver/examples.ml: cduce web/examples/build.cd web/examples/examples.xml
+ doc: cduce web/site.cdo
-         (cd web/examples; ../../cduce build.cd --arg examples.xml)
+         mkdir -p web/doc
+         (cd web; ../cduce --run site.cdo --arg doc.xml -o doc)
- webpages: cduce web/site.cdo
-         (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
-Line 320
+Line 337
  web/xhtml.cdo: cduce web/xhtml.cd
          ./cduce -I web/ --compile web/xhtml.cd
- website: webpages webiface
+ install_doc: doc
+         $(HIDE)mkdir -p $(MANDIR)/man1
- install_web: website
+         $(HIDE)(cd doc; $(MAKE) install INSTALL=$(INSTALL) MANDIR=$(MANDIR) HIDE=$(HIDE))
-         cp  web/www/*.html web/cduce.css  $(HTML_DIR)/
+         mkdir -p $(DOCDIR)/img
-         cp CHANGES  INSTALL INSTALL.WIN32 $(HTML_DIR)/
+         cp web/doc/*.html $(DOCDIR)/
-         cp webiface $(CGI_DIR)/cduce
+         cp CHANGES INSTALL INSTALL.WIN32 README AUTHORS LICENSE $(DOCDIR)/
-         if test ! -d "$(HTML_DIR)/img" ; then \
+         cp web/img/left.gif web/img/right.gif $(DOCDIR)/img
-           mkdir $(HTML_DIR)/img; \
-         fi;
-         cp web/img/*.*  $(HTML_DIR)/img
  ### Pack OCaml modules for the CDuce/OCaml interface

 Legend:



Removed from v.1287
 


changed lines


 
Added in v.1628
 Legend:



Removed from v.1287
 


changed lines


 
Added in v.1628
-Removed from v.1287
+Added in v.1628

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