[r2005-10-30 15:14:05 by afrisch] Empty log message

Original author: afrisch
Date: 2005-10-30 15:14:54+00:00

INSTALL

@@ -26,7 +26,7 @@ Mandatory packages:
 Before compiling CDuce, you need to install recent releases of the
 following packages:
 
-ocaml      >= 3.09
+ocaml      >= 3.08.4
   http://caml.inria.fr/ocaml/distrib.html
 findlib    >= 1.0.3 
   http://www.ocaml-programming.de/packages

Makefile.distrib

@@ -30,7 +30,8 @@ endif
 SYNTAX = -I misc/ q_symbol.cmo \
   -symbol cduce_version=\"$(VERSION)\" \
   -symbol build_date=\"$(shell date +%Y-%m-%d)\" \
-  -symbol session_dir=\"$(SESSION_DIR)\"
+  -symbol session_dir=\"$(SESSION_DIR)\" \
+  -loc "_loc"
 
 SYNTAX_PARSER = -syntax camlp4o $(SYNTAX:%=-ppopt %)
 
@@ -76,6 +77,11 @@ else
   SYNTAX += -symbol ocaml_compiler=\"bytecode\"
 endif
 
+ifeq ($(FORPACK),true)
+  FORPACKOPT=-passopt -for-pack -passopt Cduce_lib
+else
+  FORPACKOPT=
+endif
 
 INSTALL := install -c
 
@@ -283,7 +289,7 @@ misc/q_symbol.cmo: misc/q_symbol.ml
 
 .ml.cmx:
 	@echo "Build $@"
-	$(HIDE)$(CAMLOPT) -passopt -for-pack -passopt Cduce_lib -c $(SYNTAX_PARSER) $(INCLUDES) $<
+	$(HIDE)$(CAMLOPT) $(FORPACKOPT) -c $(SYNTAX_PARSER) $(INCLUDES) $<
 
 .mli.cmi:
 	@echo "Build $@"
@@ -317,9 +323,9 @@ install_doc: doc
 
 ocamliface/caml_cduce.cmo:
 	@cd ocamliface; \
-	$(MAKE) OCAML_SRC=$(OCAML_SRC) HIDE=$(HIDE) caml_cduce.cmo
+	$(MAKE) caml_cduce.cmo
 
 ocamliface/caml_cduce.cmx:
 	@cd ocamliface; \
-	$(MAKE) OCAML_SRC=$(OCAML_SRC) HIDE=$(HIDE) caml_cduce.cmx
+	$(MAKE) caml_cduce.cmx
 

VERSION

-VERSION=0.3.92
+VERSION=0.4.0

configure.ml

@@ -230,6 +230,13 @@ let pxp,expat =
 
 let required_packages = ["camlp4"; "num"; "pcre"; "ulex"; "cgi"; "netstring"]
 
