Skip to content

Commit

Permalink
Merge pull request xapi-project#7 from jonludlam/oasis-and-0.9.5
Browse files Browse the repository at this point in the history
Use oasis rather than obuild
  • Loading branch information
Jon Ludlam committed May 31, 2014
2 parents 68c033c + b5f6731 commit e1720fc
Show file tree
Hide file tree
Showing 11 changed files with 7,603 additions and 31 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
0.9.5 (30-May-2014):
* Update to stdext 0.11.0
* Use oasis rather than obuild

0.9.4 (8-May-2014):
* add list_domains

Expand Down
43 changes: 32 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,17 +1,38 @@
dist/build/lib-xenops/xenops.cmxa dist/build/list_domains/list_domains:
obuild configure
obuild build
.PHONY: all clean install build
all: build doc

BINDIR?=/usr/sbin
NAME=xenops
J=4

install:
ocamlfind install xenops src/META $(wildcard dist/build/lib-xenops/*)
install -m 755 dist/build/list_domains/list_domains ${BINDIR}
export OCAMLRUNPARAM=b

setup.bin: setup.ml
@ocamlopt.opt -o $@ $< || ocamlopt -o $@ $< || ocamlc -o $@ $<
@rm -f setup.cmx setup.cmi setup.o setup.cmo

setup.data: setup.bin
@./setup.bin -configure --enable-tests

build: setup.data setup.bin
@./setup.bin -build -j $(J)

doc: setup.data setup.bin
@./setup.bin -doc -j $(J)

install: setup.bin
install -m 755 list_domains.native ${BINDIR}/list_domains
@./setup.bin -install

uninstall:
ocamlfind remove xenops
rm -f ${BINDIR}/list_domains
@ocamlfind remove $(NAME) || true

test: setup.bin build
@./setup.bin -test

reinstall: setup.bin
@ocamlfind remove $(NAME) || true
@./setup.bin -reinstall

.PHONY: clean
clean:
rm -rf dist
@ocamlbuild -clean
@rm -f setup.data setup.log setup.bin
29 changes: 29 additions & 0 deletions _oasis
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
OASISFormat: 0.3
Name: xenops
Version: 0.9.5
Synopsis: Various Xen operations
Authors: Vincent Hanquez, Dave Scott, Jon Ludlam
License: LGPL-2.1 with OCaml linking exception
Plugins: META (0.3)
BuildTools: ocamlbuild

Library xenops
CompiledObject: best
Path: src
Findlibname: xenops
Modules: Io, Memory, Netman, Statdev, Xenops_helpers, Xenstore_watch
ByteOpt: -bin-annot
NativeOpt: -bin-annot
BuildDepends: xcp, xenctrl, xenstore, xenstore_transport.unix, uuid, xenstore-compat, threads
CSources: statdev_stubs.c
CCOpt: -Wno-unused-function -g -ggdb

Executable list_domains
CompiledObject: best
Path: list_domains
MainIs: list_domains.ml
Install: true
ByteOpt: -bin-annot
NativeOpt: -bin-annot
BuildDepends: xenops

62 changes: 62 additions & 0 deletions _tags
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
# OASIS_START
# DO NOT EDIT (digest: 33f67f16939a16d6c4a3bab07a5863cb)
# Ignore VCS directories, you can use the same kind of rule outside
# OASIS_START/STOP if you want to exclude directories that contains
# useless stuff for the build process
<**/.svn>: -traverse
<**/.svn>: not_hygienic
".bzr": -traverse
".bzr": not_hygienic
".hg": -traverse
".hg": not_hygienic
".git": -traverse
".git": not_hygienic
"_darcs": -traverse
"_darcs": not_hygienic
# Library xenops
"src/xenops.cmxs": use_xenops
<src/*.ml{,i}>: oasis_library_xenops_ccopt
"src/statdev_stubs.c": oasis_library_xenops_ccopt
<src/xenops.{cma,cmxa}>: oasis_library_xenops_byte
<src/*.ml{,i}>: oasis_library_xenops_byte
"src/statdev_stubs.c": oasis_library_xenops_byte
<src/xenops.{cma,cmxa}>: oasis_library_xenops_native
<src/*.ml{,i}>: oasis_library_xenops_native
"src/statdev_stubs.c": oasis_library_xenops_native
<src/xenops.{cma,cmxa}>: use_libxenops_stubs
<src/*.ml{,i}>: pkg_threads
<src/*.ml{,i}>: pkg_uuid
<src/*.ml{,i}>: pkg_xcp
<src/*.ml{,i}>: pkg_xenctrl
<src/*.ml{,i}>: pkg_xenstore
<src/*.ml{,i}>: pkg_xenstore-compat
<src/*.ml{,i}>: pkg_xenstore_transport.unix
"src/statdev_stubs.c": pkg_threads
"src/statdev_stubs.c": pkg_uuid
"src/statdev_stubs.c": pkg_xcp
"src/statdev_stubs.c": pkg_xenctrl
"src/statdev_stubs.c": pkg_xenstore
"src/statdev_stubs.c": pkg_xenstore-compat
"src/statdev_stubs.c": pkg_xenstore_transport.unix
# Executable list_domains
<list_domains/list_domains.{native,byte}>: oasis_executable_list_domains_byte
<list_domains/*.ml{,i}>: oasis_executable_list_domains_byte
<list_domains/list_domains.{native,byte}>: oasis_executable_list_domains_native
<list_domains/*.ml{,i}>: oasis_executable_list_domains_native
<list_domains/list_domains.{native,byte}>: pkg_threads
<list_domains/list_domains.{native,byte}>: pkg_uuid
<list_domains/list_domains.{native,byte}>: pkg_xcp
<list_domains/list_domains.{native,byte}>: pkg_xenctrl
<list_domains/list_domains.{native,byte}>: pkg_xenstore
<list_domains/list_domains.{native,byte}>: pkg_xenstore-compat
<list_domains/list_domains.{native,byte}>: pkg_xenstore_transport.unix
<list_domains/list_domains.{native,byte}>: use_xenops
<list_domains/*.ml{,i}>: pkg_threads
<list_domains/*.ml{,i}>: pkg_uuid
<list_domains/*.ml{,i}>: pkg_xcp
<list_domains/*.ml{,i}>: pkg_xenctrl
<list_domains/*.ml{,i}>: pkg_xenstore
<list_domains/*.ml{,i}>: pkg_xenstore-compat
<list_domains/*.ml{,i}>: pkg_xenstore_transport.unix
<list_domains/*.ml{,i}>: use_xenops
# OASIS_STOP
Loading

0 comments on commit e1720fc

Please sign in to comment.