From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail1-relais-roc.national.inria.fr (mail1-relais-roc.national.inria.fr [192.134.164.82]) by yquem.inria.fr (Postfix) with ESMTP id 895A9BBAF; Tue, 5 Jan 2010 18:06:38 +0100 (CET) X-IronPort-AV: E=Sophos;i="4.47,506,1257116400"; d="scan'208";a="44235546" Received: from aspirine.inria.fr (HELO [128.93.60.41]) ([128.93.60.41]) by mail1-relais-roc.national.inria.fr with ESMTP; 05 Jan 2010 18:06:38 +0100 Message-ID: <4B43719E.30107@glondu.net> Date: Tue, 05 Jan 2010 18:06:38 +0100 From: =?ISO-8859-1?Q?St=E9phane_Glondu?= User-Agent: Mozilla-Thunderbird 2.0.0.22 (X11/20091109) MIME-Version: 1.0 To: Richard Jones Cc: Damien Doligez , caml announce , caml users , daniel.de_rauglaudre@inria.fr Subject: Re: [Caml-list] [ANN] Release Candidate: 3.11.2+rc1 References: <59542CDD-BE49-40B3-BEFD-1FEE6A4D75EF@inria.fr> <20091229165200.GA22924@annexia.org> <20100105151218.GA20201@annexia.org> In-Reply-To: <20100105151218.GA20201@annexia.org> X-Enigmail-Version: 0.95.0 Content-Type: multipart/mixed; boundary="------------010100070104080009000203" X-Spam: no; 0.00; camlp:01 manpage:01 ocaml:01 cduce:01 ocamlduce:01 cduce:01 ocamlduce:01 tarball:01 ocaml:01 cheers:01 steph:98 git:98 git:98 orig:01 compile:01 X-Attachments: type="text/x-patch" name="0001-Add-partial-OCaml-3.11.2-support.patch" name="0001-Add-partial-OCaml-3.11.2-support.patch" type="text/x-patch" name="0002-Fix-typos-in-manpage.patch" name="0002-Fix-typos-in-manpage.patch" This is a multi-part message in MIME format. --------------010100070104080009000203 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit 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 --------------010100070104080009000203 Content-Type: text/x-patch; name="0001-Add-partial-OCaml-3.11.2-support.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0001-Add-partial-OCaml-3.11.2-support.patch" From: Stephane Glondu 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 --- 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; -- --------------010100070104080009000203 Content-Type: text/x-patch; name="0002-Fix-typos-in-manpage.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0002-Fix-typos-in-manpage.patch" From: Stephane Glondu 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 -- --------------010100070104080009000203--