Skip to content

Commit

Permalink
Modify dependency: monad -> monad-custom
Browse files Browse the repository at this point in the history
  • Loading branch information
astrada committed Jul 24, 2013
1 parent 86a5adc commit ae5d2df
Show file tree
Hide file tree
Showing 14 changed files with 75 additions and 75 deletions.
4 changes: 2 additions & 2 deletions _oasis
Expand Up @@ -127,7 +127,7 @@ Executable "serviceGenerator"
Path: tools
Install: false
MainIs: serviceGenerator.ml
BuildDepends: gapi-ocaml, monad
BuildDepends: gapi-ocaml, monad-custom

# Examples
Executable "oauth2Flow"
Expand Down Expand Up @@ -164,7 +164,7 @@ Executable "test_suite"
Path: src/test
Install: false
MainIs: testSuite.ml
BuildDepends: oUnit, gapi-ocaml.gdata, monad
BuildDepends: oUnit, gapi-ocaml.gdata, monad-custom

Test core
Run$: flag(tests) || flag(all)
Expand Down
10 changes: 5 additions & 5 deletions _tags
Expand Up @@ -4,7 +4,7 @@
<src/gapi/gapi*Model.ml>: warn_x

# OASIS_START
# DO NOT EDIT (digest: c24ca32aba5c5de4fc5bec6dcc7381d8)
# DO NOT EDIT (digest: 0f17db2be6dd9b4b219159177124200c)
# 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
Expand Down Expand Up @@ -38,15 +38,15 @@
<src/gdata/*.ml{,i}>: pkg_yojson
# Executable serviceGenerator
"tools/serviceGenerator.byte": use_gapi-ocaml
"tools/serviceGenerator.byte": pkg_monad
"tools/serviceGenerator.byte": pkg_monad-custom
"tools/serviceGenerator.byte": pkg_extlib
"tools/serviceGenerator.byte": pkg_netstring
"tools/serviceGenerator.byte": pkg_curl
"tools/serviceGenerator.byte": pkg_str
"tools/serviceGenerator.byte": pkg_cryptokit
"tools/serviceGenerator.byte": pkg_yojson
<tools/*.ml{,i}>: use_gapi-ocaml
<tools/*.ml{,i}>: pkg_monad
<tools/*.ml{,i}>: pkg_monad-custom
<tools/*.ml{,i}>: pkg_extlib
<tools/*.ml{,i}>: pkg_netstring
<tools/*.ml{,i}>: pkg_curl
Expand Down Expand Up @@ -105,7 +105,7 @@
"src/test/testSuite.byte": use_gdata
"src/test/testSuite.byte": use_gapi-ocaml
"src/test/testSuite.byte": pkg_oUnit
"src/test/testSuite.byte": pkg_monad
"src/test/testSuite.byte": pkg_monad-custom
"src/test/testSuite.byte": pkg_xmlm
"src/test/testSuite.byte": pkg_extlib
"src/test/testSuite.byte": pkg_netstring
Expand All @@ -116,7 +116,7 @@
<src/test/*.ml{,i}>: use_gdata
<src/test/*.ml{,i}>: use_gapi-ocaml
<src/test/*.ml{,i}>: pkg_oUnit
<src/test/*.ml{,i}>: pkg_monad
<src/test/*.ml{,i}>: pkg_monad-custom
<src/test/*.ml{,i}>: pkg_xmlm
<src/test/*.ml{,i}>: pkg_extlib
<src/test/*.ml{,i}>: pkg_netstring
Expand Down
14 changes: 7 additions & 7 deletions myocamlbuild.ml
@@ -1,7 +1,7 @@
(* OASIS_START *)
(* DO NOT EDIT (digest: a1b63af86136d625ce90e76a81620e2c) *)
(* DO NOT EDIT (digest: 9581799c2fb31cdc3e535d223aa0818d) *)
module OASISGettext = struct
(* # 21 "/home/alex/.odb/install-oasis/oasis-0.3.0/src/oasis/OASISGettext.ml" *)
(* # 21 "src/oasis/OASISGettext.ml" *)

let ns_ str =
str
Expand All @@ -24,7 +24,7 @@ module OASISGettext = struct
end

module OASISExpr = struct
(* # 21 "/home/alex/.odb/install-oasis/oasis-0.3.0/src/oasis/OASISExpr.ml" *)
(* # 21 "src/oasis/OASISExpr.ml" *)



Expand Down Expand Up @@ -116,7 +116,7 @@ end

# 117 "myocamlbuild.ml"
module BaseEnvLight = struct
(* # 21 "/home/alex/.odb/install-oasis/oasis-0.3.0/src/base/BaseEnvLight.ml" *)
(* # 21 "src/base/BaseEnvLight.ml" *)

module MapString = Map.Make(String)

Expand Down Expand Up @@ -214,7 +214,7 @@ end

# 215 "myocamlbuild.ml"
module MyOCamlbuildFindlib = struct
(* # 21 "/home/alex/.odb/install-oasis/oasis-0.3.0/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml" *)
(* # 21 "src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml" *)

(** OCamlbuild extension, copied from
* http://brion.inria.fr/gallium/index.php/Using_ocamlfind_with_ocamlbuild
Expand Down Expand Up @@ -323,7 +323,7 @@ module MyOCamlbuildFindlib = struct
end

module MyOCamlbuildBase = struct
(* # 21 "/home/alex/.odb/install-oasis/oasis-0.3.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
(* # 21 "src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)

(** Base functions for writing myocamlbuild.ml
@author Sylvain Le Gall
Expand All @@ -339,7 +339,7 @@ module MyOCamlbuildBase = struct
type name = string
type tag = string

(* # 56 "/home/alex/.odb/install-oasis/oasis-0.3.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
(* # 56 "src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)

type t =
{
Expand Down

0 comments on commit ae5d2df

Please sign in to comment.