Merge pull request #128 from djs55/io-page

Add dependency on io-page-unix
mirage · Jun 17, 2017 · 6dc755e · 6dc755e
2 parents f221e57 + 2817b0d
commit 6dc755e
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 39 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,13 @@
 language: c
-install:
-  - wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-opam.sh
-script: bash -ex .travis-opam.sh
-sudo: required
+sudo: false
+services:
+  - docker
+install: wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-docker.sh
+script: bash -ex ./.travis-docker.sh
 env:
   global:
-    - PACKAGE="protocol-9p-unix"
-    - OCAML_VERSION=4.03
-    - DEPOPTS="named-pipe"
+  - PINS="protocol-9p:. protocol-9p-tool:. protocol-9p-unix:."
+  matrix:
+  - PACKAGE="protocol-9p" DISTRO="alpine-3.5" OCAML_VERSION="4.03.0"
+  - PACKAGE="protocol-9p-unix" DISTRO="alpine-3.5" OCAML_VERSION="4.03.0"
+  - PACKAGE="protocol-9p-tool" DISTRO="alpine-3.5" OCAML_VERSION="4.03.0"
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,7 @@
+## v0.11.2 (2016-06-17)
+* Add dependency on io-page-unix
+* Modernise travis and appveyor
+
 ## v0.11.1 (2017-06-07)
 * Protect Flow_lwt_unix.write against End_of_file exceptions
 * Add topkg-jbuilder support

diff --git a/appveyor.yml b/appveyor.yml
@@ -2,15 +2,14 @@ platform:
   - x86
 
 environment:
-  CYG_ROOT: "C:\\cygwin"
-  CYG_BASH: "%CYG_ROOT%\\bin\\bash -lc"
-  PACKAGE: "protocol-9p-unix"
-  PINS: "prometheus:https://github.com/mirage/prometheus.git"
+  FORK_USER: ocaml
+  FORK_BRANCH: master
+  PINS: "protocol-9p:. protocol-9p-tool:. protocol-9p-unix:."
+  PACKAGE: protocol-9p-unix
+  CYG_ROOT: C:\cygwin64
 
 install:
-  - appveyor DownloadFile https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/appveyor-opam.sh
-  - "%CYG_ROOT%\\setup-x86.exe -qnNdO -R %CYG_ROOT% -s http://cygwin.mirror.constant.com -l C:/cygwin/var/cache/setup -P rsync -P patch -P make -P git -P perl -P mingw64-x86_64-gcc-core"
-  - curl -L -o C:/cygwin/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.5/jq-win32.exe
+  - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/$env:FORK_USER/ocaml-ci-scripts/$env:FORK_BRANCH/appveyor-install.ps1"))
 
 build_script:
-  - "%CYG_BASH% '${APPVEYOR_BUILD_FOLDER}/appveyor-opam.sh'"
+  - call %CYG_ROOT%\bin\bash.exe -l %APPVEYOR_BUILD_FOLDER%\appveyor-opam.sh
diff --git a/lib/jbuild b/lib/jbuild
@@ -1,6 +1,8 @@
+(jbuild_version 1)
+
 (library
  ((name        protocol_9p)
   (public_name protocol-9p)
-  (libraries   (result rresult cstruct cstruct.lwt sexplib lwt mirage-flow-lwt mirage-channel-lwt mirage-kv-lwt astring fmt))
+  (libraries   (result rresult cstruct cstruct-lwt sexplib lwt mirage-flow-lwt mirage-channel-lwt mirage-kv-lwt astring fmt))
   (preprocess (pps (ppx_sexp_conv)))
 ))
