Permalink
Browse files

Get rid of ocamlgraph.

Ignore-this: 70c0fe9075d2664a5e5d0faee46c0d45

darcs-hash:20120416143943-a43a9-9605222e4c62c2a2a8b858df9e81eb953c02d191
  • Loading branch information...
1 parent 13d352d commit ca067433a7556f6dac784239bcaa9f5bd7c3bcce @gildor478 gildor478 committed Apr 16, 2012
Showing with 2,270 additions and 2,103 deletions.
  1. +1 −4 INSTALL.txt
  2. +5 −4 _oasis
  3. +40 −54 _tags
  4. +3 −1 deps.ml
  5. +78 −78 myocamlbuild.ml
  6. +1,889 −1,788 setup.ml
  7. +2 −1 src/api-oasis.odocl
  8. +2 −2 src/oasis/META
  9. +108 −169 src/oasis/OASISBuildSection.ml
  10. +139 −0 src/oasis/OASISGraph.ml
  11. +1 −1 src/oasis/OASISSection.mli
  12. +2 −1 src/oasis/oasis.mllib
View
@@ -1,5 +1,5 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: 82900bd1a971b9e058ec64a8a92bfb8e) *)
+(* DO NOT EDIT (digest: 0ba4956f247cb4642db5ea3d4d15507b) *)
This is the INSTALL file for the oasis distribution.
This package uses OASIS to generate its build system. See section OASIS for
@@ -13,7 +13,6 @@ In order to compile this package, you will need:
doc api-oasis, doc manual
* findlib
* odn (>= 0.0.3) for library oasis
-* ocamlgraph for library oasis
* make for all, test main, test main_loader, test main_userconf,
doc api-oasis, doc manual
* ocamlmod for library base, library oasis
@@ -22,8 +21,6 @@ In order to compile this package, you will need:
executable test_userconf
* fileutils (>= 0.4.2) for executable test, executable test_loader
* expect (>= 0.0.2) for executable test
-* test-userconf for test main_userconf
-* test-loader for test main_loader
Installing
==========
View
9 _oasis
@@ -80,7 +80,8 @@ Library oasis
OASISString,
OASISExec,
OASISFileUtil,
- OASISHostPath
+ OASISHostPath,
+ OASISGraph
InternalModules: OASISVersion_types,
OASISVersion_lexer,
OASISVersion_parser,
@@ -108,7 +109,7 @@ Library oasis
OASISSchema_intern,
OASISPath_intern
CompiledObject: Best
- BuildDepends: unix, odn (>= 0.0.3), ocamlgraph
+ BuildDepends: unix, odn (>= 0.0.3)
BuildTools+: ocamlmod, ocamlyacc, ocamllex, ocamlify
XMETADescription: _oasis file functions
Install$: flag(libraries)
@@ -283,7 +284,7 @@ Executable "test_loader"
Test main_loader
Type: custom (0.3)
Command: $test_loader --pluginloader $pluginloader
- TestTools: test-loader, pluginloader
+ TestTools: test_loader, pluginloader
# Third party: user-conf
@@ -300,4 +301,4 @@ Executable "test_userconf"
Test main_userconf
Type: custom (0.3)
Command: $test_userconf
- TestTools: test-userconf
+ TestTools: test_userconf
View
94 _tags
@@ -20,7 +20,7 @@
################################################################################
# OASIS_START
-# DO NOT EDIT (digest: 8f0ebcf2d4a44f28f4358f85632be174)
+# DO NOT EDIT (digest: 78e5191899b623743d6daa1a319e4768)
# 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
@@ -38,142 +38,128 @@
"src/oasis/oasis.cmxs": use_oasis
<src/oasis/*.ml{,i}>: pkg_unix
<src/oasis/*.ml{,i}>: pkg_odn
-<src/oasis/*.ml{,i}>: pkg_ocamlgraph
# Library base
"src/base/base.cmxs": use_base
<src/base/*.ml{,i}>: use_oasis
<src/base/*.ml{,i}>: pkg_unix
<src/base/*.ml{,i}>: pkg_odn
-<src/base/*.ml{,i}>: pkg_ocamlgraph
-# Library pluginloaderLib
-"src/ext/plugin-loader/test/data/findlib/pluginloaderLib/pluginloaderLib.cmxs": use_pluginloaderLib
# Library builtin-plugins
"src/builtin-plugins.cmxs": use_builtin-plugins
<src/*.ml{,i}>: use_base
<src/*.ml{,i}>: use_oasis
<src/*.ml{,i}>: pkg_unix
<src/*.ml{,i}>: pkg_odn
-<src/*.ml{,i}>: pkg_ocamlgraph
<src/plugins/custom/*.ml{,i}>: use_base
<src/plugins/custom/*.ml{,i}>: use_oasis
<src/plugins/custom/*.ml{,i}>: pkg_unix
<src/plugins/custom/*.ml{,i}>: pkg_odn
-<src/plugins/custom/*.ml{,i}>: pkg_ocamlgraph
<src/plugins/extra/META/*.ml{,i}>: use_base
<src/plugins/extra/META/*.ml{,i}>: use_oasis
<src/plugins/extra/META/*.ml{,i}>: pkg_unix
<src/plugins/extra/META/*.ml{,i}>: pkg_odn
-<src/plugins/extra/META/*.ml{,i}>: pkg_ocamlgraph
<src/plugins/extra/devfiles/*.ml{,i}>: use_base
<src/plugins/extra/devfiles/*.ml{,i}>: use_oasis
<src/plugins/extra/devfiles/*.ml{,i}>: pkg_unix
<src/plugins/extra/devfiles/*.ml{,i}>: pkg_odn
-<src/plugins/extra/devfiles/*.ml{,i}>: pkg_ocamlgraph
<src/plugins/extra/stdfiles/*.ml{,i}>: use_base
<src/plugins/extra/stdfiles/*.ml{,i}>: use_oasis
<src/plugins/extra/stdfiles/*.ml{,i}>: pkg_unix
<src/plugins/extra/stdfiles/*.ml{,i}>: pkg_odn
-<src/plugins/extra/stdfiles/*.ml{,i}>: pkg_ocamlgraph
<src/plugins/internal/*.ml{,i}>: use_base
<src/plugins/internal/*.ml{,i}>: use_oasis
<src/plugins/internal/*.ml{,i}>: pkg_unix
<src/plugins/internal/*.ml{,i}>: pkg_odn
-<src/plugins/internal/*.ml{,i}>: pkg_ocamlgraph
<src/plugins/none/*.ml{,i}>: use_base
<src/plugins/none/*.ml{,i}>: use_oasis
<src/plugins/none/*.ml{,i}>: pkg_unix
<src/plugins/none/*.ml{,i}>: pkg_odn
-<src/plugins/none/*.ml{,i}>: pkg_ocamlgraph
<src/plugins/ocamlbuild/*.ml{,i}>: use_base
<src/plugins/ocamlbuild/*.ml{,i}>: use_oasis
<src/plugins/ocamlbuild/*.ml{,i}>: pkg_unix
<src/plugins/ocamlbuild/*.ml{,i}>: pkg_odn
-<src/plugins/ocamlbuild/*.ml{,i}>: pkg_ocamlgraph
-# Library plugin-loader
-"src/ext/plugin-loader/src/plugin-loader.cmxs": use_plugin-loader
-<src/ext/plugin-loader/src/*.ml{,i}>: pkg_findlib
-<src/ext/plugin-loader/src/*.ml{,i}>: pkg_dynlink
# Library cli
"src/cli/cli.cmxs": use_cli
-# Library plugin1
-"src/ext/plugin-loader/test/data/findlib/plugin1/plugin1.cmxs": use_plugin1
-<src/ext/plugin-loader/test/data/findlib/plugin1/*.ml{,i}>: use_pluginloaderLib
# Executable test
"test/test.byte": use_builtin-plugins
"test/test.byte": use_base
"test/test.byte": use_oasis
-"test/test.byte": pkg_unix
-"test/test.byte": pkg_odn
-"test/test.byte": pkg_ocamlgraph
"test/test.byte": pkg_oUnit
-"test/test.byte": pkg_findlib
"test/test.byte": pkg_fileutils
+"test/test.byte": pkg_findlib
"test/test.byte": pkg_expect.pcre
+"test/test.byte": pkg_unix
+"test/test.byte": pkg_odn
<test/*.ml{,i}>: use_builtin-plugins
<test/*.ml{,i}>: use_base
<test/*.ml{,i}>: use_oasis
-<test/*.ml{,i}>: pkg_unix
-<test/*.ml{,i}>: pkg_odn
-<test/*.ml{,i}>: pkg_ocamlgraph
<test/*.ml{,i}>: pkg_oUnit
-<test/*.ml{,i}>: pkg_findlib
<test/*.ml{,i}>: pkg_fileutils
+<test/*.ml{,i}>: pkg_findlib
<test/*.ml{,i}>: pkg_expect.pcre
+<test/*.ml{,i}>: pkg_unix
+<test/*.ml{,i}>: pkg_odn
+# Library plugin-loader
+"src/ext/plugin-loader/src/plugin-loader.cmxs": use_plugin-loader
+<src/ext/plugin-loader/src/*.ml{,i}>: pkg_dynlink
+<src/ext/plugin-loader/src/*.ml{,i}>: pkg_findlib
# Executable oasis
"src/cli/Main.byte": use_cli
-"src/cli/Main.byte": use_plugin-loader
"src/cli/Main.byte": use_builtin-plugins
"src/cli/Main.byte": use_base
"src/cli/Main.byte": use_oasis
+"src/cli/Main.byte": use_plugin-loader
+"src/cli/Main.byte": pkg_dynlink
+"src/cli/Main.byte": pkg_findlib
"src/cli/Main.byte": pkg_unix
"src/cli/Main.byte": pkg_odn
-"src/cli/Main.byte": pkg_ocamlgraph
-"src/cli/Main.byte": pkg_findlib
-"src/cli/Main.byte": pkg_dynlink
<src/cli/*.ml{,i}>: use_cli
-<src/cli/*.ml{,i}>: use_plugin-loader
<src/cli/*.ml{,i}>: use_builtin-plugins
<src/cli/*.ml{,i}>: use_base
<src/cli/*.ml{,i}>: use_oasis
+<src/cli/*.ml{,i}>: use_plugin-loader
+<src/cli/*.ml{,i}>: pkg_dynlink
+<src/cli/*.ml{,i}>: pkg_findlib
<src/cli/*.ml{,i}>: pkg_unix
<src/cli/*.ml{,i}>: pkg_odn
-<src/cli/*.ml{,i}>: pkg_ocamlgraph
-<src/cli/*.ml{,i}>: pkg_findlib
-<src/cli/*.ml{,i}>: pkg_dynlink
-# Executable pluginloader
-"src/ext/plugin-loader/test/data/pluginloader.byte": use_plugin-loader
-"src/ext/plugin-loader/test/data/pluginloader.byte": use_pluginloaderLib
-"src/ext/plugin-loader/test/data/pluginloader.byte": pkg_findlib
-"src/ext/plugin-loader/test/data/pluginloader.byte": pkg_dynlink
-<src/ext/plugin-loader/test/data/*.ml{,i}>: use_plugin-loader
-<src/ext/plugin-loader/test/data/*.ml{,i}>: use_pluginloaderLib
-<src/ext/plugin-loader/test/data/*.ml{,i}>: pkg_findlib
-<src/ext/plugin-loader/test/data/*.ml{,i}>: pkg_dynlink
-# Library userconf
-"src/ext/userconf/src/userconf.cmxs": use_userconf
+# Library pluginloaderLib
+"src/ext/plugin-loader/test/data/findlib/pluginloaderLib/pluginloaderLib.cmxs": use_pluginloaderLib
+# Library plugin1
+"src/ext/plugin-loader/test/data/findlib/plugin1/plugin1.cmxs": use_plugin1
+<src/ext/plugin-loader/test/data/findlib/plugin1/*.ml{,i}>: use_pluginloaderLib
# Library plugin2
"src/ext/plugin-loader/test/data/findlib/plugin2/plugin2.cmxs": use_plugin2
<src/ext/plugin-loader/test/data/findlib/plugin2/*.ml{,i}>: use_plugin1
<src/ext/plugin-loader/test/data/findlib/plugin2/*.ml{,i}>: use_pluginloaderLib
# Library plugin3
"src/ext/plugin-loader/test/data/findlib/plugin3/plugin3.cmxs": use_plugin3
<src/ext/plugin-loader/test/data/findlib/plugin3/*.ml{,i}>: use_pluginloaderLib
-# Executable test_userconf
-"src/ext/userconf/test/TestUserConf.byte": use_userconf
-"src/ext/userconf/test/TestUserConf.byte": pkg_oUnit
-<src/ext/userconf/test/*.ml{,i}>: use_userconf
-<src/ext/userconf/test/*.ml{,i}>: pkg_oUnit
+# Executable pluginloader
+"src/ext/plugin-loader/test/data/pluginloader.byte": use_plugin-loader
+"src/ext/plugin-loader/test/data/pluginloader.byte": use_pluginloaderLib
+"src/ext/plugin-loader/test/data/pluginloader.byte": pkg_dynlink
+"src/ext/plugin-loader/test/data/pluginloader.byte": pkg_findlib
+<src/ext/plugin-loader/test/data/*.ml{,i}>: use_plugin-loader
+<src/ext/plugin-loader/test/data/*.ml{,i}>: use_pluginloaderLib
+<src/ext/plugin-loader/test/data/*.ml{,i}>: pkg_dynlink
+<src/ext/plugin-loader/test/data/*.ml{,i}>: pkg_findlib
# Executable test_loader
"src/ext/plugin-loader/test/TestLoader.byte": use_plugin-loader
"src/ext/plugin-loader/test/TestLoader.byte": pkg_oUnit
-"src/ext/plugin-loader/test/TestLoader.byte": pkg_findlib
"src/ext/plugin-loader/test/TestLoader.byte": pkg_fileutils
"src/ext/plugin-loader/test/TestLoader.byte": pkg_dynlink
+"src/ext/plugin-loader/test/TestLoader.byte": pkg_findlib
<src/ext/plugin-loader/test/*.ml{,i}>: use_plugin-loader
<src/ext/plugin-loader/test/*.ml{,i}>: pkg_oUnit
-<src/ext/plugin-loader/test/*.ml{,i}>: pkg_findlib
<src/ext/plugin-loader/test/*.ml{,i}>: pkg_fileutils
<src/ext/plugin-loader/test/*.ml{,i}>: pkg_dynlink
+<src/ext/plugin-loader/test/*.ml{,i}>: pkg_findlib
+# Library userconf
+"src/ext/userconf/src/userconf.cmxs": use_userconf
+# Executable test_userconf
+"src/ext/userconf/test/TestUserConf.byte": use_userconf
+"src/ext/userconf/test/TestUserConf.byte": pkg_oUnit
+<src/ext/userconf/test/*.ml{,i}>: use_userconf
+<src/ext/userconf/test/*.ml{,i}>: pkg_oUnit
# OASIS_STOP
# Base system and OASIS library
View
@@ -1,4 +1,5 @@
+(* TODO: only at post-conf
module MapString = Map.Make(String)
module SetString = Set.Make(String)
@@ -63,7 +64,7 @@ let () =
SetString.fold
(fun fndlb_nm mp ->
let lst =
- BaseExec.run_read_output
+ OASISExec.run_read_output ~ctxt:!BaseContext.default
"ocamlfind"
["query"; fndlb_nm; "-recursive"; "-p-format"]
in
@@ -109,3 +110,4 @@ let () =
())
pkg.sections;
close_out chn
+ *)
Oops, something went wrong.

0 comments on commit ca06743

Please sign in to comment.