/[svn]/Makefile.distrib

Diff of /Makefile.distrib

Parent Directory | Revision Log | View Patch Patch

-revision 705 by abate,
Tue Jul 10 17:57:13 2007 UTC
+revision 894 by abate,
Tue Jul 10 18:09:42 2007 UTC
 Line 1
  include Makefile.conf
- VERSION = 0.2.0
+ VERSION = 0.2.0-pre3
- PACKAGES = pxp-engine pxp-lex-iso88591 ulex camlp4 num cgi pcre netstring
+ PACKAGES = pxp-engine pxp-lex-iso88591 ulex camlp4 num cgi pcre netstring curl
  ifeq ($(PXP_WLEX), true)
    PACKAGES += pxp-wlex-utf8
  else
    PACKAGES += pxp-lex-utf8
  endif
+ #
+ # Check if running Cygwin
+ #
+ ifneq (,$(findstring Cygwin, $(shell echo "Sys.os_type;;" | ocaml)))
+     EXE=.exe
+ else
+     EXE=
+ endif
  SYNTAX = -I misc/ q_symbol.cmo \
    -symbol cduce_version=\"$(VERSION)\" \
    -symbol build_date=\"$(shell date +%Y-%m-%d)\" \
-Line 40
+Line 51
  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)"
-Line 52
+Line 71
          LINK = $(CAMLC) -custom -linkpkg gramlib.cma
  endif
- all: cduce dtd2cduce
+ INSTALL := $(shell which install)
+ all: cduce dtd2cduce validate
  install: all
          mkdir -p $(PREFIX)/bin/
          mkdir -p $(PREFIX)/man/man1/
-         install -m755 cduce dtd2cduce $(PREFIX)/bin/
+         $(INSTALL) -m755 cduce$(EXE) dtd2cduce$(EXE) $(PREFIX)/bin/
-         install -m644 doc/cduce.1 $(PREFIX)/man/man1/
+         $(INSTALL) -m644 doc/cduce.1 $(PREFIX)/man/man1/
  uninstall:
-         rm  $(PREFIX)/bin/cduce $(PREFIX)/bin/dtd2cduce $(PREFIX)/man/man1/cduce.1
+         rm  $(PREFIX)/bin/cduce$(EXE) $(PREFIX)/bin/dtd2cduce$(EXE) $(PREFIX)/man/man1/cduce.1
  # Source directories
- DIRS = misc parser schema typing types compile runtime driver module
+ DIRS = misc parser schema typing types compile runtime driver query
  CLEAN_DIRS = $(DIRS) tools tests
  # Objects to build
-Line 75
+Line 97
   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/url.cmo\
   \
   types/sortedList.cmo types/boolean.cmo types/ident.cmo \
   types/intervals.cmo types/chars.cmo types/atoms.cmo \
-Line 85
+Line 107
   \
   runtime/value.cmo \
   \
-  schema/schema_types.cmo schema/schema_xml.cmo schema/schema_builtin.cmo \
+  schema/schema_xml.cmo \
-  schema/schema_validator.cmo schema/schema_parser.cmo \
+  schema/schema_common.cmo \
+  schema/schema_builtin.cmo \
+  schema/schema_validator.cmo \
+  schema/schema_parser.cmo \
   \
   parser/location.cmo parser/ulexer.cmo parser/ast.cmo parser/parser.cmo \
   \
-Line 100
+Line 125
   compile/compile.cmo \
   compile/operators.cmo \
   \
-  types/builtin.cmo driver/cduce.cmo
+  types/builtin.cmo driver/librarian.cmo driver/cduce.cmo
+ CQL_OBJECTS= query/query.cmo query/query_parse.cmo
+ CQL_OBJECTS_RUN = query/query_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
- CDUCE = $(OBJECTS) driver/run.cmo
+ CDUCE = $(OBJECTS) $(CQL_OBJECTS) driver/run.cmo $(CQL_OBJECTS_RUN)
- WEBIFACE  = $(OBJECTS) driver/examples.cmo driver/webiface.cmo
+ 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
+ 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 $@ $^
+         $(LINK) $(INCLUDES) -o $@ $^ $(EXTRA_LINK_OPTS)
  bug: $(OBJECTS) bug.cmo
          $(LINK) $(INCLUDES) -o $@ $^
  webiface: $(WEBIFACE:.cmo=.$(EXTENSION))
-         $(LINK) $(INCLUDES) -o $@ $^ -ccopt -static
+         $(LINK) -verbose $(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 $@ $^
- validate: $(OBJECTS:.cmo=.$(EXTENSION)) tools/validate.ml
+ validate: $(VALIDATE_OBJECTS:.cmo=.$(EXTENSION)) tools/validate.$(EXTENSION)
          $(LINK) $(INCLUDES) -o $@ $^
  .PHONY: compute_depend
  compute_depend: $(DEPEND_OCAMLDEP)
+         echo $(DEPEND)
          @echo "Computing dependencies ..."
-         ocamlfind ocamldep -package "$(PACKAGES)" $(INCLUDES) $(SYNTAX_PARSER) $(DEPEND) | \
+         ocamlfind ocamldep -package "$(PACKAGES)" \
+                 $(INCLUDES) $(SYNTAX_PARSER) $(DEPEND) | \
          sed -e "s|: |: misc/q_symbol.cmo |" > depend
  clean:
          for i in $(CLEAN_DIRS); do \
          (cd $$i; rm -f *.cmi *.cmo *.cma *.cmx *.o *~); \
-Line 148
+Line 180
          rm -f dtd2cduce pool webiface validate
          rm -Rf prepro package
          rm -f web/www/*.html web/*~
+         rm -f web/*.cdo
  .SUFFIXES: .ml .mli .cmo .cmi .cmx
-Line 171
+Line 204
  driver/examples.ml: cduce web/examples/build.cd web/examples/examples.xml
          (cd web/examples; ../../cduce --quiet build.cd --arg examples.xml)
- webpages: cduce web/site.cd.out
+ webpages: cduce web/site.cdo
-         (cd web; ../cduce --run site.cd.out --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/site.cd.out: cduce web/site.cd
+ web/xhtml.cdo: cduce web/xhtml.cd
-         ./cduce --compile web/site.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; \

 Legend:



Removed from v.705
 


changed lines


 
Added in v.894
 Legend:



Removed from v.705
 


changed lines


 
Added in v.894
-Removed from v.705
+Added in v.894

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