Switched to jbuilder and topkg

mmottl · Aug 2, 2017 · 7d097d5 · 7d097d5
1 parent b1f4981
commit 7d097d5
Show file tree

Hide file tree

Showing 27 changed files with 605 additions and 8,980 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,4 @@
-_build
-API.docdir
-*.bak
 .*.swp
-setup.data
-setup.log
-*.byte
-*.native
+.merlin
+*.install
+_build
diff --git a/.merlin b/.merlin
diff --git a/AUTHORS.txt b/AUTHORS.txt
diff --git a/CHANGES.md b/CHANGES.md
@@ -0,0 +1,3 @@
+### 4.0.0 (2017-08-02)
+
+  * 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/_oasis b/_oasis
diff --git a/_tags b/_tags
diff --git a/configure b/configure
diff --git a/API.odocl → doc/api.odocl b/API.odocl → doc/api.odocl
@@ -1,10 +1,7 @@
-# OASIS_START
-# DO NOT EDIT (digest: 981da3f26f04485b07c5affc8ade293a)
 src/Display_hasse_impl
 src/Display_hasse_intf
 src/Pomap_impl
 src/Pomap_intf
 src/Ptset
 src/Store_impl
 src/Store_intf
-# OASIS_STOP
diff --git a/examples/hasse/Makefile b/examples/hasse/Makefile
@@ -0,0 +1,10 @@
+TARGETS = $(addsuffix .bc, hasse)
+
+.PHONY: all clean
+
+all:
+	@echo jbuilder: Entering directory \`$(abspath $(dir $(lastword $(PWD))))\'
+	@jbuilder build --dev $(TARGETS)
+
+clean:
+	@jbuilder clean
diff --git a/examples/hasse/hasse.ml b/examples/hasse/hasse.ml
@@ -22,6 +22,7 @@
 
 open Format
 open Po_examples
+open Pomap
 
 (* Parse arguments *)
 let n, len, choices =

diff --git a/examples/hasse/jbuild b/examples/hasse/jbuild
@@ -0,0 +1,12 @@
+(jbuild_version 1)
+
+(executables (
+  (names (hasse))
+  (flags (
+    :standard
+    -w -9
+    -safe-string -strict-sequence
+    -principal -short-paths
+  ))
+  (libraries (pomap))
+))
diff --git a/jbuild-workspace b/jbuild-workspace
@@ -0,0 +1 @@
+(context default)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		### 4.0.0 (2017-08-02)

		* Switched to jbuilder and topkg