diff --git a/.travis-ci.sh b/.travis-ci.sh deleted file mode 100755 index 2894411..0000000 --- a/.travis-ci.sh +++ /dev/null @@ -1,30 +0,0 @@ -OPAM_DEPENDS="lwt cstruct shared-memory-ring mirage ounit io-page mirage-types mirage-xen xen-evtchn xen-gnt xenstore" - -case "$OCAML_VERSION,$OPAM_VERSION" in -3.12.1,1.0.0) ppa=avsm/ocaml312+opam10 ;; -3.12.1,1.1.0) ppa=avsm/ocaml312+opam11 ;; -4.00.1,1.0.0) ppa=avsm/ocaml40+opam10 ;; -4.00.1,1.1.0) ppa=avsm/ocaml40+opam11 ;; -4.01.0,1.0.0) ppa=avsm/ocaml41+opam10 ;; -4.01.0,1.1.0) ppa=avsm/ocaml41+opam11 ;; -*) echo Unknown $OCAML_VERSION,$OPAM_VERSION; exit 1 ;; -esac - -echo "yes" | sudo add-apt-repository ppa:$ppa -sudo apt-get update -qq -sudo apt-get install -qq ocaml ocaml-native-compilers camlp4-extra opam - -export OPAMYES=1 -export OPAMVERBOSE=1 -echo OCaml version -ocaml -version -echo OPAM versions -opam --version -opam --git-version - -opam init -depext=`opam install -e ubuntu $OPAM_DEPENDS` -sudo apt-get install -qq $depext -opam install ${OPAM_DEPENDS} -eval `opam config env` -make diff --git a/.travis.yml b/.travis.yml index 9a057c8..58db337 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: c -script: bash -ex .travis-ci.sh +install: wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-opam.sh +script: bash -ex .travis-opam.sh env: - - OCAML_VERSION=4.01.0 OPAM_VERSION=1.1.0 - - OCAML_VERSION=4.00.1 OPAM_VERSION=1.1.0 + - OCAML_VERSION=4.01.0 OPAM_VERSION=1.2.0 + - OCAML_VERSION=4.00.1 OPAM_VERSION=1.2.0 diff --git a/opam b/opam new file mode 100644 index 0000000..0c81513 --- /dev/null +++ b/opam @@ -0,0 +1,25 @@ +opam-version: "1" +maintainer: "dave@recoil.org" + +tags: [ + "org:mirage" + "org:xapi-project" +] +build: [ + [make] + [make "install" "BINDIR=%{bin}%"] +] +remove: [[make "uninstall" "BINDIR=%{bin}%"]] +depends: [ + "ocamlfind" + "cmdliner" + "lwt" {>= "2.4.3"} + "cstruct" {>= "1.0.1"} + "shared-memory-ring" {>= "0.4.1"} + "mirage-types" {>= "1.1.0"} + "ipaddr" + "io-page" {>= "1.0.0" & < "1.3.0"} + "mirage-xen" {>= "1.0.1" } +] +ocaml-version: [>= "4.00.0"] +os: ["linux"]