Skip to content

Commit

Permalink
Merge branch 'lwt-dep' into consolidated-streams
Browse files Browse the repository at this point in the history 
Conflicts:
	lib/github_core.ml
	opam
  • Loading branch information
@dsheets
dsheets committed Apr 26, 2015
2 parents f0cfbe7 + e555c83 commit b172d81
Show file tree
Hide file tree
Showing 9 changed files with 172 additions and 124 deletions.
4 changes: 2 additions & 2 deletions _oasis
View file
Expand Up @@ -20,7 +20,7 @@ Library github_core
Path: lib
Findlibname: github
Modules: Github_s, Github_core, Github_j, Github_t
BuildDepends: lwt.syntax, cohttp (>= 0.12.0), uri (>= 1.3.8), cohttp.lwt-core (>= 0.10.0), yojson, atdgen
BuildDepends: lwt, cohttp (>= 0.12.0), uri (>= 1.3.8), cohttp.lwt-core (>= 0.10.0), yojson, atdgen
XMETARequires: cohttp, uri, cohttp.lwt-core, yojson, atdgen

Library github_unix
Expand All @@ -30,7 +30,7 @@ Library github_unix
Findlibname: unix
FindlibParent: github_core
Modules: Github, Github_cookie_jar
BuildDepends: lwt.syntax, lwt.unix, cohttp.lwt, github, bytes
BuildDepends: lwt, lwt.unix, cohttp.lwt, github, bytes
XMETARequires: lwt.unix, cohttp.lwt, github, bytes

