[
https://issues.apache.org/jira/browse/COUCHDB-3300?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15868249#comment-15868249
]
Paul Joseph Davis commented on COUCHDB-3300:
--------------------------------------------
Here's the patch I needed to make things compile:
https://gist.github.com/davisp/218c17a96886f05dc4e0e6b5fef99f4c
(pasted below as well)
Also, this patch to setup to fix a search path:
https://git-wip-us.apache.org/repos/asf?p=couchdb-setup.git;a=blobdiff;f=src/setup.erl;h=085decce63ed5243c3792692ea109036850e21a2;hp=b27c6c63dca63d1032cd937b6c85a547c65b789a;hb=bdf96f926952071c5b8b7b04d6c4de932aee6d65;hpb=e8d1e32ba3b4f5f3be0e06e5269b12d811f24d52
{code}
commit 6bfc236edea2ac9e285517056dabeaf67f7cd7f7
Author: Paul J. Davis <paul.joseph.da...@gmail.com>
Date: Wed Feb 15 11:46:31 2017 -0600
Fix rebar configuration after repository merge
diff --git a/rebar.config.script b/rebar.config.script
index 85d5c94fc..9770a3f6c 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -21,42 +21,52 @@ 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",
"ad803f66dbd1900b67543259142875a6d03503ce"},
-{chttpd, "chttpd",
"cb0f20ea0898cd24ff8ac0617b326874088d9157"},
-{couch, "couch",
"66292dbdfee1a6d5981085d7e50751feacf860c8"},
-{couch_index, "couch-index",
"f0a6854e578469612937a766632fdcdc52ee9c65"},
-{couch_mrview, "couch-mrview",
"e1d13a983a0ba56fcb1eb31c4e4fe56bc3692719"},
-{couch_replicator, "couch-replicator",
"648e465f54f538a133fb31c9b1e3b487a6f2ca7c"},
-{couch_plugins, "couch-plugins",
"3e73b723cb126cfc471b560d17c24a8b5c540085"},
-{couch_event, "couch-event",
"7e382132219d708239306aa3591740694943d367"},
-{couch_stats, "couch-stats",
"7895d4d3f509ed24f09b6d1a0bd0e06af34551dc"},
-{couch_peruser, "peruser",
"4eea9571171a5b41d832da32204a1122a01f4b0e"},
-{couch_tests, "erlang-tests",
"37b3bfeb4b1a48a592456e67991362e155ed81e0"},
-{docs, "documentation",
"59a887a97f9b6befc6de0c5bdaf17d79fb7f915d", [raw]},
-{ddoc_cache, "ddoc-cache",
"c762e90a33ce3cda19ef142dd1120f1087ecd876"},
{ets_lru, "ets-lru",
"c05488c8b1d7ec1c3554a828e0c9bf2888932ed6"},
-{fabric, "fabric",
"ec2235196d7195afab59cedc2d61a02b11596ab4"},
+{ioq, "ioq",
"1d2b149ee12dfeaf8d89a67b2f937207f4c5bdf2"},
+{khash, "khash",
"7c6a9cd9776b5c6f063ccafedfa984b00877b019"},
+{snappy, "snappy",
"a728b960611d0795025de7e9668d06b9926c479d"},
+{setup, "setup",
"e8d1e32ba3b4f5f3be0e06e5269b12d811f24d52"},
+
+%% Non-Erlang deps
+{docs, "documentation",
"59a887a97f9b6befc6de0c5bdaf17d79fb7f915d", [raw]},
{fauxton, "fauxton", {tag, "v1.1.9"}, [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/";,
@@ -78,9 +88,9 @@ AddConfig = [
{require_otp_vsn, "R16B03|R16B03-1|17|18|19"},
{deps_dir, "src"},
{deps, lists:map(MakeDep, DepDescs)},
- {sub_dirs, ["rel"]},
+ {sub_dirs, SubDirs},
{lib_dirs, ["src/"]},
- {erl_opts, [debug_info]},
+ {erl_opts, [debug_info, {i, "../"}]},
{eunit_opts, [verbose]},
{plugins, [eunit_plugin]},
{dialyzer, [
diff --git a/src/couch/rebar.config.script b/src/couch/rebar.config.script
index 8d4409905..feb2fe304 100644
--- a/src/couch/rebar.config.script
+++ b/src/couch/rebar.config.script
@@ -136,7 +136,8 @@ AddConfig = [
{port_specs, PortSpecs},
{erl_opts, [
{platform_define, "win32", 'WINDOWS'},
- {d, 'COUCHDB_VERSION', Version}
+ {d, 'COUCHDB_VERSION', Version},
+ {i, "../"}
]},
{eunit_compile_opts, [{platform_define, "win32", 'WINDOWS'}]}
].
{code}
> Merge all apps that can't be used externally
> --------------------------------------------
>
> Key: COUCHDB-3300
> URL: https://issues.apache.org/jira/browse/COUCHDB-3300
> Project: CouchDB
> Issue Type: Improvement
> Reporter: Paul Joseph Davis
>
> Managing a whole bunch of repos isn't fun. Most of our repos aren't really
> useful outside of CouchDB so we're looking to merge them into the main
> repository while still leaving our generally useful apps as standalone
> repositories. Here's the current list of how we're categorizing repos:
> *monorepo*
> chttpd
> couch
> couch_epi
> couch_event
> couch_index
> couch_log
> couch_mrview
> couch_peruser
> couch_plugins
> couch_replicator
> couch_stats
> couch_tests
> ddoc_cache
> fabric
> global_changes
> mango
> mem3
> rexi
> *independent life cycle*
> fauxton
> docs
> setup
> *deprecated*
> oauth
> *standalone*
> config
> ets_lru
> khash
> b64url
> snappy
> ioq
> *third-party*
> jiffy
> rebar
> bear
> folsom
> meck
> mochiweb
> ibrowse
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
