[Pkg-ocaml-maint-commits] [cppo] 05/09: Imported Upstream version 1.1.2

[Stéphane Glondu]

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository cppo.

commit 10c7f02d0bcb4dd786f9ea58f7cce3bdc53404e1
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Sep 3 14:22:08 2015 +0200

    Imported Upstream version 1.1.2
---
 Makefile                             | 2 +-
 README.md                            | 6 ++++--
 ocamlbuild_plugin/ocamlbuild_cppo.ml | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 1daf812..467d5c6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 1.1.1
+VERSION = 1.1.2
 
 ifeq "$(shell ocamlc -config |grep os_type)" "os_type: Win32"
 EXE=.exe
diff --git a/README.md b/README.md
index a17e5f5..862864b 100644
--- a/README.md
+++ b/README.md
@@ -212,7 +212,7 @@ sharing the same prefix. See the output of `cppo -help` (copied at the
 bottom of this page).
 
 ```
-$ ./cppo -V OCAML:`ocamlc -version`
+$ cppo -V OCAML:`ocamlc -version`
 #if OCAML_VERSION >= (4, 0, 0)
 (* All is well. *)
 #else
@@ -388,7 +388,7 @@ Ocamlbuild plugin
 ------------------
 
 An ocamlbuild plugin is available. To use it, you can call ocamlbuild
-with the argument `--plugin-tag package(cppo_ocamlbuild)` (only since
+with the argument `-plugin-tag package(cppo_ocamlbuild)` (only since
 4.01).
 
 With Oasis :
@@ -419,6 +419,8 @@ to produce`.ml` files. The following tags are available:
   * If `foo` is a directory, it's equivalent to `-I foo`.
   * If `foo` is a file, it adds `foo` as a dependency and apply `-I
     parent(foo)`.
+* `cppo_V(NAME:VERSION)` ≡ `-V NAME:VERSION`
+* `cppo_V_OCAML` ≡ `-V OCAML:VERSION`, where `VERSION` is the version of OCaml that ocamlbuild uses.
 
 Detailed command-line usage and options
 ---------------------------------------
diff --git a/ocamlbuild_plugin/ocamlbuild_cppo.ml b/ocamlbuild_plugin/ocamlbuild_cppo.ml
index fa0d591..91f7b2f 100644
--- a/ocamlbuild_plugin/ocamlbuild_cppo.ml
+++ b/ocamlbuild_plugin/ocamlbuild_cppo.ml
@@ -26,6 +26,7 @@ let dispatcher = function
       flag ["cppo"; "cppo_s"] (A "-s") ;
       flag ["cppo"; "cppo_n"] (A "-n") ;
       pflag ["cppo"] "cppo_x" (fun s -> S [A "-x"; A s]);
-      pflag ["cppo"] "cppo_V" (fun s -> S [A "-V"; A s])
+      pflag ["cppo"] "cppo_V" (fun s -> S [A "-V"; A s]);
+      flag ["cppo"; "cppo_V_OCAML"] & S [A "-V"; A ("OCAML:" ^ Sys.ocaml_version)]
     end
   | _ -> ()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.git