Switched to jbuilder and topkg

mmottl · Jul 28, 2017 · 951c4b8 · 951c4b8
1 parent 258b72c
commit 951c4b8
Show file tree

Hide file tree

Showing 43 changed files with 697 additions and 8,625 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+.merlin
+*.install
 _build
 API.docdir
 *.bak

diff --git a/API.odocl b/API.odocl
diff --git a/AUTHORS.txt b/AUTHORS.txt
diff --git a/CHANGES.md b/CHANGES.md
@@ -0,0 +1,3 @@
+### 7.3.0 (2017-07-27)
+
+  * Switched to jbuilder and topkg
diff --git a/COPYING.txt b/COPYING.txt
diff --git a/INSTALL.txt b/INSTALL.txt
diff --git a/LICENSE.md b/LICENSE.md
diff --git a/Makefile b/Makefile
@@ -1,41 +1,10 @@
-# OASIS_START
-# DO NOT EDIT (digest: a3c674b4239234cbbe53afe090018954)
-
-SETUP = ocaml setup.ml
-
-build: setup.data
-	$(SETUP) -build $(BUILDFLAGS)
-
-doc: setup.data build
-	$(SETUP) -doc $(DOCFLAGS)
-
-test: setup.data build
-	$(SETUP) -test $(TESTFLAGS)
+.PHONY: all clean doc
 
 all:
-	$(SETUP) -all $(ALLFLAGS)
-
-install: setup.data
-	$(SETUP) -install $(INSTALLFLAGS)
-
-uninstall: setup.data
-	$(SETUP) -uninstall $(UNINSTALLFLAGS)
-
-reinstall: setup.data
-	$(SETUP) -reinstall $(REINSTALLFLAGS)
+	jbuilder build @install --dev
 
 clean:
-	$(SETUP) -clean $(CLEANFLAGS)
-
-distclean:
-	$(SETUP) -distclean $(DISTCLEANFLAGS)
-
-setup.data:
-	$(SETUP) -configure $(CONFIGUREFLAGS)
-
-configure:
-	$(SETUP) -configure $(CONFIGUREFLAGS)
-
-.PHONY: build doc test all install uninstall reinstall clean distclean configure
+	jbuilder clean
 
-# OASIS_STOP
+doc:
+	jbuilder build --dev @doc
diff --git a/README.md b/README.md
@@ -1,14 +1,8 @@
-PCRE-OCaml - Perl Compatibility Regular Expressions for OCaml
-=============================================================
-
----------------------------------------------------------------------------
-
-What is PCRE-OCaml?
--------------------
+## PCRE-OCaml - Perl Compatibility Regular Expressions for OCaml
 
 This [OCaml](http://www.ocaml.org)-library interfaces the C-library
-[PCRE](http://www.pcre.org) (Perl-compatibility Regular Expressions).  It can
-be used for matching regular expressions which are written in "PERL"-style.
+[PCRE](http://www.pcre.org) (Perl-compatibility Regular Expressions).  It can be
+used for string matching with "PERL"-style regular expressions.
 
 ### Features
 
@@ -49,9 +43,8 @@ Other reasons to use PCRE-OCaml:
 
 ### Usage
 
-The API-documentation which is built and installed with PCRE-OCaml explains all
-functions, most of which are fairly straightforward to understand, in detail.
-It can also be found [online](http://mmottl.github.io/pcre-ocaml/api).
+Please consult the [API](https://mmottl.github.io/pcre-ocaml/api/pcre) for
+details.
 
 A general concept the user may need to understand is that most functions
 allow for two different kinds of flags:
@@ -61,7 +54,7 @@ allow for two different kinds of flags:
      Example:
 
      ```ocaml
-     let rex = regexp ~flags:[`ANCHORED; `CASELESS] "some pattern" in
+     let rex = Pcre.regexp ~flags:[`ANCHORED; `CASELESS] "some pattern" in
      (* ... *)
      ```
 
@@ -75,9 +68,9 @@ allow for two different kinds of flags:
      performance in loops.  Example:
 
      ```ocaml
-     let iflags = cflags [`ANCHORED; `CASELESS] in
+     let iflags = Pcre.cflags [`ANCHORED; `CASELESS] in
      for i = 1 to 1000 do
-       let rex = regexp ~iflags "some pattern constructed at runtime" in
+       let rex = Pcre.regexp ~iflags "some pattern constructed at runtime" in
        (* ... *)
      done
      ```
@@ -89,39 +82,29 @@ allow for two different kinds of flags:
 
       ```ocaml
       for i = 1 to 1000 do
-        let chunks = split ~pat:"[ \t]+" "foo bar" in
+        let chunks = Pcre.split ~pat:"[ \t]+" "foo bar" in
         (* ... *)
       done
       ```
 
       Better:
 
       ```ocaml
-      let rex = regexp "[ \t]+" in
+      let rex = Pcre.regexp "[ \t]+" in
       for i = 1 to 1000 do
-        let chunks = split ~rex "foo bar" in
+        let chunks = Pcre.split ~rex "foo bar" in
         (* ... *)
       done
       ```
 
-The provided functions use optional arguments with intuitive defaults.
-For example, the `split`-function will assume whitespace as pattern.
-
-Take a look at the interface file `pcre.mli` to see which ways exists to pass
-parameters and to learn about the defaults.  The `examples`-directory contains
-a few example applications demonstrating the functionality of PCRE-OCaml.
-
----------------------------------------------------------------------------
-
-Contact Information and Contributing
-------------------------------------
-
-In the case of bugs, feature requests, contributions and similar, you can
-contact me here: <markus.mottl@gmail.com>
+The provided functions use optional arguments with intuitive defaults.  For
+example, the `Pcre.split`-function will assume whitespace as pattern.  The
+`examples`-directory contains a few example applications demonstrating the
+functionality of PCRE-OCaml.
 
-Up-to-date information should be available at:
-<http://mmottl.github.io/pcre-ocaml>
+### Contact Information and Contributing
 
-Enjoy!
+Please submit bugs reports, feature requests, contributions and similar to
+the [GitHub issue tracker](https://github.com/mmottl/pcre-ocaml/issues).
 
-Markus Mottl on July 10, 2012
+Up-to-date information is available at: <https://mmottl.github.io/pcre-ocaml>
diff --git a/_oasis b/_oasis
diff --git a/_opam b/_opam
diff --git a/_tags b/_tags
diff --git a/configure b/configure
diff --git a/doc/api.odocl b/doc/api.odocl
@@ -0,0 +1 @@
+src/Pcre