Merge pull request #8 from avsm/rel-0.3

release 0.3

CHANGES.md

@@ -1,10 +1,14 @@
-v0.2 (2017-05-18)
+## v0.3 2017-07-03
+
+- Build tweaks to support topkg versioning (@avsm)
+
+## v0.2 2017-05-18
+
 - add example program and update README
 - switch to jbuilder
 - throw a clearer error on registering a duplicate metric
 - use `Re` rather than `Str`
 
-v0.1
-----
+## v0.1
 
-Initial release.
+- Initial release.

Makefile

@@ -1,21 +1,32 @@
-PINOPTS=-y -k git
 
-TESTS = true
+.PHONY: build clean test
 
-.PHONY: all clean prometheus
+build:
+	jbuilder build @install
 
-all: prometheus prometheus-app
-	@
+test:
+	jbuilder runtest
 
-depends:
-	opam pin add ${PINOPTS} prometheus .
-	opam pin add ${PINOPTS} prometheus-app .
+install:
+	jbuilder install
 
-prometheus-app:
-	jbuilder build @runtest
-
-prometheus:
-	jbuilder build --only-packages prometheus
+uninstall:
+	jbuilder uninstall
 
 clean:
-	rm -rf _build
+	rm -rf _build *.install
+
+REPO=../../mirage/opam-repository
+PACKAGES=$(REPO)/packages
+# until we have https://github.com/ocaml/opam-publish/issues/38
+pkg-%:
+	topkg opam pkg -n $*
+	mkdir -p $(PACKAGES)/$*
+	cp -r _build/$*.* $(PACKAGES)/$*/
+	cd $(PACKAGES) && git add $*
+
+PKGS=$(basename $(wildcard *.opam))
+opam-pkg:
+	$(MAKE) $(PKGS:%=pkg-%)
+
+

pkg/pkg.ml

@@ -0,0 +1,3 @@
+#!/usr/bin/env ocaml
+#use "topfind"
+#require "topkg-jbuilder.auto"

prometheus-app.opam

@@ -8,20 +8,20 @@ dev-repo:     "https://github.com/mirage/prometheus.git"
 doc:          "https://mirage.github.io/prometheus/"
 
 build: [
-  [ "jbuilder" "build" "--only-packages=prometheus,prometheus-app" ]
+  [ "jbuilder" "subst" ] {pinned}
+  [ "jbuilder" "build" "-p" name "-j" jobs ]
 ]
 
 build-test: [
-  [ "jbuilder" "runtest" ]
+  [ "jbuilder" "runtest" "-p" name "-j" jobs ]
 ]
 
 depends: [
-  "ocamlfind" {build}
-  "jbuilder"  {build}
+  "jbuilder"  {build & >="1.0+beta10"}
   "prometheus"
   "fmt"
   "re"
-  "cohttp" {>="0.20.0"}
+  "cohttp" {>="0.20.0" & <"0.99"}
   "lwt" {>="2.5.0"}
   "alcotest" {test}
 ]

prometheus.opam

@@ -8,12 +8,12 @@ dev-repo:     "https://github.com/mirage/prometheus.git"
 doc:          "https://mirage.github.io/prometheus/"
 
 build: [
-  [ "jbuilder" "build" "--only-packages=prometheus" ]
+  [ "jbuilder" "subst" ] {pinned}
+  [ "jbuilder" "build" "-p" name "-j" jobs ]
 ]
 
 depends: [
-  "ocamlfind" {build}
-  "jbuilder"  {build}
+  "jbuilder"  {build & >="1.0+beta10"}
   "astring"
   "asetmap"
   "fmt"