/[svn]/Makefile.distrib

Diff of /Makefile.distrib

Parent Directory | Revision Log | View Patch Patch

-revision 451 by abate,
Tue Jul 10 17:35:52 2007 UTC
+revision 677 by abate,
Tue Jul 10 17:53:53 2007 UTC
 Line 1
- NATIVE = true
+ include Makefile.conf
- PROFILE = false
+ VERSION = 0.1.2
- PXP_WLEX = false
- PACKAGES = -package "pxp-engine pxp-lex-iso88591 wlexing camlp4 num cgi"
+ PACKAGES = pxp-engine pxp-lex-iso88591 ulex camlp4 num cgi pcre netstring
  ifeq ($(PXP_WLEX), true)
-   PACKAGES += -package pxp-wlex-utf8
+   PACKAGES += pxp-wlex-utf8
  else
-   PACKAGES += -package pxp-lex-utf8
+   PACKAGES += pxp-lex-utf8
  endif
- SYNTAX = camlp4o -I misc/ pa_extend.cmo \
+ SYNTAX = -I misc/ pa_extend.cmo q_symbol.cmo \
-   q_symbol.cmo \
    -symbol cduce_version=\"$(VERSION)\" \
-   -symbol build_date=\"$(shell date +%Y-%m-%d)\"
+   -symbol build_date=\"$(shell date +%Y-%m-%d)\" \
+   -symbol session_dir=\"$(SESSION_DIR)\"
  ifeq ($(NATIVE), true)
          SYNTAX += -symbol ocaml_compiler=\"native\"
-Line 20
+Line 19
          SYNTAX += -symbol ocaml_compiler=\"bytecode\"
  endif
- VERSION = 0.0.9
+ ifeq ($(EXPAT), true)
+         PACKAGES += expat
+         SYNTAX += -symbol EXPAT=
+ endif
+ SYNTAX_PARSER = -syntax camlp4o $(SYNTAX:%=-ppopt %)
+ CAMLC_P = ocamlc
+ DEPEND_OCAMLDEP = misc/q_symbol.cmo
  ifeq ($(PROFILE), true)
-         CAMLC_P = ocamlcp -p a
          CAMLOPT_P = ocamlopt -p
+         ifeq ($(NATIVE), false)
+          CAMLC_P = ocamlcp -p a
          SYNTAX_PARSER =
+          DEPEND_OCAMLDEP =
+         endif
  else
-         CAMLC_P = ocamlc
+         CAMLOPT_P = ocamlopt -inline 25
-         CAMLOPT_P = ocamlopt
-         SYNTAX_PARSER = -pp '$(SYNTAX)'
  endif
- OPT = -warn-error A
+ OPT = -warn-error FPS
- CAMLC = ocamlfind $(CAMLC_P) $(OPT) $(PACKAGES)
+ OCAMLFIND = ocamlfind
- CAMLOPT = ocamlfind $(CAMLOPT_P) $(OPT) $(PACKAGES)
+ CAMLC = $(OCAMLFIND) $(CAMLC_P) $(OPT) -package "$(PACKAGES)"
+ CAMLOPT = $(OCAMLFIND) $(CAMLOPT_P) $(OPT) -package "$(PACKAGES)"
  ifeq ($(NATIVE), true)
          EXTENSION = cmx
-Line 44
+Line 52
          LINK = $(CAMLC) -custom -linkpkg gramlib.cma
  endif
- all: cduce dtd2cduce local_website
+ all: cduce dtd2cduce
+ 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
  # Source directories
- DIRS = misc parser typing types runtime driver
+ DIRS = misc parser schema typing types runtime driver module
  CLEAN_DIRS = $(DIRS) tools tests
  # Objects to build
  OBJECTS = \
+  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/pretty.cmo misc/ns.cmo \
   \
   types/sortedList.cmo types/boolean.cmo types/ident.cmo \
-  types/intervals.cmo types/chars.cmo types/atoms.cmo types/normal.cmo \
+  types/intervals.cmo types/chars.cmo types/atoms.cmo \
+  types/normal.cmo \
   types/types.cmo types/patterns.cmo types/sequence.cmo \
-  types/sample.cmo \
+  types/sample.cmo types/builtin_defs.cmo \
+  \
+  runtime/value.cmo \
+  \
+  schema/schema_types.cmo schema/schema_xml.cmo schema/schema_builtin.cmo \
+  schema/schema_validator.cmo schema/schema_parser.cmo \
   \
-  parser/location.cmo parser/wlexer.cmo parser/ast.cmo parser/parser.cmo \
+  parser/location.cmo parser/ulexer.cmo parser/ast.cmo parser/parser.cmo \
   \
   typing/typed.cmo typing/typer.cmo \
   \
-  runtime/value.cmo runtime/load_xml.cmo runtime/run_dispatch.cmo \
+  runtime/load_xml.cmo runtime/run_dispatch.cmo \
   runtime/print_xml.cmo runtime/eval.cmo \
   \
   types/builtin.cmo driver/cduce.cmo