+let has_forpack =
+  print "testing for -for-pack option: ";
+  if Sys.command "ocamlc -for-pack foo 2> /dev/null" = 0 then
+    (print "available\n"; true)
+  else
+    (print "not available\n"; false)
+
 let () =
   List.iter need_pkg required_packages;
   if pxp then (
@@ -259,4 +266,5 @@ let () =
   fprintf out "SESSION_DIR=%s\n" sessiondir;
   fprintf out "EXE=%s\n" exe;
   fprintf out "PROFILE=false\n";
+  fprintf out "FORPACK=%b\n" has_forpack;
   close_out out

ocamliface/Makefile

 # This Makefile generates caml_cduce.cmo/.cmx
 # It must be called with an OCAML_SRC argument pointing to the root
 # of an OCaml source tree.
-
+include ../Makefile.conf
 
 all: caml_cduce.cmo caml_cduce.cmx
 
 STDLIB=$(shell ocamlc -where)
+CMI_MAGIC=$(shell grep cmi_magic ocaml-3.08.4/utils/config.mlp)
+
+
+ifeq ($(FORPACK),true)
+  FORPACKOPT1=-for-pack Cduce_lib.Caml_cduce
+  FORPACKOPT2=-for-pack Cduce_lib
+else
+  FORPACKOPT1=
+  FORPACKOPT2=
+endif
 
 ocaml_files:
 	mkdir ocaml_files
@@ -13,17 +23,18 @@ ocaml_files:
 	cp location.ml ocaml_files
 	mv ocaml_files/asttypes.mli ocaml_files/asttypes.ml
 	sed s=STDLIB=$(STDLIB)= config.ml > ocaml_files/config.ml
+	grep cmi_magic $(OCAML_SRC)/utils/config.mlp >> ocaml_files/config.ml
 
 caml_cduce.cmo: ocaml_files
 	@echo "Build $@"
-	(cd ocaml_files; ocamlc -for-pack Cduce_lib.Caml_cduce $@ -c $(COMPILE_FILES);\
-	ocamlc -for-pack Cduce_lib -pack -o $@ $(OBJECTS); \
+	(cd ocaml_files; ocamlc $(FORPACKOPT1) $@ -c $(COMPILE_FILES);\
+	ocamlc $(FORPACKOPT2) -pack -o $@ $(OBJECTS); \
 	cp caml_cduce.cmo caml_cduce.cmi ..)
 
 caml_cduce.cmx: ocaml_files
 	@echo "Build $@"
-	(cd ocaml_files; ocamlopt -for-pack Cduce_lib.Caml_cduce $@ -c $(COMPILE_FILES);\
-	ocamlopt -for-pack Cduce_lib -pack -o $@ $(XOBJECTS); \
+	(cd ocaml_files; ocamlopt $(FORPACKOPT1) $@ -c $(COMPILE_FILES);\
+	ocamlopt $(FORPACKOPT2) -pack -o $@ $(XOBJECTS); \
 	cp caml_cduce.cmx caml_cduce.o caml_cduce.cmi ..)
 
 clean:

ocamliface/config.ml

 let standard_library = "STDLIB"
 let load_path = ref ([] : string list)
-let cmi_magic_number = "Caml1999I010"
 let bytecomp_c_compiler = ""
 let bytecomp_c_linker = ""

web/download.xml

@@ -6,11 +6,15 @@
 <box title="Sources tarballs" link="src">
 
 <p>
-The latest available version for download is the 0.3.92 release. We
-successfully compiled it on on Intel Linux, SunOS 5.7, Mac OSX, Windows XP, and FreeBSD 4.7
+The latest available version for download is the 0.4.0 release.
+<!-- We
+successfully compiled it on on Intel Linux, SunOS 5.7, Mac OSX, -->
+<!-- Windows XP, and FreeBSD 4.7 -->
 </p>
 
 <ul>
+<li><a href="download/cduce-0.4.0.tar.gz">Version 0.4.0 (for
+OCaml 3.09)</a></li>
 <li><a href="download/cduce-0.3.92.tar.gz">Version 0.3.92 (for
 OCaml 3.08.3)</a></li>
 <li><a href="download/cduce-0.3.2.tar.gz">Version 0.3.2 (for

web/index.xml

@@ -43,7 +43,7 @@ by <a href="examples.html#site">a CDuce program</a>.
 </left>
 
 <box title="Latest News" link="news">
-<section title="2005, July 12th, Tuesday: CDuce 0.3.9 is out!">
+<section title="2005, Oct 30th, Sunday: CDuce 0.4.0 is out!">
 <p>
 See the <local href="download"/>
 page for download information, or the <a href="CHANGES">CHANGES</a>
@@ -51,11 +51,12 @@ file to know what's new.
 </p>
 <p>
 GODI users can simply select the <tt>apps-cduce</tt> package. 
-Another option is to use the
-<tt>apps-cduce-cvs</tt> package to follow the development tree.
+<!--Another option is to use the
+<tt>apps-cduce-cvs</tt> package to follow the development tree.-->
 </p>
 </section>
 
+<!--
 <section title="2005, May 27th, Friday: Two presentations on some aspects of  CDuce">
 <p>
   Those who will spend their summer in Lisbon or Trondheim may be interested in knowing that Giuseppe Castagna will give a couple of presentations on some aspects of CDuce. In particular:
@@ -88,7 +89,7 @@ has been announced a few days ago on the cduce users mailing list.
 More information on the page <local href="ocaml"/>.
 </p>
 </section>
-
+-->
 <!--
 <section title="2005, March 27th, Easter: PDF user manual">
 <p>