Port to jbuilder

.gitignore

@@ -1,8 +1,4 @@
 _build
-src/unix/lwt_config.ml
-src/unix/lwt_config.h
-src/unix/lwt_unix_jobs_generated.ml
-src/unix/jobs-unix/
 setup.data
 setup.log
 setup.exe
@@ -15,3 +11,7 @@ _coverage/
 
 # For local work, tests, etc.
 scratch/
+
+.merlin
+*.install
+

.travis.yml

@@ -8,8 +8,8 @@ matrix:
       env: COMPILER=4.03
     - os: linux
       env: COMPILER=4.04
-    - os: linux
-      env: COMPILER=4.05
+    #- os: linux
+    #  env: COMPILER=4.05
     - os: linux
       env: COMPILER=4.04 FLAMBDA=yes
     - os: linux

Makefile

@@ -9,70 +9,60 @@
 OCAMLFIND_IGNORE_DUPS_IN = $(shell ocamlfind query compiler-libs)
 export OCAMLFIND_IGNORE_DUPS_IN
 
-# Set to setup.exe for the release
-SETUP := setup-dev.exe
-
 # Default rule
 default: build
 
-# Setup for the development version
-setup-dev.exe: _oasis setup.ml
-	grep -v '^#' setup.ml > setup_dev.ml
-	ocamlfind ocamlopt -o $@ -linkpkg -package ocamlbuild,oasis.dynrun setup_dev.ml || \
-	  ocamlfind ocamlc -o $@ -linkpkg -package ocamlbuild,oasis.dynrun setup_dev.ml || true
-	rm -f setup_dev.*
-
-# Setup for the release
-setup.exe: setup.ml
-	ocamlopt.opt -o $@ $< || ocamlopt -o $@ $< || ocamlc -o $@ $<
-	rm -f setup.cmx setup.cmi setup.o setup.obj setup.cmo
-
-setup: $(SETUP)
+# build the usual development packages
+build: 
+	jbuilder build \
+		--only-packages lwt \
+		@install
 
-build: $(SETUP) setup.data
-	./$(SETUP) -build $(BUILDFLAGS)
+# build everything
+all: 
+	jbuilder build @install
 
-doc: $(SETUP) setup.data build
-	./$(SETUP) -doc $(DOCFLAGS)
+# run all tests
+test: 
+	jbuilder runtest
 
-doc-api: $(SETUP) setup.data build
-	./$(SETUP) -build lwt-api.docdir/index.html
+# Use jbuilder/odoc to generate static html documentation.
+# Currenty requires ocaml 4.03.0 to install odoc.
+doc:
+	jbuilder build @doc
 
-test: $(SETUP) setup.data build clean-coverage
-	./$(SETUP) -test $(TESTFLAGS)
+# Build HTML documentation with ocamldoc
+doc-api-html: all
+	make -C doc api/html/index.html
 
-all: $(SETUP)
-	./$(SETUP) -all $(ALLFLAGS)
+# Build wiki documentation with wikidoc
+# requires ocaml 4.03.0 and pinning the repo
+# https://github.com/ocsigen/wikidoc
+doc-api-wiki: all
+	make -C doc api/wiki/index.wiki
 
-install: $(SETUP) setup.data
-	./$(SETUP) -install $(INSTALLFLAGS)
+install: 
+	jbuilder install
 
-uninstall: $(SETUP) setup.data
-	./$(SETUP) -uninstall $(UNINSTALLFLAGS)
+uninstall: 
+	jbuilder uninstall
 
-reinstall: $(SETUP) setup.data
-	./$(SETUP) -reinstall $(REINSTALLFLAGS)
+reinstall: 
+	jbuilder uninstall
+	jbuilder install
 
-clean: $(SETUP) clean-coverage
-	./$(SETUP) -clean $(CLEANFLAGS)
-
-distclean: $(SETUP)
-	./$(SETUP) -distclean $(DISTCLEANFLAGS)
-	rm -rf setup*.exe
+clean: 
+	rm -fr _build
+	rm -f *.install
+	rm -fr doc/api
 
 clean-coverage:
 	rm -rf bisect*.out
 	rm -rf _coverage/
 
-configure: $(SETUP)
-	./$(SETUP) -configure $(CONFIGUREFLAGS)
-
-setup.data: $(SETUP)
-	./$(SETUP) -configure $(CONFIGUREFLAGS)
-
 coverage: test
 	bisect-ppx-report -I _build/ -html _coverage/ bisect*.out
 	bisect-ppx-report -text - -summary-only bisect*.out
 	@echo See _coverage/index.html
 
-.PHONY: default setup build doc test all install uninstall reinstall clean distclean configure coverage
+.PHONY: default build doc test all install uninstall reinstall clean coverage

README.md

@@ -119,7 +119,7 @@ version,
 opam source --dev-repo --pin lwt
 ```
 
-This will also install the development dependency OASIS.
+This will also install the development dependency jbuilder.
 
 A list of [project suggestions][projects] and a [roadmap][roadmap] can be found
 on the wiki.

TODO.jbuild

@@ -0,0 +1,10 @@
+- Internal modules exposed in lwt-unit
+
+- lwt-unix configuration params passed to discover.exe;
+  - use_libev (currently forced to true)
+    - how do we depend on an external opam package with no findlib library?
+  - android-target?
+
+- multi-workspace builds dont work
+  - jbuilder build --workspace jbuild-workspace.dev @install @runtest --only-packages lwt
+  - problem with ppx