diff --git a/lib_test/jbuild b/lib_test/jbuild
@@ -1,6 +1,8 @@
+(jbuild_version 1)
+
 (executables
  ((names (lofs_test tests))
-  (libraries (result cstruct alcotest lwt cstruct.lwt logs.fmt astring
+  (libraries (result cstruct alcotest lwt cstruct-lwt logs.fmt astring
               named-pipe.lwt mirage-flow-lwt mirage-kv-lwt mirage-channel-lwt
               protocol-9p protocol-9p-unix))
 ))

diff --git a/protocol-9p-tool.opam b/protocol-9p-tool.opam
@@ -8,10 +8,11 @@ bug-reports:  "https://github.com/mirage/ocaml-9p/issues"
 doc:          "https://mirage.github.io/ocaml-9p/"
 
 build: [
-  [ "jbuilder" "build" "--only-packages=protocol-9p-unix,protocol-9p,protocol-9p-tool" ]
+  ["jbuilder" "subst" "-p" name "--name" name] {pinned}
+  ["jbuilder" "build" "-p" name "-j" jobs]
 ]
-
 depends: [
+  "jbuilder" {build & >="1.0+beta7"}
   "protocol-9p"
   "protocol-9p-unix"
   "base-bytes"
@@ -24,7 +25,5 @@ depends: [
   "win-error"
   "cmdliner"
   "io-page"
-  "ocamlfind" {build}
-  "jbuilder" {build}
 ]
 available: [ocaml-version >= "4.03.0"]
diff --git a/protocol-9p-unix.opam b/protocol-9p-unix.opam
@@ -8,14 +8,11 @@ bug-reports:  "https://github.com/mirage/ocaml-9p/issues"
 doc:          "https://mirage.github.io/ocaml-9p/"
 
 build: [
-  [ "jbuilder" "build" "--only-packages=protocol-9p-unix,protocol-9p" ]
+  ["jbuilder" "subst" "-p" name "--name" name] {pinned}
+  ["jbuilder" "build" "-p" name "-j" jobs]
 ]
-
-build-test: [
-  [ "jbuilder" "runtest" ]
-]
-
 depends: [
+  "jbuilder" {build & >="1.0+beta7"}
   "protocol-9p"
   "base-bytes"
   "cstruct" {>= "1.9.0"}
@@ -36,8 +33,6 @@ depends: [
   "win-error"
   "ppx_deriving" {build}
   "ppx_sexp_conv" {build}
-  "ocamlfind" {build}
-  "jbuilder" {build}
   "ppx_tools" {build}
   "alcotest" {test & >= "0.4.0"}
 ]

diff --git a/protocol-9p.opam b/protocol-9p.opam
@@ -8,16 +8,14 @@ bug-reports:  "https://github.com/mirage/ocaml-9p/issues"
 doc:          "https://mirage.github.io/ocaml-9p/"
 
 build: [
-  [ "jbuilder" "build" "--only-packages=protocol-9p" ]
+  ["jbuilder" "subst" "-p" name "--name" name] {pinned}
+  ["jbuilder" "build" "-p" name "-j" jobs]
 ]
-
-build-test: [
-  [ "jbuilder" "runtest" ]
-]
-
 depends: [
+  "jbuilder" {build & >="1.0+beta7"}
   "base-bytes"
   "cstruct" {>= "1.9.0"}
+  "cstruct-lwt"
   "sexplib" {> "113.00.00" }
   "result"
   "rresult"
@@ -34,8 +32,6 @@ depends: [
   "win-error"
   "ppx_deriving" {build}
   "ppx_sexp_conv" {build}
-  "ocamlfind" {build}
-  "jbuilder" {build}
   "ppx_tools" {build}
   "alcotest" {test & >= "0.4.0"}
 ]

diff --git a/src/jbuild b/src/jbuild
@@ -1,6 +1,8 @@
+(jbuild_version 1)
+
 (executables
  ((names (main))
-  (libraries (protocol_9p protocol_9p_unix logs logs.fmt rresult win-error
+  (libraries (protocol-9p protocol-9p-unix logs logs.fmt rresult win-error
               lambda-term cmdliner))))
 
 (install

diff --git a/unix/jbuild b/unix/jbuild
@@ -1,6 +1,8 @@
+(jbuild_version 1)
+
 (library
  ((name        protocol_9p_unix)
   (public_name protocol-9p-unix)
   (libraries   (result fmt lwt mirage-flow-lwt cstruct astring named-pipe.lwt
-                protocol_9p io-page.unix prometheus))
+                protocol-9p io-page.unix prometheus))
 ))