[Pkg-ocaml-maint-commits] [cppo] 03/05: Imported Upstream version 1.4.1

[Hendrik Tews]

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

hendrik-guest pushed a commit to branch master
in repository cppo.

commit 59a3d7aa6f6934f833a3f998047ec81578ec8311
Author: Hendrik Tews <hendrik at askra.de>
Date:   Thu Jan 19 14:24:36 2017 +0100

    Imported Upstream version 1.4.1
---
 Makefile       |  8 ++++----
 cppo_lexer.mll |  2 +-
 opam           | 21 +++++++++++++++++----
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index c2cea59..d7b57c0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 1.4.0
+VERSION = 1.4.1
 
 ifeq "$(shell ocamlc -config |grep os_type)" "os_type: Win32"
 EXE=.exe
@@ -61,14 +61,14 @@ ML = cppo_version.ml cppo_types.ml \
 OCAMLBUILD_ML = ocamlbuild_cppo.ml
 
 all: $(ML)
-	ocamlc -o cppo$(EXE) -dtypes unix.cma str.cma $(ML)
+	ocamlfind ocamlc -o cppo$(EXE) -dtypes -linkpkg -package "unix str bytes" $(ML)
 
 opt: $(ML)
-	ocamlopt -o cppo$(EXE) -dtypes unix.cmxa str.cmxa $(ML)
+	ocamlfind ocamlopt -o cppo$(EXE) -dtypes -linkpkg -package "unix str bytes" $(ML)
 
 # For debugging; not installed.
 toplib: $(ML)
-	ocamlc -a -o cppo.cma -dtypes unix.cma str.cma $(ML)
+	ocamlfind ocamlc -a -o cppo.cma -dtypes -linkpkg -package "unix str bytes" $(ML)
 
 ocamlbuild:
 	cd ocamlbuild_plugin && ocamlbuild -use-ocamlfind $(OCAMLBUILD_IMPL)
diff --git a/cppo_lexer.mll b/cppo_lexer.mll
index b479704..93ae901 100644
--- a/cppo_lexer.mll
+++ b/cppo_lexer.mll
@@ -19,7 +19,7 @@ let lex_new_lines lb =
   let n = ref 0 in
   let s = lb.lex_buffer in
   for i = lb.lex_start_pos to lb.lex_curr_pos do
-    if s.[i] = '\n' then
+    if Bytes.get s i = '\n' then
       incr n
   done;
   let p = lb.lex_curr_p in
diff --git a/opam b/opam
index b8af947..9d13df5 100644
--- a/opam
+++ b/opam
@@ -1,13 +1,26 @@
-opam-version: "1"
-maintainer: "contact at ocamlpro.com"
+opam-version: "1.2"
+maintainer: "martin at mjambon.com"
 authors: ["Martin Jambon"]
 homepage: "http://mjambon.com/cppo.html"
+dev-repo: "https://github.com/mjambon/cppo.git"
+bug-reports: "https://github.com/mjambon/cppo/issues"
 license: "BSD-3-Clause"
 build: [
-  [make]
+  [make "all"] {!ocaml_native}
+  [make "opt"] {ocaml_native}
+  [make "ocamlbuild"]
+]
+
+install: [
   [make "install-lib"]
 ]
 
 remove: [
   ["ocamlfind" "remove" "cppo_ocamlbuild"]
-]
\ No newline at end of file
+]
+
+depends: [
+  "ocamlfind"
+  "ocamlbuild"
+  "base-bytes"
+]

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