[Pkg-ocaml-maint-commits] [ocaml-text] 03/11: New upstream version 0.7.1
Stéphane Glondu
glondu at moszumanska.debian.org
Tue Jul 18 09:25:10 UTC 2017
This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository ocaml-text.
commit f582c3d028e6a0d11cda3cb4be779df279a5782f
Author: Stephane Glondu <steph at glondu.net>
Date: Tue Jul 18 10:22:07 2017 +0200
New upstream version 0.7.1
---
CHANGES | 5 +++++
Makefile | 31 ++++++++++++++++++-------------
_oasis | 10 +++++++---
configure | 4 ++--
setup.ml | 15 +++++++--------
src/META | 15 ++++++++-------
6 files changed, 47 insertions(+), 33 deletions(-)
diff --git a/CHANGES b/CHANGES
index 4485d5a..5f7ab29 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+===== 0.7.1 ====
+
+ * Use OASIS 0.4.x compiled_setup alpha feature
+ * Fixed _oasis file for the syntax extension
+
===== 0.7 =====
* Switched to git and github
diff --git a/Makefile b/Makefile
index 3639f14..e941c56 100644
--- a/Makefile
+++ b/Makefile
@@ -1,41 +1,46 @@
# OASIS_START
-# DO NOT EDIT (digest: a3c674b4239234cbbe53afe090018954)
+# DO NOT EDIT (digest: 46f8bd9984975bd4727bed22d0876cd2)
-SETUP = ocaml setup.ml
+SETUP = ./setup.exe
-build: setup.data
+build: setup.data $(SETUP)
$(SETUP) -build $(BUILDFLAGS)
-doc: setup.data build
+doc: setup.data $(SETUP) build
$(SETUP) -doc $(DOCFLAGS)
-test: setup.data build
+test: setup.data $(SETUP) build
$(SETUP) -test $(TESTFLAGS)
-all:
+all: $(SETUP)
$(SETUP) -all $(ALLFLAGS)
-install: setup.data
+install: setup.data $(SETUP)
$(SETUP) -install $(INSTALLFLAGS)
-uninstall: setup.data
+uninstall: setup.data $(SETUP)
$(SETUP) -uninstall $(UNINSTALLFLAGS)
-reinstall: setup.data
+reinstall: setup.data $(SETUP)
$(SETUP) -reinstall $(REINSTALLFLAGS)
-clean:
+clean: $(SETUP)
$(SETUP) -clean $(CLEANFLAGS)
-distclean:
+distclean: $(SETUP)
$(SETUP) -distclean $(DISTCLEANFLAGS)
+ $(RM) $(SETUP)
-setup.data:
+setup.data: $(SETUP)
$(SETUP) -configure $(CONFIGUREFLAGS)
-configure:
+configure: $(SETUP)
$(SETUP) -configure $(CONFIGUREFLAGS)
+setup.exe: setup.ml
+ ocamlfind ocamlopt -o $@ $< || ocamlfind ocamlc -o $@ $< || true
+ $(RM) setup.cmi setup.cmo setup.cmx setup.o
+
.PHONY: build doc test all install uninstall reinstall clean distclean configure
# OASIS_STOP
diff --git a/_oasis b/_oasis
index 9660945..d99b87a 100644
--- a/_oasis
+++ b/_oasis
@@ -12,6 +12,7 @@ Homepage: http://ocaml-text.forge.ocamlcore.org/
BuildTools: ocamlbuild
Plugins: META (0.4), DevFiles (0.4)
Synopsis: ocaml-text
+AlphaFeatures: compiled_setup_ml
Description:
OCaml-Text is an OCaml library for dealing with "text",
i.e. sequences of unicode characters, in a convenient way.
@@ -63,6 +64,9 @@ Library "pcre-syntax"
Pa_text_types,
Pa_text_util
BuildDepends: text, camlp4, camlp4.quotations.o, camlp4.extend
+ XMETAType: syntax
+ XMETADescription: Syntax extension for writing human readable regexps in OCaml sources
+ XMETARequires: camlp4, text
# +-------------------------------------------------------------------+
# | Doc |
@@ -106,6 +110,6 @@ Test main
# +-------------------------------------------------------------------+
SourceRepository head
- Type: darcs
- Location: http://darcs.ocamlcore.org/repos/ocaml-text
- Browser: http://darcs.ocamlcore.org/cgi-bin/darcsweb.cgi?r=ocaml-text;a=summary
+ Type: git
+ Location: git://github.com/vbmithr/ocaml-text
+ Browser: http://github.com/vbmithr/ocaml-text
diff --git a/configure b/configure
index 6acfaeb..42fb4c3 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
#!/bin/sh
# OASIS_START
-# DO NOT EDIT (digest: dc86c2ad450f91ca10c931b6045d0499)
+# DO NOT EDIT (digest: 82230d61386befb40bc7377608e1f16e)
set -e
FST=true
@@ -23,5 +23,5 @@ for i in "$@"; do
esac
done
-ocaml setup.ml -configure "$@"
+make configure CONFIGUREFLAGS="$@"
# OASIS_STOP
diff --git a/setup.ml b/setup.ml
index 46587ce..67af673 100644
--- a/setup.ml
+++ b/setup.ml
@@ -8,7 +8,7 @@
*)
(* OASIS_START *)
-(* DO NOT EDIT (digest: c47dcfea6a251d9dac4d1ab127564bc9) *)
+(* DO NOT EDIT (digest: c5bc4bd95f2fc5b92b4288a373231840) *)
(*
Regenerated by OASIS v0.4.4
Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6865,7 +6865,7 @@ let setup_t =
oasis_version = "0.4";
ocaml_version = None;
findlib_version = None;
- alpha_features = [];
+ alpha_features = ["compiled_setup_ml"];
beta_features = [];
name = "ocaml-text";
version = "0.7";
@@ -7203,12 +7203,11 @@ let setup_t =
cs_plugin_data = []
},
{
- src_repo_type = Darcs;
+ src_repo_type = Git;
src_repo_location =
- "http://darcs.ocamlcore.org/repos/ocaml-text";
+ "git://github.com/vbmithr/ocaml-text";
src_repo_browser =
- Some
- "http://darcs.ocamlcore.org/cgi-bin/darcsweb.cgi?r=ocaml-text;a=summary";
+ Some "http://github.com/vbmithr/ocaml-text";
src_repo_module = None;
src_repo_branch = None;
src_repo_tag = None;
@@ -7223,7 +7222,7 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.4";
- oasis_digest = Some "\175x\t\188\020\027y\209\239\173S\147\185\161\1424";
+ oasis_digest = Some "\239\169\170\201S\143\005')\175\131%\014G8W";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
@@ -7231,7 +7230,7 @@ let setup_t =
let setup () = BaseSetup.setup setup_t;;
-# 7228 "setup.ml"
+# 7227 "setup.ml"
(* OASIS_STOP *)
(* List of paths to search for iconv *)
diff --git a/src/META b/src/META
index fdd3f6b..2c352f7 100644
--- a/src/META
+++ b/src/META
@@ -1,5 +1,5 @@
# OASIS_START
-# DO NOT EDIT (digest: 52cd1021654a5f3d0481f8e72d2daff2)
+# DO NOT EDIT (digest: 7d039e7e35f4fea9f120eddf532b5c20)
version = "0.7"
description = "ocaml-text"
archive(byte) = "text.cma"
@@ -9,12 +9,13 @@ archive(native, plugin) = "text.cmxs"
exists_if = "text.cma"
package "pcre-syntax" (
version = "0.7"
- description = "ocaml-text"
- requires = "text camlp4 camlp4.quotations.o camlp4.extend"
- archive(byte) = "pcre-syntax.cma"
- archive(byte, plugin) = "pcre-syntax.cma"
- archive(native) = "pcre-syntax.cmxa"
- archive(native, plugin) = "pcre-syntax.cmxs"
+ description =
+ "Syntax extension for writing human readable regexps in OCaml sources"
+ requires = "camlp4 text"
+ archive(syntax, preprocessor) = "pcre-syntax.cma"
+ archive(syntax, toploop) = "pcre-syntax.cma"
+ archive(syntax, preprocessor, native) = "pcre-syntax.cmxa"
+ archive(syntax, preprocessor, native, plugin) = "pcre-syntax.cmxs"
exists_if = "pcre-syntax.cma"
)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-text.git
More information about the Pkg-ocaml-maint-commits
mailing list