Re: [Caml-list] [ANN] Release Candidate: 3.11.2+rc1

["Stéphane Glondu" <steph@glondu.net>]

[-- Attachment #1: Type: text/plain, Size: 828 bytes --]

Richard Jones a écrit :
> camlp5 - When you compile, it complains it doesn't know anything about
> 3.11.2 and that this will require an upstream change.

The first patch attached adds support for 3.11.2 (see comments in it).
I've also added some fixes to the manpage that are of course irrelevant
for the support of OCaml 3.11.2 (hopefully, they will also be applied in
the next upstream release).

> cduce - Also FTBFS.

You mean ocamlduce? cduce compiles fine. I've tagged in git [1] a new rc
for ocamlduce. A tarball is available at [2]. I will wait for the final
release of OCaml 3.11.2 to make a new formal release of ocamlduce.

[1] http://git.ocamlcore.org/cgi-bin/gitweb.cgi?p=ocamlduce/ocamlduce.git

[2]
http://debian.glondu.net/debian/pool/ocaml3112rc1/1/ocamlduce_3.11.2.0%7Erc1.orig.tar.gz


Cheers,

-- 
Stéphane


[-- Attachment #2: 0001-Add-partial-OCaml-3.11.2-support.patch --]
[-- Type: text/x-patch, Size: 1363 bytes --]

From: Stephane Glondu <steph@glondu.net>
Date: Tue, 5 Jan 2010 17:17:57 +0100
Subject: [PATCH] Add (partial) OCaml 3.11.2 support

The full support is achieved by running the following commands after
extracting the tarball of version 5.12, before runing ./configure:

  cp -a ocaml_stuff/3.11.1 ocaml_stuff/3.11.2
  sed -i \
    -e 's/let ocaml_version = "3.11.1"/let ocaml_version = "3.11.2"/' \
    ocaml_stuff/3.11.2/utils/pconfig.ml
  cp -a ocaml_src/main/ast2pt.ml_3.11.1 ocaml_src/main/ast2pt.ml_3.11.2

Signed-off-by: Stephane Glondu <steph@glondu.net>
---
 main/ast2pt.ml |    2 +-
 top/rprint.ml  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/ast2pt.ml b/main/ast2pt.ml
index 3c1ae43..9f3af38 100644
--- a/main/ast2pt.ml
+++ b/main/ast2pt.ml
@@ -14,7 +14,7 @@ THEN
 END;
 
 IFDEF
-  OCAML_3_11 OR OCAML_3_11_0 OR OCAML_3_11_1 OR OCAML_3_12_0
+  OCAML_3_11 OR OCAML_3_11_0 OR OCAML_3_11_1 OR OCAML_3_11_2 OR OCAML_3_12_0
 THEN
   DEFINE AFTER_OCAML_3_11
 END;
diff --git a/top/rprint.ml b/top/rprint.ml
index c011b07..1a67480 100644
--- a/top/rprint.ml
+++ b/top/rprint.ml
@@ -11,7 +11,7 @@ THEN
   DEFINE OCAML_3_08
 END;
 
-IFDEF OCAML_3_11 OR OCAML_3_11_0 OR OCAML_3_11_1 OR OCAML_3_12_0 THEN
+IFDEF OCAML_3_11 OR OCAML_3_11_0 OR OCAML_3_11_1 OR OCAML_3_11_2 OR OCAML_3_12_0 THEN
   DEFINE AFTER_OCAML_3_11
 END;
 
-- 

[-- Attachment #3: 0002-Fix-typos-in-manpage.patch --]
[-- Type: text/x-patch, Size: 807 bytes --]

From: Stephane Glondu <steph@glondu.net>
Date: Tue, 5 Jan 2010 17:27:36 +0100
Subject: [PATCH] Fix typos in manpage

---
 man/camlp5.1.tpl |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/camlp5.1.tpl b/man/camlp5.1.tpl
index 9fdf2ab..a10d718 100644
--- a/man/camlp5.1.tpl
+++ b/man/camlp5.1.tpl
@@ -107,7 +107,7 @@ object files (ending with .cmo or .cma). Several usage of these options
 are authorized. They must precede the other options.
 
 .LP
-An optionnal
+An optional
 .B \-\-
 may end the load options.
 
@@ -300,7 +300,7 @@ the command line as ".cmi" files. For example, how to add the the
 OCaml module "str":
 .nf
 .ta 1c
-	mkcamlp5 -custom str.cmi str.cma -cclib -lstr -o camlp5str
+	mkcamlp5 \-custom str.cmi str.cma \-cclib \-lstr \-o camlp5str
 .fi
 .LP
 
--