-Line 75
+Line 101
  WEBIFACE  = $(OBJECTS) driver/examples.cmo driver/webiface.cmo
  DTD2CDUCE = tools/dtd2cduce.cmo
- DEPEND = $(DIRS:=/*.ml) $(DIRS:=/*.mli)
+ ALL_OBJECTS = $(OBJECTS) \
+  driver/run.cmo driver/examples.cmo driver/webiface.cmo \
+  tools/dtd2cduce.cmo
+ DEPEND = $(ALL_OBJECTS:.cmo=.ml) $(ALL_OBJECTS:.cmo=.mli)
  INCLUDES = $(DIRS:%=-I %)
  cduce: $(CDUCE:.cmo=.$(EXTENSION))
          $(LINK) $(INCLUDES) -o $@ $^
  webiface: $(WEBIFACE:.cmo=.$(EXTENSION))
-         $(LINK) -o $@ $^
+         $(LINK) $(INCLUDES) -o $@ $^ -ccopt -static
+ # webiface is made static to be able to move it more easily
+ # (to compile it on a machine which is not the web server)
  dtd2cduce: $(DTD2CDUCE:.cmo=.$(EXTENSION))
-         $(LINK) -o $@ $^
+         $(LINK) $(INCLUDES) -o $@ $^
+ validate: $(OBJECTS:.cmo=.$(EXTENSION)) tools/validate.ml
+         $(LINK) $(INCLUDES) -o $@ $^
  .PHONY: compute_depend
- compute_depend: misc/q_symbol.cmo
+ compute_depend: $(DEPEND_OCAMLDEP)
          @echo "Computing dependencies ..."
-         ocamldep $(INCLUDES) $(SYNTAX_PARSER) $(DEPEND) | \
+         ocamlfind ocamldep -package "$(PACKAGES)" $(INCLUDES) $(SYNTAX_PARSER) $(DEPEND) | \
          sed -e "s|: |: misc/q_symbol.cmo |" > depend
- parser/wlexer.ml: parser/wlexer.mll
-         wlex parser/wlexer.mll
  clean:
          for i in $(CLEAN_DIRS); do \
          (cd $$i; rm -f *.cmi *.cmo *.cma *.cmx *.o *~); \
          done
-         rm -f `find -name "*~"`
+         (cd expat; $(MAKE) clean)
+         rm -f `find . -name "*~"`
          rm -f *.cmi *.cmo *.cma *.cmx *.a *.cmxa *.o *~
          rm -f cduce ocamlprof.dump
-         rm -f dtd2cduce pool webiface
+         rm -f dtd2cduce pool webiface validate
          rm -Rf prepro package
-         rm -f web/www/*.php web/www/*.html web/*~
+         rm -f web/www/*.html web/*~
  .SUFFIXES: .ml .mli .cmo .cmi .cmx
  misc/q_symbol.cmo: misc/q_symbol.ml
-         $(CAMLC) -c $<
+         $(CAMLC) -c -pp 'camlp4o pa_extend.cmo q_MLast.cmo' $<
  .ml.cmo:
-         $(CAMLC) -c $(SYNTAX_PARSER) $(INCLUDES) $<
+         $(CAMLC) -c $(INCLUDES) $(SYNTAX_PARSER) $<
  .ml.cmx:
          $(CAMLOPT) -c $(SYNTAX_PARSER) $(INCLUDES) $<
-Line 127
+Line 161
  # CDuce-generated files
  driver/examples.ml: cduce web/examples/build.cd web/examples/examples.xml
-         (cd web/examples; ../../cduce --quiet build.cd)
+         (cd web/examples; ../../cduce --quiet build.cd --arg examples.xml)
- web/files: cduce web/site.cd
-         (cd web; ../cduce --quiet site.cd --arg -php site.xml)
- #
+ webpages: cduce web/site.cd
- # Customize the following variables to match the settings
+         (cd web; ../cduce --quiet site.cd --arg site.xml)
- # of your local web server
- #
- WEB_PREFIX = /var/www
- CGI_DIR = $(WEB_PREFIX)/cgi-bin
- CDUCE_HTML_DIR = $(WEB_PREFIX)/html
- install_web_local:web/files webiface
-         cp  web/www/*.php web/cduce.css  $(CDUCE_HTML_DIR)/
-         cp webiface $(CGI_DIR)/
-         if test ! -d "$(CDUCE_HTML_DIR)/img" ; then \
-           mkdir $(CDUCE_HTML_DIR)/img; \
-         fi;
-         cp web/img/*.*  $(CDUCE_HTML_DIR)/img
+ website: webpages webiface
- local_website: cduce
+ install_web: website
-         (cd web; ../cduce --quiet site.cd --arg site.xml)
+         cp  web/www/*.html web/cduce.css  $(HTML_DIR)/
+         cp CHANGES $(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

 Legend:



Removed from v.451
 


changed lines


 
Added in v.677
 Legend:



Removed from v.451
 


changed lines


 
Added in v.677
-Removed from v.451
+Added in v.677

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