diff --git a/.travis-ci.sh b/.travis-ci.sh new file mode 100755 index 0000000..2be6255 --- /dev/null +++ b/.travis-ci.sh @@ -0,0 +1,39 @@ +OPAM_DEPENDS="xapi-idl async async_inotify core message-switch xapi-storage" +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 +# ocamlscript doesn't read .ocamlinit so the ocamlfind opam workaround breaks. +# This is a workaround workaround: +opam install ocamlfind +sudo mkdir -p $(ocamlc -where) +eval `opam config env` +sudo cp $OCAML_TOPLEVEL_PATH/topfind $(ocamlc -where) + +opam remote add xapi git://github.com/xapi-project/opam-repo-dev +depext=`opam install -e ubuntu $OPAM_DEPENDS` +sudo apt-get install -qq $depext +opam install ${OPAM_DEPENDS} +eval `opam config env` +make +echo Running make test +make test diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..1957db9 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,4 @@ +language: c +script: bash -ex .travis-ci.sh +env: + - OCAML_VERSION=4.01.0 OPAM_VERSION=1.1.0 diff --git a/CHANGES b/CHANGES index 4add22f..23fbffc 100644 --- a/CHANGES +++ b/CHANGES @@ -1,2 +1,6 @@ -trunk (unreleased) +0.1.1 (17-Oct-2014) +- Now daemonizes properly +- Logs to syslog +0.1 (16-Oct-2014) +- Initial version diff --git a/Makefile b/Makefile index cc9dff5..8699133 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ BINDIR?=/tmp/ MANDIR?=/tmp/ -.PHONY: install uninstall clean +.PHONY: install uninstall clean test all: main.native main.1 @@ -26,5 +26,8 @@ uninstall: rm -f ${BINDIR}/xapi-script-storage rm -f ${MANDIR}/man1/xapi-script-storage.1 +test: + @echo No tests implemented yet + clean: rm -rf _build setup.data main.1 version.ml diff --git a/VERSION b/VERSION index 49d5957..17e51c3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1 +0.1.1