diff --git a/.gitignore b/.gitignore index eac43ff..5f2c641 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ _build setup.data setup.log +setup.exe data/cumulus.js password diff --git a/META b/META deleted file mode 100644 index 781bb45..0000000 --- a/META +++ /dev/null @@ -1,10 +0,0 @@ -# OASIS_START -# DO NOT EDIT (digest: e43c54ec0a8f0c4fd259efc1d88891de) -version = "1.0" -description = "Buzz erl^WOCaml, le retour" -requires = "eliom.client eliom.syntax" -archive(byte) = "cumulus_client.cma" -archive(byte, plugin) = "cumulus_client.cma" -exists_if = "cumulus_client.cma" -# OASIS_STOP - diff --git a/_oasis b/_oasis index 77846e5..137a73a 100644 --- a/_oasis +++ b/_oasis @@ -27,6 +27,7 @@ Library cumulus Templates_atom, Main BuildDepends: + eliom.server.ext, cumulus.base ByteOpt: -w A-44-33-41 DataFiles: @@ -66,15 +67,12 @@ Library db Db_feed, Db_user BuildDepends: - eliom.server (>= 3.0.3), - batteries (>= 2.0), + eliom.server (>= 4.0), + batteries (>= 2.2), macaque (>= 0.6), - batteries (>= 2.0), - camomile, - pgocaml (>= 1.7), + pgocaml (>= 2.0), lwt (>= 2.4), - safepass (>= 1.2), - markdown.html (>= 0.1.1) + safepass (>= 1.2) ByteOpt: -w A-44-33-41 Executable cumulus diff --git a/_tags b/_tags index a86e48f..a19e741 100644 --- a/_tags +++ b/_tags @@ -1,5 +1,5 @@ # OASIS_START -# DO NOT EDIT (digest: d6c75f9286f3a16f4a905b8920cab3f9) +# DO NOT EDIT (digest: edbd6f50020650edbaced77acae8efe2) # 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 @@ -18,11 +18,9 @@ : oasis_library_db_byte : oasis_library_db_byte : package(batteries) -: package(camomile) : package(eliom.server) : package(lwt) : package(macaque) -: package(markdown.html) : package(pgocaml) : package(safepass) # Library base @@ -46,6 +44,7 @@ : package(batteries) : package(camomile) : package(eliom.server) +: package(eliom.server.ext) : package(lwt) : package(macaque) : package(markdown.html) @@ -56,6 +55,7 @@ : package(batteries) : package(camomile) : package(eliom.server) +: package(eliom.server.ext) : package(lwt) : package(macaque) : package(markdown.html) diff --git a/ocsigenserver.conf b/ocsigenserver.conf index adcb933..ae51843 100644 --- a/ocsigenserver.conf +++ b/ocsigenserver.conf @@ -19,6 +19,7 @@ + diff --git a/ocsigenserver.opt.conf b/ocsigenserver.opt.conf index 0217630..d99cfc3 100644 --- a/ocsigenserver.opt.conf +++ b/ocsigenserver.opt.conf @@ -19,6 +19,7 @@ + diff --git a/setup.ml b/setup.ml index 344a1b9..db2fab4 100644 --- a/setup.ml +++ b/setup.ml @@ -1,7 +1,7 @@ (* setup.ml generated for the first time by OASIS v0.3.0 *) (* OASIS_START *) -(* DO NOT EDIT (digest: 950ab4ea2d10f35a36f652df4f9f4e4b) *) +(* DO NOT EDIT (digest: 84205dc5b678add1501ee731f8fb7518) *) (* Regenerated by OASIS v0.4.5 Visit http://oasis.forge.ocamlcore.org for more information and @@ -6729,28 +6729,21 @@ let setup_t = [ FindlibPackage ("eliom.server", - Some (OASISVersion.VGreaterEqual "3.0.3")); + Some (OASISVersion.VGreaterEqual "4.0")); FindlibPackage ("batteries", - Some (OASISVersion.VGreaterEqual "2.0")); + Some (OASISVersion.VGreaterEqual "2.2")); FindlibPackage ("macaque", Some (OASISVersion.VGreaterEqual "0.6")); - FindlibPackage - ("batteries", - Some (OASISVersion.VGreaterEqual "2.0")); - FindlibPackage ("camomile", None); FindlibPackage ("pgocaml", - Some (OASISVersion.VGreaterEqual "1.7")); + Some (OASISVersion.VGreaterEqual "2.0")); FindlibPackage ("lwt", Some (OASISVersion.VGreaterEqual "2.4")); FindlibPackage ("safepass", - Some (OASISVersion.VGreaterEqual "1.2")); - FindlibPackage - ("markdown.html", - Some (OASISVersion.VGreaterEqual "0.1.1")) + Some (OASISVersion.VGreaterEqual "1.2")) ]; bs_build_tools = [ExternalTool "ocamlbuild"]; bs_c_sources = []; @@ -6839,7 +6832,11 @@ let setup_t = bs_install = [(OASISExpr.EBool true, true)]; bs_path = "src"; bs_compiled_object = Best; - bs_build_depends = [InternalLibrary "base"]; + bs_build_depends = + [ + FindlibPackage ("eliom.server.ext", None); + InternalLibrary "base" + ]; bs_build_tools = [ExternalTool "ocamlbuild"]; bs_c_sources = []; bs_data_files = @@ -6908,8 +6905,7 @@ let setup_t = }; oasis_fn = Some "_oasis"; oasis_version = "0.4.5"; - oasis_digest = - Some "\229\206'W\211\153\145F\191\158@\146\181\025\180\003"; + oasis_digest = Some "\184\153]\239\007\168\237A\145Y\223~\b)\242:"; oasis_exec = None; oasis_setup_args = []; setup_update = false @@ -6917,7 +6913,7 @@ let setup_t = let setup () = BaseSetup.setup setup_t;; -# 6921 "setup.ml" +# 6917 "setup.ml" (* OASIS_STOP *) let () = diff --git a/src/META b/src/META index ad3d6f9..2048ccb 100644 --- a/src/META +++ b/src/META @@ -1,8 +1,8 @@ # OASIS_START -# DO NOT EDIT (digest: e08486d5a5b4d4fcf18acff51f027c2b) +# DO NOT EDIT (digest: 450b2bdaf839fd5b17678d5255358aea) version = "1.0" description = "Buzz erl^WOCaml, le retour" -requires = "cumulus.base" +requires = "eliom.server.ext cumulus.base" archive(byte) = "cumulus.cma" archive(byte, plugin) = "cumulus.cma" archive(native) = "cumulus.cmxa" @@ -11,8 +11,7 @@ exists_if = "cumulus.cma" package "db" ( version = "1.0" description = "Buzz erl^WOCaml, le retour" - requires = - "eliom.server batteries macaque batteries camomile pgocaml lwt safepass markdown.html" + requires = "eliom.server batteries macaque pgocaml lwt safepass" archive(byte) = "db.cma" archive(byte, plugin) = "db.cma" archive(native) = "db.cmxa" diff --git a/src/templates_feeds.ml b/src/templates_feeds.ml index d132daa..6a4f6ab 100644 --- a/src/templates_feeds.ml +++ b/src/templates_feeds.ml @@ -365,7 +365,7 @@ let main_style ~user ~error ~server_function ~page_title content = ] ) (body - [ noscript (pcdata "Your browser doesn't support javascript. Please pick one which does.") []; + [ noscript [pcdata "Your browser doesn't support javascript. Please pick one which does."]; div ~a: [a_class ["line"]] (header