Library github_js
Expand Down
42 changes: 35 additions & 7 deletions _tags
View file
@@ -1,5 +1,5 @@
# OASIS_START
# DO NOT EDIT (digest: bc7cc41819173c4a4ab180d6eb4f2556)
# DO NOT EDIT (digest: 5b59de1d9c97ec5f8753c4305c863be6)
# 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 All @@ -19,7 +19,7 @@ true: annot, bin_annot
<lib/*.ml{,i,y}>: pkg_atdgen
<lib/*.ml{,i,y}>: pkg_cohttp
<lib/*.ml{,i,y}>: pkg_cohttp.lwt-core
<lib/*.ml{,i,y}>: pkg_lwt.syntax
<lib/*.ml{,i,y}>: pkg_lwt
<lib/*.ml{,i,y}>: pkg_uri
<lib/*.ml{,i,y}>: pkg_yojson
# Library github_unix
Expand All @@ -29,7 +29,7 @@ true: annot, bin_annot
<unix/*.ml{,i,y}>: pkg_cohttp
<unix/*.ml{,i,y}>: pkg_cohttp.lwt
<unix/*.ml{,i,y}>: pkg_cohttp.lwt-core
<unix/*.ml{,i,y}>: pkg_lwt.syntax
<unix/*.ml{,i,y}>: pkg_lwt
<unix/*.ml{,i,y}>: pkg_lwt.unix
<unix/*.ml{,i,y}>: pkg_uri
<unix/*.ml{,i,y}>: pkg_yojson
Expand All @@ -53,6 +53,7 @@ true: annot, bin_annot
<lib_test/rwo.{native,byte}>: pkg_cohttp
<lib_test/rwo.{native,byte}>: pkg_cohttp.lwt
<lib_test/rwo.{native,byte}>: pkg_cohttp.lwt-core
<lib_test/rwo.{native,byte}>: pkg_lwt
<lib_test/rwo.{native,byte}>: pkg_lwt.syntax
<lib_test/rwo.{native,byte}>: pkg_lwt.unix
<lib_test/rwo.{native,byte}>: pkg_stringext
Expand All @@ -70,6 +71,7 @@ true: annot, bin_annot
<jar/jar.{native,byte}>: pkg_cohttp.lwt
<jar/jar.{native,byte}>: pkg_cohttp.lwt-core
<jar/jar.{native,byte}>: pkg_lambda-term
<jar/jar.{native,byte}>: pkg_lwt
<jar/jar.{native,byte}>: pkg_lwt.syntax
<jar/jar.{native,byte}>: pkg_lwt.unix
<jar/jar.{native,byte}>: pkg_uri
Expand All @@ -85,6 +87,7 @@ true: annot, bin_annot
<jar/create_release.{native,byte}>: pkg_cohttp
<jar/create_release.{native,byte}>: pkg_cohttp.lwt
<jar/create_release.{native,byte}>: pkg_cohttp.lwt-core
<jar/create_release.{native,byte}>: pkg_lwt
<jar/create_release.{native,byte}>: pkg_lwt.syntax
<jar/create_release.{native,byte}>: pkg_lwt.unix
<jar/create_release.{native,byte}>: pkg_uri
Expand All @@ -99,6 +102,7 @@ true: annot, bin_annot
<jar/sync_releases.{native,byte}>: pkg_cohttp
<jar/sync_releases.{native,byte}>: pkg_cohttp.lwt
<jar/sync_releases.{native,byte}>: pkg_cohttp.lwt-core
<jar/sync_releases.{native,byte}>: pkg_lwt
<jar/sync_releases.{native,byte}>: pkg_lwt.syntax
<jar/sync_releases.{native,byte}>: pkg_lwt.unix
<jar/sync_releases.{native,byte}>: pkg_uri
Expand All @@ -113,6 +117,7 @@ true: annot, bin_annot
<jar/upload_release.{native,byte}>: pkg_cohttp
<jar/upload_release.{native,byte}>: pkg_cohttp.lwt
<jar/upload_release.{native,byte}>: pkg_cohttp.lwt-core
<jar/upload_release.{native,byte}>: pkg_lwt
<jar/upload_release.{native,byte}>: pkg_lwt.syntax
<jar/upload_release.{native,byte}>: pkg_lwt.unix
<jar/upload_release.{native,byte}>: pkg_uri
Expand All @@ -127,6 +132,7 @@ true: annot, bin_annot
<jar/list_releases.{native,byte}>: pkg_cohttp
<jar/list_releases.{native,byte}>: pkg_cohttp.lwt
<jar/list_releases.{native,byte}>: pkg_cohttp.lwt-core
<jar/list_releases.{native,byte}>: pkg_lwt
<jar/list_releases.{native,byte}>: pkg_lwt.syntax
<jar/list_releases.{native,byte}>: pkg_lwt.unix
<jar/list_releases.{native,byte}>: pkg_uri
Expand All @@ -141,6 +147,7 @@ true: annot, bin_annot
<jar/list_events.{native,byte}>: pkg_cohttp
<jar/list_events.{native,byte}>: pkg_cohttp.lwt
<jar/list_events.{native,byte}>: pkg_cohttp.lwt-core
<jar/list_events.{native,byte}>: pkg_lwt
<jar/list_events.{native,byte}>: pkg_lwt.syntax
<jar/list_events.{native,byte}>: pkg_lwt.unix
<jar/list_events.{native,byte}>: pkg_uri
Expand All @@ -155,12 +162,14 @@ true: annot, bin_annot
<jar/list_issues.{native,byte}>: pkg_cohttp
<jar/list_issues.{native,byte}>: pkg_cohttp.lwt
<jar/list_issues.{native,byte}>: pkg_cohttp.lwt-core
<jar/list_issues.{native,byte}>: pkg_lwt
<jar/list_issues.{native,byte}>: pkg_lwt.syntax
<jar/list_issues.{native,byte}>: pkg_lwt.unix
<jar/list_issues.{native,byte}>: pkg_uri
<jar/list_issues.{native,byte}>: pkg_yojson
<jar/list_issues.{native,byte}>: use_github_core
<jar/list_issues.{native,byte}>: use_github_unix
<jar/*.ml{,i,y}>: pkg_lwt.syntax
<jar/list_issues.{native,byte}>: custom
# Executable git-search
<jar/search.{native,byte}>: pkg_atdgen
Expand All @@ -169,7 +178,7 @@ true: annot, bin_annot
<jar/search.{native,byte}>: pkg_cohttp
<jar/search.{native,byte}>: pkg_cohttp.lwt
<jar/search.{native,byte}>: pkg_cohttp.lwt-core
<jar/search.{native,byte}>: pkg_lwt.syntax
<jar/search.{native,byte}>: pkg_lwt
<jar/search.{native,byte}>: pkg_lwt.unix
<jar/search.{native,byte}>: pkg_uri
<jar/search.{native,byte}>: pkg_yojson
Expand All @@ -181,7 +190,7 @@ true: annot, bin_annot
<jar/*.ml{,i,y}>: pkg_cohttp
<jar/*.ml{,i,y}>: pkg_cohttp.lwt
<jar/*.ml{,i,y}>: pkg_cohttp.lwt-core
<jar/*.ml{,i,y}>: pkg_lwt.syntax
<jar/*.ml{,i,y}>: pkg_lwt
<jar/*.ml{,i,y}>: pkg_lwt.unix
<jar/*.ml{,i,y}>: pkg_uri
<jar/*.ml{,i,y}>: pkg_yojson
Expand All @@ -196,6 +205,7 @@ true: annot, bin_annot
<gist/gist.{native,byte}>: pkg_cohttp.lwt
<gist/gist.{native,byte}>: pkg_cohttp.lwt-core
<gist/gist.{native,byte}>: pkg_lambda-term
<gist/gist.{native,byte}>: pkg_lwt
<gist/gist.{native,byte}>: pkg_lwt.syntax
<gist/gist.{native,byte}>: pkg_lwt.unix
<gist/gist.{native,byte}>: pkg_uri
Expand All @@ -209,6 +219,7 @@ true: annot, bin_annot
<gist/*.ml{,i,y}>: pkg_cohttp.lwt
<gist/*.ml{,i,y}>: pkg_cohttp.lwt-core
<gist/*.ml{,i,y}>: pkg_lambda-term
<gist/*.ml{,i,y}>: pkg_lwt
<gist/*.ml{,i,y}>: pkg_lwt.syntax
<gist/*.ml{,i,y}>: pkg_lwt.unix
<gist/*.ml{,i,y}>: pkg_uri
Expand All @@ -222,6 +233,7 @@ true: annot, bin_annot
<lib_test/current_user.{native,byte}>: pkg_cohttp
<lib_test/current_user.{native,byte}>: pkg_cohttp.lwt
<lib_test/current_user.{native,byte}>: pkg_cohttp.lwt-core
<lib_test/current_user.{native,byte}>: pkg_lwt
<lib_test/current_user.{native,byte}>: pkg_lwt.syntax
<lib_test/current_user.{native,byte}>: pkg_lwt.unix
<lib_test/current_user.{native,byte}>: pkg_uri
Expand All @@ -235,6 +247,7 @@ true: annot, bin_annot
<lib_test/get_token.{native,byte}>: pkg_cohttp
<lib_test/get_token.{native,byte}>: pkg_cohttp.lwt
<lib_test/get_token.{native,byte}>: pkg_cohttp.lwt-core
<lib_test/get_token.{native,byte}>: pkg_lwt
<lib_test/get_token.{native,byte}>: pkg_lwt.syntax
<lib_test/get_token.{native,byte}>: pkg_lwt.unix
<lib_test/get_token.{native,byte}>: pkg_uri
Expand All @@ -248,6 +261,7 @@ true: annot, bin_annot
<lib_test/repo_info.{native,byte}>: pkg_cohttp
<lib_test/repo_info.{native,byte}>: pkg_cohttp.lwt
<lib_test/repo_info.{native,byte}>: pkg_cohttp.lwt-core
<lib_test/repo_info.{native,byte}>: pkg_lwt
<lib_test/repo_info.{native,byte}>: pkg_lwt.syntax
<lib_test/repo_info.{native,byte}>: pkg_lwt.unix
<lib_test/repo_info.{native,byte}>: pkg_uri
Expand All @@ -261,6 +275,7 @@ true: annot, bin_annot
<lib_test/issues.{native,byte}>: pkg_cohttp
<lib_test/issues.{native,byte}>: pkg_cohttp.lwt
<lib_test/issues.{native,byte}>: pkg_cohttp.lwt-core
<lib_test/issues.{native,byte}>: pkg_lwt
<lib_test/issues.{native,byte}>: pkg_lwt.syntax
<lib_test/issues.{native,byte}>: pkg_lwt.unix
<lib_test/issues.{native,byte}>: pkg_uri
Expand All @@ -274,6 +289,7 @@ true: annot, bin_annot
<lib_test/tags.{native,byte}>: pkg_cohttp
<lib_test/tags.{native,byte}>: pkg_cohttp.lwt
<lib_test/tags.{native,byte}>: pkg_cohttp.lwt-core
<lib_test/tags.{native,byte}>: pkg_lwt
<lib_test/tags.{native,byte}>: pkg_lwt.syntax
<lib_test/tags.{native,byte}>: pkg_lwt.unix
<lib_test/tags.{native,byte}>: pkg_uri
Expand All @@ -287,6 +303,7 @@ true: annot, bin_annot
<lib_test/milestones.{native,byte}>: pkg_cohttp
<lib_test/milestones.{native,byte}>: pkg_cohttp.lwt
<lib_test/milestones.{native,byte}>: pkg_cohttp.lwt-core
<lib_test/milestones.{native,byte}>: pkg_lwt
<lib_test/milestones.{native,byte}>: pkg_lwt.syntax
<lib_test/milestones.{native,byte}>: pkg_lwt.unix
<lib_test/milestones.{native,byte}>: pkg_uri
Expand All @@ -300,6 +317,7 @@ true: annot, bin_annot
<lib_test/releases.{native,byte}>: pkg_cohttp
<lib_test/releases.{native,byte}>: pkg_cohttp.lwt
<lib_test/releases.{native,byte}>: pkg_cohttp.lwt-core
<lib_test/releases.{native,byte}>: pkg_lwt
<lib_test/releases.{native,byte}>: pkg_lwt.syntax
<lib_test/releases.{native,byte}>: pkg_lwt.unix
<lib_test/releases.{native,byte}>: pkg_uri
Expand All @@ -313,6 +331,7 @@ true: annot, bin_annot
<lib_test/deploy_keys.{native,byte}>: pkg_cohttp
<lib_test/deploy_keys.{native,byte}>: pkg_cohttp.lwt
<lib_test/deploy_keys.{native,byte}>: pkg_cohttp.lwt-core
<lib_test/deploy_keys.{native,byte}>: pkg_lwt
<lib_test/deploy_keys.{native,byte}>: pkg_lwt.syntax
<lib_test/deploy_keys.{native,byte}>: pkg_lwt.unix
<lib_test/deploy_keys.{native,byte}>: pkg_uri
Expand All @@ -326,6 +345,7 @@ true: annot, bin_annot
<lib_test/pulls.{native,byte}>: pkg_cohttp
<lib_test/pulls.{native,byte}>: pkg_cohttp.lwt
<lib_test/pulls.{native,byte}>: pkg_cohttp.lwt-core
<lib_test/pulls.{native,byte}>: pkg_lwt
<lib_test/pulls.{native,byte}>: pkg_lwt.syntax
<lib_test/pulls.{native,byte}>: pkg_lwt.unix
<lib_test/pulls.{native,byte}>: pkg_uri
Expand All @@ -339,6 +359,7 @@ true: annot, bin_annot
<lib_test/create_issue.{native,byte}>: pkg_cohttp
<lib_test/create_issue.{native,byte}>: pkg_cohttp.lwt
<lib_test/create_issue.{native,byte}>: pkg_cohttp.lwt-core
<lib_test/create_issue.{native,byte}>: pkg_lwt
<lib_test/create_issue.{native,byte}>: pkg_lwt.syntax
<lib_test/create_issue.{native,byte}>: pkg_lwt.unix
<lib_test/create_issue.{native,byte}>: pkg_uri
Expand All @@ -352,6 +373,7 @@ true: annot, bin_annot
<lib_test/create_milestone.{native,byte}>: pkg_cohttp
<lib_test/create_milestone.{native,byte}>: pkg_cohttp.lwt
<lib_test/create_milestone.{native,byte}>: pkg_cohttp.lwt-core
<lib_test/create_milestone.{native,byte}>: pkg_lwt
<lib_test/create_milestone.{native,byte}>: pkg_lwt.syntax
<lib_test/create_milestone.{native,byte}>: pkg_lwt.unix
<lib_test/create_milestone.{native,byte}>: pkg_uri
Expand All @@ -365,6 +387,7 @@ true: annot, bin_annot
<lib_test/create_pull.{native,byte}>: pkg_cohttp
<lib_test/create_pull.{native,byte}>: pkg_cohttp.lwt
<lib_test/create_pull.{native,byte}>: pkg_cohttp.lwt-core
<lib_test/create_pull.{native,byte}>: pkg_lwt
<lib_test/create_pull.{native,byte}>: pkg_lwt.syntax
<lib_test/create_pull.{native,byte}>: pkg_lwt.unix
<lib_test/create_pull.{native,byte}>: pkg_uri
Expand All @@ -378,6 +401,7 @@ true: annot, bin_annot
<lib_test/create_hook.{native,byte}>: pkg_cohttp
<lib_test/create_hook.{native,byte}>: pkg_cohttp.lwt
<lib_test/create_hook.{native,byte}>: pkg_cohttp.lwt-core
<lib_test/create_hook.{native,byte}>: pkg_lwt
<lib_test/create_hook.{native,byte}>: pkg_lwt.syntax
<lib_test/create_hook.{native,byte}>: pkg_lwt.unix
<lib_test/create_hook.{native,byte}>: pkg_uri
Expand All @@ -391,6 +415,7 @@ true: annot, bin_annot
<lib_test/delete_all_hooks.{native,byte}>: pkg_cohttp
<lib_test/delete_all_hooks.{native,byte}>: pkg_cohttp.lwt
<lib_test/delete_all_hooks.{native,byte}>: pkg_cohttp.lwt-core
<lib_test/delete_all_hooks.{native,byte}>: pkg_lwt
<lib_test/delete_all_hooks.{native,byte}>: pkg_lwt.syntax
<lib_test/delete_all_hooks.{native,byte}>: pkg_lwt.unix
<lib_test/delete_all_hooks.{native,byte}>: pkg_uri
Expand All @@ -404,6 +429,7 @@ true: annot, bin_annot
<lib_test/create_statuses.{native,byte}>: pkg_cohttp
<lib_test/create_statuses.{native,byte}>: pkg_cohttp.lwt
<lib_test/create_statuses.{native,byte}>: pkg_cohttp.lwt-core
<lib_test/create_statuses.{native,byte}>: pkg_lwt
<lib_test/create_statuses.{native,byte}>: pkg_lwt.syntax
<lib_test/create_statuses.{native,byte}>: pkg_lwt.unix
<lib_test/create_statuses.{native,byte}>: pkg_uri
Expand All @@ -417,13 +443,15 @@ true: annot, bin_annot
<lib_test/organizations.{native,byte}>: pkg_cohttp
<lib_test/organizations.{native,byte}>: pkg_cohttp.lwt
<lib_test/organizations.{native,byte}>: pkg_cohttp.lwt-core
<lib_test/organizations.{native,byte}>: pkg_lwt
<lib_test/organizations.{native,byte}>: pkg_lwt.syntax
<lib_test/organizations.{native,byte}>: pkg_lwt.unix
<lib_test/organizations.{native,byte}>: pkg_uri
<lib_test/organizations.{native,byte}>: pkg_yojson
<lib_test/organizations.{native,byte}>: use_github_core
<lib_test/organizations.{native,byte}>: use_github_unix
<lib_test/*.ml{,i,y}>: pkg_bytes
<lib_test/*.ml{,i,y}>: pkg_lwt.syntax
<lib_test/*.ml{,i,y}>: pkg_lwt.unix
<lib_test/*.ml{,i,y}>: use_github_unix
<lib_test/organizations.{native,byte}>: custom
Expand All @@ -433,7 +461,7 @@ true: annot, bin_annot
<lib_test/parse_events.{native,byte}>: pkg_cohttp
<lib_test/parse_events.{native,byte}>: pkg_cohttp.lwt
<lib_test/parse_events.{native,byte}>: pkg_cohttp.lwt-core
<lib_test/parse_events.{native,byte}>: pkg_lwt.syntax
<lib_test/parse_events.{native,byte}>: pkg_lwt
<lib_test/parse_events.{native,byte}>: pkg_uri
<lib_test/parse_events.{native,byte}>: pkg_yojson
<lib_test/parse_events.{native,byte}>: use_github_core
Expand All @@ -442,7 +470,7 @@ true: annot, bin_annot
<lib_test/*.ml{,i,y}>: pkg_cohttp
<lib_test/*.ml{,i,y}>: pkg_cohttp.lwt
<lib_test/*.ml{,i,y}>: pkg_cohttp.lwt-core
<lib_test/*.ml{,i,y}>: pkg_lwt.syntax
<lib_test/*.ml{,i,y}>: pkg_lwt
<lib_test/*.ml{,i,y}>: pkg_uri
<lib_test/*.ml{,i,y}>: pkg_yojson
<lib_test/*.ml{,i,y}>: use_github_core
Expand Down

0 comments on commit b172d81

Please sign in to comment.