Update build instructure

fxfactorial · Feb 5, 2016 · b9e101d · b9e101d
1 parent 6301f9f
commit b9e101d
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 19 deletions.
diff --git a/_oasis b/_oasis
@@ -21,4 +21,14 @@ Library nodejs
   Modules:      Nodejs
   CompiledObject: byte
   BuildDepends:
-    js_of_ocaml.ppx, yojson, magic-mime
+    js_of_ocaml (>= 2.7),
+    js_of_ocaml.ppx,
+    lwt.ppx,
+    lwt (>= 2.5.1),
+    yojson,
+    magic-mime
+
+SourceRepository master
+  Type:     git
+  Location: https://github.com/fxfactorial/ocaml-nodejs.git
+  Browser:  https://github.com/fxfactorial/ocaml-nodejs
diff --git a/_tags b/_tags
@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 46eeb3956367bdf7d3c8b7db1c126386)
+# DO NOT EDIT (digest: 517e66e81979bf5aedd1bb4da363b5df)
 # 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
@@ -16,7 +16,10 @@ true: annot, bin_annot
 "_darcs": not_hygienic
 # Library nodejs
 "src/nodejs.cmxs": use_nodejs
+<src/*.ml{,i,y}>: pkg_js_of_ocaml
 <src/*.ml{,i,y}>: pkg_js_of_ocaml.ppx
+<src/*.ml{,i,y}>: pkg_lwt
+<src/*.ml{,i,y}>: pkg_lwt.ppx
 <src/*.ml{,i,y}>: pkg_magic-mime
 <src/*.ml{,i,y}>: pkg_yojson
 # OASIS_STOP

diff --git a/opam/opam b/opam/opam
@@ -5,10 +5,9 @@ maintainer: "Edgar Aroutiounian <edgar.factorial@gmail.com>"
 authors: [ "Edgar Aroutiounian <edgar.factorial@gmail.com>" ]
 license: "BSD-3-clause"
 homepage: "https://github.com/fxfactorial/ocaml-nodejs"
-bug-reports: "https://github.com/fxfactorial/ocaml-nodejs/issues"
 dev-repo: "https://github.com/fxfactorial/ocaml-nodejs.git"
+bug-reports: "https://github.com/fxfactorial/ocaml-nodejs/issues"
 build: [
-  ["oasis" "setup"]
   ["ocaml" "setup.ml" "-configure" "--prefix" prefix]
   ["ocaml" "setup.ml" "-build"]
 ]
@@ -17,24 +16,22 @@ remove: [
   ["ocamlfind" "remove" "nodejs"]
 ]
 build-test: [
-  ["oasis" "setup"]
   ["ocaml" "setup.ml" "-configure" "--enable-tests"]
   ["ocaml" "setup.ml" "-build"]
   ["ocaml" "setup.ml" "-test"]
 ]
 depends: [
-  "js_of_ocaml" {>= "2.6"}
-  "oasis" {build & >= "0.4"}
+  "js_of_ocaml" {>= "2.7"}
+  "lwt" {>= "2.5.1"}
+  "magic-mime"
   "ocamlfind" {build}
   "yojson"
-  "magic-mime"
 ]
-
-available: [ ocaml-version >= "4.02.3" ]
+available: [ ocaml-version >= "4.02.0" ]
 
 depexts: [
   [["debian"] ["nodejs"]]
-  [["homebrew" "osx"] ["nodejs"]]
+  [["homebrew" "osx"] ["node"]]
   [["ubuntu"] ["nodejs"]]
 ]
 
@@ -68,4 +65,4 @@ let () =
   "ocamlfind ocamlc c.ml -linkpkg -package nodejs -o T.out"
   "js_of_ocaml T.out"
   "node T.js"
-]
+]
diff --git a/setup.ml b/setup.ml
@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.4.5 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 4158af0dc5275e7023febcfb109eb2a1) *)
+(* DO NOT EDIT (digest: e0c939abaf34e245cb132c5e6ed76b7f) *)
 (*
    Regenerated by OASIS v0.4.5
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6673,7 +6673,7 @@ let setup_t =
           alpha_features = [];
           beta_features = [];
           name = "nodejs";
-          version = "0.8";
+          version = "0.9";
           license =
             OASISLicense.DEP5License
               (OASISLicense.DEP5Unit
@@ -6744,7 +6744,14 @@ let setup_t =
                       bs_compiled_object = Byte;
                       bs_build_depends =
                         [
+                           FindlibPackage
+                             ("js_of_ocaml",
+                               Some (OASISVersion.VGreaterEqual "2.7"));
                            FindlibPackage ("js_of_ocaml.ppx", None);
+                           FindlibPackage ("lwt.ppx", None);
+                           FindlibPackage
+                             ("lwt",
+                               Some (OASISVersion.VGreaterEqual "2.5.1"));
                            FindlibPackage ("yojson", None);
                            FindlibPackage ("magic-mime", None)
                         ];
@@ -6765,6 +6772,23 @@ let setup_t =
                       lib_findlib_parent = None;
                       lib_findlib_name = None;
                       lib_findlib_containers = []
+                   });
+               SrcRepo
+                 ({
+                     cs_name = "master";
+                     cs_data = PropList.Data.create ();
+                     cs_plugin_data = []
+                  },
+                   {
+                      src_repo_type = Git;
+                      src_repo_location =
+                        "https://github.com/fxfactorial/ocaml-nodejs.git";
+                      src_repo_browser =
+                        Some "https://github.com/fxfactorial/ocaml-nodejs";
+                      src_repo_module = None;
+                      src_repo_branch = None;
+                      src_repo_tag = None;
+                      src_repo_subdir = None
                    })
             ];
           plugins =
@@ -6775,14 +6799,14 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.5";
-     oasis_digest = Some "\137;÷\007è&\158Q²\132\154\025\016øõ\142";
+     oasis_digest = Some "/%ÜÆ×&Ìv.\026§ëÐ)}\133";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false
   };;
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 6787 "setup.ml"
+# 6811 "setup.ml"
 (* OASIS_STOP *)
 let () = setup ();;
diff --git a/src/META b/src/META
@@ -1,8 +1,8 @@
 # OASIS_START
-# DO NOT EDIT (digest: ae7a2e811dc4f32732692cf962a18546)
-version = "0.8"
+# DO NOT EDIT (digest: 4832a7b31a1c42c2c0de3a836a423b37)
+version = "0.9"
 description = "js_of_ocaml bindings for nodejs"
-requires = "js_of_ocaml.ppx yojson magic-mime"
+requires = "js_of_ocaml js_of_ocaml.ppx lwt.ppx lwt yojson magic-mime"
 archive(byte) = "nodejs.cma"
 archive(byte, plugin) = "nodejs.cma"
 exists_if = "nodejs.cma"