/[svn]/Makefile.distrib

Diff of /Makefile.distrib

Parent Directory | Revision Log | View Patch Patch

-revision 558 by abate,
Tue Jul 10 17:44:28 2007 UTC
+revision 737 by abate,
Tue Jul 10 17:59:46 2007 UTC
 Line 1
  include Makefile.conf
- VERSION = 0.0.91
+ VERSION = 0.2.0-1
- PACKAGES = pxp-engine pxp-lex-iso88591 wlexing camlp4 num cgi pcre netstring
+ PACKAGES = pxp-engine pxp-lex-iso88591 ulex camlp4 num cgi pcre netstring
  ifeq ($(PXP_WLEX), true)
    PACKAGES += pxp-wlex-utf8
  else
    PACKAGES += pxp-lex-utf8
  endif
- SYNTAX = camlp4o -I misc/ pa_extend.cmo \
+ SYNTAX = -I misc/ q_symbol.cmo \
-   q_symbol.cmo \
    -symbol cduce_version=\"$(VERSION)\" \
    -symbol build_date=\"$(shell date +%Y-%m-%d)\" \
    -symbol session_dir=\"$(SESSION_DIR)\"
-Line 25
+Line 24
          SYNTAX += -symbol EXPAT=
  endif
- SYNTAX_PARSER = -pp '$(SYNTAX)'
+ 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
          ifeq ($(NATIVE), false)
           CAMLC_P = ocamlcp -p a
           SYNTAX_PARSER =
+          DEPEND_OCAMLDEP =
          endif
  else
          CAMLOPT_P = ocamlopt -inline 25
  endif
- ifeq ($(PHP), true)
-    PHP_ARG = -php
-    WEB_EXT = .php
- else
-    PHP_ARG =
-    WEB_EXT = .html
- endif
  OPT = -warn-error FPS
- CAMLC = ocamlfind $(CAMLC_P) $(OPT) -package "$(PACKAGES)"
+ OCAMLFIND = ocamlfind
- CAMLOPT = ocamlfind $(CAMLOPT_P) $(OPT) -package "$(PACKAGES)"
+ CAMLC = $(OCAMLFIND) $(CAMLC_P) $(OPT) -package "$(PACKAGES)"
+ CAMLOPT = $(OCAMLFIND) $(CAMLOPT_P) $(OPT) -package "$(PACKAGES)"
  ifeq ($(NATIVE), true)
          EXTENSION = cmx
-Line 58
+Line 52
          LINK = $(CAMLC) -custom -linkpkg gramlib.cma
  endif
- # all: cduce dtd2cduce local_website
+ all: cduce dtd2cduce
- all: cduce dtd2cduce local_website validate
+ 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 schema typing types runtime driver
+ DIRS = misc parser schema typing types compile runtime driver
  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/ns.cmo \
+  misc/pretty.cmo misc/ns.cmo misc/inttbl.cmo \
   \
   types/sortedList.cmo types/boolean.cmo types/ident.cmo \
   types/intervals.cmo types/chars.cmo types/atoms.cmo \
-Line 83
+Line 88
   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 \
   \
+  compile/lambda.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
  CDUCE = $(OBJECTS) driver/run.cmo
  WEBIFACE  = $(OBJECTS) driver/examples.cmo driver/webiface.cmo
-Line 102
+Line 112
  DEPEND = $(ALL_OBJECTS:.cmo=.ml) $(ALL_OBJECTS:.cmo=.mli)
- # DEPEND = $(DIRS:=/*.ml) $(DIRS:=/*.mli)
  INCLUDES = $(DIRS:%=-I %)
  cduce: $(CDUCE:.cmo=.$(EXTENSION))
+         $(LINK) $(INCLUDES) -o $@ $^ $(EXTRA_LINK_OPTS)
+ bug: $(OBJECTS) bug.cmo
          $(LINK) $(INCLUDES) -o $@ $^
  webiface: $(WEBIFACE:.cmo=.$(EXTENSION))
-         $(LINK) $(INCLUDES) -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) $(INCLUDES) -o $@ $^
-Line 118
+Line 132
          $(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
-         (cd expat; make clean)
+         (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 validate
          rm -Rf prepro package
-         rm -f web/www/*.php web/www/*.html web/*~
+         rm -f web/www/*.html web/*~
+         rm -f web/*.cdo
  .SUFFIXES: .ml .mli .cmo .cmi .cmx
-Line 145
+Line 157
          $(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 158
+Line 170
  # 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
+ webpages: cduce web/site.cdo
-         (cd web; ../cduce --quiet site.cd --arg $(PHP_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_local:web/files webiface
+ install_web: website
-         cp  web/www/*$(WEB_EXT) web/cduce.css  $(HTML_DIR)/
+         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
- #local_website: cduce webiface
- #       (cd web; ../cduce --quiet site.cd --arg site.xml)
- #       cp  web/www/*.html web/cduce.css  $(CDUCE_HTML_DIR)/
- #       cp webiface $(CGI_DIR)/cduce

 Legend:



Removed from v.558
 


changed lines


 
Added in v.737
 Legend:



Removed from v.558
 


changed lines


 
Added in v.737
-Removed from v.558
+Added in v.737

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