feat: monorepo fixes

1 files changed, 42 insertions, 32 deletions

diff --git a/rebar.config.script b/rebar.config.script
index bf5cf55e5..75f3631e9 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -21,47 +21,57 @@ os:putenv("COUCHDB_CONFIG", ConfigureEnv).
 
 os:putenv("COUCHDB_APPS_CONFIG_DIR", filename:join([COUCHDB_ROOT, "rel/apps"])).
 
+SubDirs = [
+    %% must be compiled first as it has a custom behavior
+    "src/couch_epi",
+    "src/couch_log",
+    "src/chttpd",
+    "src/couch",
+    "src/couch_index",
+    "src/couch_mrview",
+    "src/couch_replicator",
+    "src/couch_plugins",
+    "src/couch_event",
+    "src/couch_stats",
+    "src/couch_peruser",
+    "src/couch_tests",
+    "src/ddoc_cache",
+    "src/fabric",
+    "src/global_changes",
+    "src/mango",
+    "src/mem3",
+    "src/rexi",
+    "rel"
+],
+
 DepDescs = [
-%% must be compiled first as it has a custom behavior
-{couch_epi,        "couch-epi",        "60e7f808513b2611eb412cf641d6e7132dda2a30"},
+%% Independent Apps
 {config,           "config",           "f62d553b337ce975edb0fb68772d22bdd3bf6490"},
-%% keep these sorted
 {b64url,           "b64url",           "6895652d80f95cdf04efb14625abed868998f174"},
-{couch_log,        "couch-log",        "194db1adeafd9d5b434ae22b06aecdcb8635863e"},
-{chttpd,           "chttpd",           "74002101513c03df74a4c25f3c892f5d003fa5da"},
-{couch,            "couch",            "21c8d37ac6ee1a7fed1de1f54f95a4d3cd9f5248"},
-{couch_index,      "couch-index",      "f0a6854e578469612937a766632fdcdc52ee9c65"},
-{couch_mrview,     "couch-mrview",     "3c70ae90ba6b45fb86641b88fca0d88059121d34"},
-{couch_replicator, "couch-replicator", "d00b981445c03622497088eb872059ab4f48b298"},
-{couch_plugins,    "couch-plugins",    "3e73b723cb126cfc471b560d17c24a8b5c540085"},
-{couch_event,      "couch-event",      "7e382132219d708239306aa3591740694943d367"},
-{couch_stats,      "couch-stats",      "7895d4d3f509ed24f09b6d1a0bd0e06af34551dc"},
-{couch_peruser,    "peruser",          "4eea9571171a5b41d832da32204a1122a01f4b0e"},
-{couch_tests,       "erlang-tests",    "37b3bfeb4b1a48a592456e67991362e155ed81e0"},
+{ets_lru,          "ets-lru",          "c05488c8b1d7ec1c3554a828e0c9bf2888932ed6"},
+{khash,            "khash",            "7c6a9cd9776b5c6f063ccafedfa984b00877b019"},
+{snappy,           "snappy",           "a728b960611d0795025de7e9668d06b9926c479d"},
+{setup,            "setup",            "e8d1e32ba3b4f5f3be0e06e5269b12d811f24d52"},
+{ioq,              "ioq",              "1d2b149ee12dfeaf8d89a67b2f937207f4c5bdf2"},
+
+%% Non-Erlang deps
 {docs,             {url, "https://github.com/apache/couchdb-documentation"},
                    "3b15a7cb5e1958bc71ac865b56d3081ab43f5942", [raw]},
-{ddoc_cache,       "ddoc-cache",       "c762e90a33ce3cda19ef142dd1120f1087ecd876"},
-{ets_lru,          "ets-lru",          "c05488c8b1d7ec1c3554a828e0c9bf2888932ed6"},
-{fabric,           "fabric",           "ce62148d0a4469751d8078cc223684da29b5d4a7"},
 {fauxton,          {url, "https://github.com/apache/couchdb-fauxton"},
-                   {tag, "v1.1.11"}, [raw]},
+                  {tag, "v1.1.11"}, [raw]},
+%% Third party deps
 {folsom,           "folsom",           "a5c95dec18227c977029fbd3b638966d98f17003"},
-{global_changes,   "global-changes",   "f6e4c5629a7d996d284e4489f1897c057823f846"},
 {ibrowse,          "ibrowse",          "4af2d408607874d124414ac45df1edbe3961d1cd"},
-{ioq,              "ioq",              "1d2b149ee12dfeaf8d89a67b2f937207f4c5bdf2"},
 {jiffy,            "jiffy",            "d3c00e19d8fa20c21758402231247602190988d3"},
-{khash,            "khash",            "7c6a9cd9776b5c6f063ccafedfa984b00877b019"},
-{mango,            "mango",            "4afd60e84d0e1c57f5d6a1e3542955faa565ca4b"},
-{mem3,             "mem3",             "c3c5429180de14a2b139f7741c934143ef73988c"},
 {mochiweb,         "mochiweb",         "bd6ae7cbb371666a1f68115056f7b30d13765782"},
-{oauth,            "oauth",            "099057a98e41f3aff91e77e3cf496d6c6fd901df"},
-{rexi,             "rexi",             "a327b7dbeb2b0050f7ca9072047bf8ef2d282833"},
-{snappy,           "snappy",           "a728b960611d0795025de7e9668d06b9926c479d"},
-{setup,            "setup",            "e8d1e32ba3b4f5f3be0e06e5269b12d811f24d52"},
-{meck,             "meck",             {tag, "0.8.2"}}
+{meck,             "meck",             {tag, "0.8.2"}},
+
+%% Deprecated
+{oauth,            "oauth",            "099057a98e41f3aff91e77e3cf496d6c6fd901df"}
 ],
 
-BaseUrl = "https://git-wip-us.apache.org/repos/asf/",
+
+BaseUrl = "https://github.com/apache/",
 
 MakeDep = fun
     ({AppName, {url, Url}, Version}) ->
@@ -80,9 +90,9 @@ AddConfig = [
     {require_otp_vsn, "R16B03|R16B03-1|17|18|19"},
     {deps_dir, "src"},
     {deps, lists:map(MakeDep, DepDescs)},
-    {sub_dirs, ["rel"]},
-    {lib_dirs, ["src/"]},
-    {erl_opts, [debug_info]},
+    {sub_dirs, SubDirs},
+    {lib_dirs, ["src"]},
+    {erl_opts, [debug_info, {i, "../"}]},
     {eunit_opts, [verbose]},
     {plugins, [eunit_plugin]},
     {dialyzer, [