Skip to content

Commit b83fe27

Browse files
committed
Merge pull request #5 from djs55/release.0.1.1
Release 0.1.1
2 parents c4ab26a + 06efe3e commit b83fe27

File tree

5 files changed

+53
-3
lines changed

5 files changed

+53
-3
lines changed

Diff for: .travis-ci.sh

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
OPAM_DEPENDS="xapi-idl async async_inotify core message-switch xapi-storage"
2+
case "$OCAML_VERSION,$OPAM_VERSION" in
3+
3.12.1,1.0.0) ppa=avsm/ocaml312+opam10 ;;
4+
3.12.1,1.1.0) ppa=avsm/ocaml312+opam11 ;;
5+
4.00.1,1.0.0) ppa=avsm/ocaml40+opam10 ;;
6+
4.00.1,1.1.0) ppa=avsm/ocaml40+opam11 ;;
7+
4.01.0,1.0.0) ppa=avsm/ocaml41+opam10 ;;
8+
4.01.0,1.1.0) ppa=avsm/ocaml41+opam11 ;;
9+
*) echo Unknown $OCAML_VERSION,$OPAM_VERSION; exit 1 ;;
10+
esac
11+
12+
echo "yes" | sudo add-apt-repository ppa:$ppa
13+
sudo apt-get update -qq
14+
sudo apt-get install -qq ocaml ocaml-native-compilers camlp4-extra opam
15+
16+
export OPAMYES=1
17+
#export OPAMVERBOSE=1
18+
echo OCaml version
19+
ocaml -version
20+
echo OPAM versions
21+
opam --version
22+
opam --git-version
23+
24+
opam init
25+
# ocamlscript doesn't read .ocamlinit so the ocamlfind opam workaround breaks.
26+
# This is a workaround workaround:
27+
opam install ocamlfind
28+
sudo mkdir -p $(ocamlc -where)
29+
eval `opam config env`
30+
sudo cp $OCAML_TOPLEVEL_PATH/topfind $(ocamlc -where)
31+
32+
opam remote add xapi git://github.com/xapi-project/opam-repo-dev
33+
depext=`opam install -e ubuntu $OPAM_DEPENDS`
34+
sudo apt-get install -qq $depext
35+
opam install ${OPAM_DEPENDS}
36+
eval `opam config env`
37+
make
38+
echo Running make test
39+
make test

Diff for: .travis.yml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
language: c
2+
script: bash -ex .travis-ci.sh
3+
env:
4+
- OCAML_VERSION=4.01.0 OPAM_VERSION=1.1.0

Diff for: CHANGES

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
1-
trunk (unreleased)
1+
0.1.1 (17-Oct-2014)
2+
- Now daemonizes properly
3+
- Logs to syslog
24

5+
0.1 (16-Oct-2014)
6+
- Initial version

Diff for: Makefile

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
BINDIR?=/tmp/
22
MANDIR?=/tmp/
33

4-
.PHONY: install uninstall clean
4+
.PHONY: install uninstall clean test
55

66
all: main.native main.1
77

@@ -26,5 +26,8 @@ uninstall:
2626
rm -f ${BINDIR}/xapi-script-storage
2727
rm -f ${MANDIR}/man1/xapi-script-storage.1
2828

29+
test:
30+
@echo No tests implemented yet
31+
2932
clean:
3033
rm -rf _build setup.data main.1 version.ml

Diff for: VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1
1+
0.1.1

0 commit comments

Comments
 (0)