updated _oasis and .gitignore

.gitignore

@@ -2,6 +2,7 @@
 .*.swo
 _build
 *.native
+*.byte
 .session
 TAGS
 *.docdir

_oasis

@@ -90,7 +90,7 @@ Executable benchs
 Test all
   Command: $run_tests
   TestTools: run_tests
-  Run$: flag(tests)
+  Run$: flag(tests) && flag(lwt)
 
 Executable run_tests
   Path: tests/
@@ -98,14 +98,14 @@ Executable run_tests
   CompiledObject: native
   MainIs: run_tests.ml
   Build$: flag(tests) && flag(lwt)
-  BuildDepends: containers, oUnit, lwt
+  BuildDepends: containers, oUnit, lwt, threads, lwt.unix
 
 Executable web_pwd
   Path: examples
   Install: false
   MainIs: web_pwd.ml
   Build$: flag(cgi)
-  BuildDepends: containers_cgi, threads, CamlGI
+  BuildDepends: containers.cgi, threads, CamlGI
 
 SourceRepository head
   Type: git

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 79585995b18632ac90365c888b75c5ba)
+# DO NOT EDIT (digest: d71835b977f65228c00aa3a47e880688)
 # 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
@@ -68,18 +68,26 @@
 <tests/*.ml{,i}>: pkg_bench
 # Executable run_tests
 "tests/run_tests.native": use_containers
+"tests/run_tests.native": pkg_threads
 "tests/run_tests.native": pkg_oUnit
 "tests/run_tests.native": pkg_lwt
+"tests/run_tests.native": pkg_lwt.unix
 "tests/run_tests.native": pkg_unix
 <tests/*.ml{,i}>: use_containers
+<tests/*.ml{,i}>: pkg_threads
 <tests/*.ml{,i}>: pkg_oUnit
 <tests/*.ml{,i}>: pkg_lwt
+<tests/*.ml{,i}>: pkg_lwt.unix
 <tests/*.ml{,i}>: pkg_unix
 # Executable web_pwd
-"examples/web_pwd.byte": pkg_containers_cgi
+"examples/web_pwd.byte": use_containers_cgi
+"examples/web_pwd.byte": use_containers
 "examples/web_pwd.byte": pkg_threads
 "examples/web_pwd.byte": pkg_CamlGI
-<examples/*.ml{,i}>: pkg_containers_cgi
+"examples/web_pwd.byte": pkg_unix
+<examples/*.ml{,i}>: use_containers_cgi
+<examples/*.ml{,i}>: use_containers
 <examples/*.ml{,i}>: pkg_threads
 <examples/*.ml{,i}>: pkg_CamlGI
+<examples/*.ml{,i}>: pkg_unix
 # OASIS_STOP

setup.data

@@ -1,64 +0,0 @@
-ocamlfind="/home/simon/.opam/system/bin/ocamlfind"
-ocamlc="/usr/bin/ocamlc.opt"
-ocamlopt="/usr/bin/ocamlopt.opt"
-ocamlbuild="/usr/bin/ocamlbuild"
-pkg_name="containers"
-pkg_version="0.1"
-os_type="Unix"
-system="linux"
-architecture="amd64"
-ccomp_type="cc"
-ocaml_version="4.00.1"
-standard_library_default="/usr/lib/ocaml"
-standard_library="/usr/lib/ocaml"
-standard_runtime="/usr/bin/ocamlrun"
-bytecomp_c_compiler="gcc -fno-defer-pop -Wall -D_FILE_OFFSET_BITS=64 -D_REENTRANT -fPIC"
-native_c_compiler="gcc -Wall -D_FILE_OFFSET_BITS=64 -D_REENTRANT"
-model="default"
-ext_obj=".o"
-ext_asm=".s"
-ext_lib=".a"
-ext_dll=".so"
-default_executable_name="a.out"
-systhread_supported="true"
-prefix="/usr/local"
-exec_prefix="$prefix"
-bindir="$exec_prefix/bin"
-sbindir="$exec_prefix/sbin"
-libexecdir="$exec_prefix/libexec"
-sysconfdir="$prefix/etc"
-sharedstatedir="$prefix/com"
-localstatedir="$prefix/var"
-libdir="$exec_prefix/lib"
-datarootdir="$prefix/share"
-datadir="$datarootdir"
-infodir="$datarootdir/info"
-localedir="$datarootdir/locale"
-mandir="$datarootdir/man"
-docdir="$datarootdir/doc/$pkg_name"
-htmldir="$docdir"
-dvidir="$docdir"
-pdfdir="$docdir"
-psdir="$docdir"
-findlib_version="1.4"
-is_native="true"
-suffix_program=""
-rm="rm -f"
-rmdir="rm -rf"
-debug="true"
-profile="false"
-native_dynlink="true"
-ocamlbuildflags=""
-cgi="true"
-lwt="false"
-thread="true"
-bench="false"
-docs="true"
-tests="false"
-ocaml_version_ge_4_00_1="4.00.1"
-pkg_unix="/usr/lib/ocaml"
-pkg_threads="/usr/lib/ocaml"
-pkg_camlgi="/home/simon/.opam/system/lib/CamlGI"
-ocamldoc="/usr/bin/ocamldoc"
-pkg_bench="/home/simon/.opam/system/lib/bench"
-pkg_ounit="/home/simon/.opam/system/lib/oUnit"

setup.ml

@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.3.0 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: e88f591350fc76aa4ff518bff87740a1) *)
+(* DO NOT EDIT (digest: 55272ba3562c49c9ccb909d630d508a8) *)
 (*
    Regenerated by OASIS v0.3.0
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6113,7 +6113,9 @@ let setup_t =
                         [
                            InternalLibrary "containers";
                            FindlibPackage ("oUnit", None);
-                           FindlibPackage ("lwt", None)
+                           FindlibPackage ("lwt", None);
+                           FindlibPackage ("threads", None);
+                           FindlibPackage ("lwt.unix", None)
                         ];
                       bs_build_tools = [ExternalTool "ocamlbuild"];
                       bs_c_sources = [];
@@ -6148,7 +6150,9 @@ let setup_t =
                            (OASISExpr.EFlag "tests", false);
                            (OASISExpr.EAnd
                               (OASISExpr.EFlag "tests",
-                                OASISExpr.EFlag "tests"),
+                                OASISExpr.EAnd
+                                  (OASISExpr.EFlag "tests",
+                                    OASISExpr.EFlag "lwt")),
                              true)
                         ];
                       test_tools =
@@ -6174,7 +6178,7 @@ let setup_t =
                       bs_compiled_object = Byte;
                       bs_build_depends =
                         [
-                           FindlibPackage ("containers_cgi", None);
+                           InternalLibrary "containers_cgi";
                            FindlibPackage ("threads", None);
                            FindlibPackage ("CamlGI", None)
                         ];
@@ -6215,7 +6219,7 @@ let setup_t =
           };
      oasis_fn = Some "_oasis";
      oasis_version = "0.3.0";
-     oasis_digest = Some "$\027-\146h\194\205\029\204\206\210\171\235|k-";
+     oasis_digest = Some "\177\020\012#dJ\255\130\019K\237\025\237\016l\020";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false;
@@ -6223,6 +6227,6 @@ let setup_t =
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 6227 "setup.ml"
+# 6231 "setup.ml"
 (* OASIS_STOP *)
 let () = setup ();;

toWeb.mli

@@ -193,6 +193,9 @@ end
 
 (** {2 Main interface} *)
 
+(* TODO: interface with {! LazyGraph}. A (string, html.t, string) graph
+   maps naturally to URLs and simplifies routing. *)
+
 val serve_state : ?sockfile:string -> ?sockaddr:Unix.sockaddr ->
                   'a State.t -> unit
   (** Serve incoming requests using a single object.