Skip to content

Commit

Permalink
More messing with the build
Browse files Browse the repository at this point in the history
  • Loading branch information
David Scott committed Aug 21, 2012
1 parent a081849 commit 7412878
Show file tree
Hide file tree
Showing 5 changed files with 3,209 additions and 2,517 deletions.
2 changes: 1 addition & 1 deletion _oasis
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Library xenstore_unix
Modules: Xs_transport_unix, Xs_transport_xen, Xenstore
BuildDepends: lwt, xenstore, xenstore.server
CSources: xenstore_stubs.c
CCOpt: -I. -I/home/djs/.opam/system/lib -I/home/djs/.opam/system/lib/lwt
CCOpt: -I. -I/home/djs/.opam/system/lib -I/home/djs/.opam/system/lib/lwt -I/usr/lib/ocaml/lwt
CClib: -lxenctrl

Library xenstore_server
Expand Down
123 changes: 68 additions & 55 deletions _tags
View file
Original file line number Diff line number Diff line change
@@ -1,123 +1,136 @@
# OASIS_START
# DO NOT EDIT (digest: 72a6696e28350e9768355f1ca9bae699)
# DO NOT EDIT (digest: a9b095c2d6fc60318b2a148fa07d1688)
# 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 xenstore
"core": include
"core/xenstore.cmxs": use_xenstore
<core/*.ml{,i}>: pkg_lwt
<core/*.ml{,i}>: pkg_cstruct.syntax
<core/*.ml{,i}>: pkg_cstruct
<core/*.ml{,i}>: pkg_cstruct.syntax
# Library xenstore_client
"client/xenstore_client.cmxs": use_xenstore_client
<client/*.ml{,i}>: use_xenstore
<client/*.ml{,i}>: pkg_lwt
<client/*.ml{,i}>: pkg_cstruct
<client/*.ml{,i}>: pkg_cstruct.syntax
# Library xenstore_server
"server": include
"server/xenstore_server.cmxs": use_xenstore_server
<server/*.ml{,i}>: use_xenstore
<server/*.ml{,i}>: pkg_lwt
<server/*.ml{,i}>: pkg_cstruct.syntax
<server/*.ml{,i}>: pkg_cstruct
<server/*.ml{,i}>: pkg_cstruct.syntax
# Library xenstore_unix
"unix": include
"unix/xenstore_unix.cmxs": use_xenstore_unix
<unix/*.ml{,i}>: oasis_library_xenstore_unix_ccopt
"unix/xenstore_stubs.c": oasis_library_xenstore_unix_ccopt
<unix/xenstore_unix.{cma,cmxa}>: oasis_library_xenstore_unix_cclib
"unix/libxenstore_unix.lib": oasis_library_xenstore_unix_cclib
"unix/dllxenstore_unix.dll": oasis_library_xenstore_unix_cclib
"unix/libxenstore_unix.a": oasis_library_xenstore_unix_cclib
"unix/dllxenstore_unix.so": oasis_library_xenstore_unix_cclib
<unix/xenstore_unix.{cma,cmxa}>: use_libxenstore_unix
"unix/libxenstore_unix_stubs.lib": oasis_library_xenstore_unix_cclib
"unix/dllxenstore_unix_stubs.dll": oasis_library_xenstore_unix_cclib
"unix/libxenstore_unix_stubs.a": oasis_library_xenstore_unix_cclib
"unix/dllxenstore_unix_stubs.so": oasis_library_xenstore_unix_cclib
<unix/xenstore_unix.{cma,cmxa}>: use_libxenstore_unix_stubs
<unix/*.ml{,i}>: use_xenstore_server
<unix/*.ml{,i}>: use_xenstore
<unix/*.ml{,i}>: pkg_lwt
<unix/*.ml{,i}>: pkg_cstruct.syntax
<unix/*.ml{,i}>: pkg_cstruct
<unix/*.ml{,i}>: pkg_cstruct.syntax
"unix/xenstore_stubs.c": use_xenstore_server
"unix/xenstore_stubs.c": use_xenstore
"unix/xenstore_stubs.c": pkg_lwt
"unix/xenstore_stubs.c": pkg_cstruct.syntax
"unix/xenstore_stubs.c": pkg_cstruct
# Library xenstore_client
"client": include
<client/*.ml{,i}>: use_xenstore
<client/*.ml{,i}>: pkg_lwt
<client/*.ml{,i}>: pkg_cstruct.syntax
<client/*.ml{,i}>: pkg_cstruct
"unix/xenstore_stubs.c": pkg_cstruct.syntax
# Executable xs_test
<lib_test/xs_test.{native,byte}>: use_xenstore
<lib_test/xs_test.{native,byte}>: pkg_lwt
<lib_test/xs_test.{native,byte}>: pkg_lwt.unix
<lib_test/xs_test.{native,byte}>: pkg_oUnit
<lib_test/xs_test.{native,byte}>: pkg_cstruct
<lib_test/xs_test.{native,byte}>: pkg_cstruct.syntax
<lib_test/*.ml{,i}>: use_xenstore
<lib_test/*.ml{,i}>: pkg_lwt
<lib_test/*.ml{,i}>: pkg_lwt.unix
<lib_test/*.ml{,i}>: pkg_oUnit
<lib_test/*.ml{,i}>: pkg_cstruct
<lib_test/*.ml{,i}>: pkg_cstruct.syntax
<lib_test/xs_test.{native,byte}>: custom
# Executable server_test
<server_test/server_test.{native,byte}>: use_xenstore_server
<server_test/server_test.{native,byte}>: use_xenstore
<server_test/server_test.{native,byte}>: pkg_oUnit
<server_test/server_test.{native,byte}>: pkg_lwt.unix
<server_test/server_test.{native,byte}>: pkg_lwt
<server_test/server_test.{native,byte}>: pkg_cstruct.syntax
<server_test/server_test.{native,byte}>: pkg_lwt.unix
<server_test/server_test.{native,byte}>: pkg_oUnit
<server_test/server_test.{native,byte}>: pkg_cstruct
<server_test/server_test.{native,byte}>: pkg_cstruct.syntax
<server_test/*.ml{,i}>: use_xenstore_server
<server_test/*.ml{,i}>: use_xenstore
<server_test/*.ml{,i}>: pkg_oUnit
<server_test/*.ml{,i}>: pkg_lwt.unix
<server_test/*.ml{,i}>: pkg_lwt
<server_test/*.ml{,i}>: pkg_cstruct.syntax
<server_test/*.ml{,i}>: pkg_lwt.unix
<server_test/*.ml{,i}>: pkg_oUnit
<server_test/*.ml{,i}>: pkg_cstruct
<server_test/*.ml{,i}>: pkg_cstruct.syntax
<server_test/server_test.{native,byte}>: custom
# Executable server_unix
<server_unix/server_unix.{native,byte}>: use_xenstore_unix
<server_unix/server_unix.{native,byte}>: use_xenstore_server
<server_unix/server_unix.{native,byte}>: use_xenstore
<server_unix/server_unix.{native,byte}>: pkg_lwt.unix
<server_unix/server_unix.{native,byte}>: pkg_lwt
<server_unix/server_unix.{native,byte}>: pkg_cstruct.syntax
<server_unix/server_unix.{native,byte}>: pkg_lwt.unix
<server_unix/server_unix.{native,byte}>: pkg_cstruct
<server_unix/server_unix.{native,byte}>: pkg_cstruct.syntax
<server_unix/*.ml{,i}>: use_xenstore_unix
<server_unix/*.ml{,i}>: use_xenstore_server
<server_unix/*.ml{,i}>: use_xenstore
<server_unix/*.ml{,i}>: pkg_lwt.unix
<server_unix/*.ml{,i}>: pkg_lwt
<server_unix/*.ml{,i}>: pkg_cstruct.syntax
<server_unix/*.ml{,i}>: pkg_lwt.unix
<server_unix/*.ml{,i}>: pkg_cstruct
<server_unix/*.ml{,i}>: pkg_cstruct.syntax
<server_unix/server_unix.{native,byte}>: custom
# Executable xs
<cli/xs_client_cli.{native,byte}>: use_xenstore_client
<cli/xs_client_cli.{native,byte}>: use_xenstore_unix
<cli/xs_client_cli.{native,byte}>: use_xenstore_server
<cli/xs_client_cli.{native,byte}>: use_xenstore_client
<cli/xs_client_cli.{native,byte}>: use_xenstore
<cli/xs_client_cli.{native,byte}>: pkg_lwt.unix
<cli/xs_client_cli.{native,byte}>: pkg_lwt
<cli/xs_client_cli.{native,byte}>: pkg_cstruct.syntax
<cli/xs_client_cli.{native,byte}>: pkg_lwt.unix
<cli/xs_client_cli.{native,byte}>: pkg_cstruct
<cli/*.ml{,i}>: use_xenstore_client
<cli/xs_client_cli.{native,byte}>: pkg_cstruct.syntax
<cli/*.ml{,i}>: use_xenstore_unix
<cli/*.ml{,i}>: use_xenstore_server
<cli/*.ml{,i}>: use_xenstore_client
<cli/*.ml{,i}>: use_xenstore
<cli/*.ml{,i}>: pkg_lwt.unix
<cli/*.ml{,i}>: pkg_lwt
<cli/*.ml{,i}>: pkg_cstruct.syntax
<cli/*.ml{,i}>: pkg_lwt.unix
<cli/*.ml{,i}>: pkg_cstruct
<cli/*.ml{,i}>: pkg_cstruct.syntax
<cli/xs_client_cli.{native,byte}>: custom
# Executable xs_test
<lib_test/xs_test.{native,byte}>: use_xenstore
<lib_test/xs_test.{native,byte}>: pkg_oUnit
<lib_test/xs_test.{native,byte}>: pkg_lwt.unix
<lib_test/xs_test.{native,byte}>: pkg_lwt
<lib_test/xs_test.{native,byte}>: pkg_cstruct.syntax
<lib_test/xs_test.{native,byte}>: pkg_cstruct
<lib_test/*.ml{,i}>: use_xenstore
<lib_test/*.ml{,i}>: pkg_oUnit
<lib_test/*.ml{,i}>: pkg_lwt.unix
<lib_test/*.ml{,i}>: pkg_lwt
<lib_test/*.ml{,i}>: pkg_cstruct.syntax
<lib_test/*.ml{,i}>: pkg_cstruct
<lib_test/xs_test.{native,byte}>: custom
# Executable xsbench
<bench/xs_bench.{native,byte}>: use_xenstore_client
<bench/xs_bench.{native,byte}>: use_xenstore_unix
<bench/xs_bench.{native,byte}>: use_xenstore_server
<bench/xs_bench.{native,byte}>: use_xenstore_client
<bench/xs_bench.{native,byte}>: use_xenstore
<bench/xs_bench.{native,byte}>: pkg_lwt.unix
<bench/xs_bench.{native,byte}>: pkg_lwt
<bench/xs_bench.{native,byte}>: pkg_cstruct.syntax
<bench/xs_bench.{native,byte}>: pkg_lwt.unix
<bench/xs_bench.{native,byte}>: pkg_cstruct
<bench/*.ml{,i}>: use_xenstore_client
<bench/xs_bench.{native,byte}>: pkg_cstruct.syntax
<bench/*.ml{,i}>: use_xenstore_unix
<bench/*.ml{,i}>: use_xenstore_server
<bench/*.ml{,i}>: use_xenstore_client
<bench/*.ml{,i}>: use_xenstore
<bench/*.ml{,i}>: pkg_lwt.unix
<bench/*.ml{,i}>: pkg_lwt
<bench/*.ml{,i}>: pkg_cstruct.syntax
<bench/*.ml{,i}>: pkg_lwt.unix
<bench/*.ml{,i}>: pkg_cstruct
<bench/*.ml{,i}>: pkg_cstruct.syntax
<bench/xs_bench.{native,byte}>: custom
# OASIS_STOP
true: annot
Expand Down
28 changes: 18 additions & 10 deletions core/META
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,43 @@
# OASIS_START
# DO NOT EDIT (digest: ceb0abd4a6c447706c1381a235ac063b)
# DO NOT EDIT (digest: 7f82bbcfd33dee26513b4e9a7994919b)
version = "0.9-dev"
description = "Xenstore protocol library"
requires = "lwt cstruct cstruct.syntax lwt"
archive(byte) = "xenstore.cma"
archive(byte, plugin) = "xenstore.cma"
archive(native) = "xenstore.cmxa"
archive(native, plugin) = "xenstore.cmxs"
exists_if = "xenstore.cma"
package "server" (
version = "0.9-dev"
description = "Xenstore protocol library"
requires = "lwt xenstore"
archive(byte) = "xenstore_server.cma"
archive(native) = "xenstore_server.cmxa"
exists_if = "xenstore_server.cma"
)

package "unix" (
version = "0.9-dev"
description = "Xenstore protocol library"
requires = "lwt xenstore xenstore.server"
archive(byte) = "xenstore_unix.cma"
archive(byte, plugin) = "xenstore_unix.cma"
archive(native) = "xenstore_unix.cmxa"
archive(native, plugin) = "xenstore_unix.cmxs"
exists_if = "xenstore_unix.cma"
)

package "server" (
version = "0.9-dev"
description = "Xenstore protocol library"
requires = "lwt xenstore"
archive(byte) = "xenstore_server.cma"
archive(byte, plugin) = "xenstore_server.cma"
archive(native) = "xenstore_server.cmxa"
archive(native, plugin) = "xenstore_server.cmxs"
exists_if = "xenstore_server.cma"
)

package "client" (
version = "0.9-dev"
description = "Xenstore protocol library"
requires = "lwt xenstore"
archive(byte) = "xenstore_client.cma"
archive(byte, plugin) = "xenstore_client.cma"
archive(native) = "xenstore_client.cmxa"
archive(native, plugin) = "xenstore_client.cmxs"
exists_if = "xenstore_client.cma"
)
# OASIS_STOP
Expand Down
Loading

0 comments on commit 7412878

Please sign in to comment.