On Fri, Jan 31, 2014 at 6:31 PM, Robert Samuel Newson <[email protected]>wrote:
> Hi, > > Yes, I started with that, but it can't build the code we have on this > branch. We are converging, though. > > B. > > np at all was asking. I will be back on that topic next week after the FOSDEM. I wanted to also start to merge some optimisations from bigcouch. Maybe a good time to have a meeting (skype,hangout,irc) between core dev? - benoit > On 31 Jan 2014, at 17:17, Benoit Chesneau <[email protected]> wrote: > > > I'm confused. Such thing is already in the rcouch branch. Shouldn't we > > start rather to work on the branch merging both project? > > > > > > > > > > On Fri, Jan 31, 2014 at 6:14 PM, <[email protected]> wrote: > > > >> Remove last trace of scons > >> > >> > >> Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo > >> Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/4d6c7bfd > >> Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/4d6c7bfd > >> Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/4d6c7bfd > >> > >> Branch: refs/heads/1843-feature-bigcouch-couchjs > >> Commit: 4d6c7bfd062742e4475e07392ccd38515247cc64 > >> Parents: 35ca20b > >> Author: Robert Newson <[email protected]> > >> Authored: Thu Jan 30 18:42:36 2014 +0000 > >> Committer: Robert Newson <[email protected]> > >> Committed: Thu Jan 30 18:42:36 2014 +0000 > >> > >> ---------------------------------------------------------------------- > >> Makefile | 4 ---- > >> 1 file changed, 4 deletions(-) > >> ---------------------------------------------------------------------- > >> > >> > >> http://git-wip-us.apache.org/repos/asf/couchdb/blob/4d6c7bfd/Makefile > >> ---------------------------------------------------------------------- > >> diff --git a/Makefile b/Makefile > >> index 0e84f2c..c43df2b 100644 > >> --- a/Makefile > >> +++ b/Makefile > >> @@ -13,8 +13,6 @@ > >> all: compile > >> > >> compile: rebar > >> - @echo "==> couchjs (compile)" > >> -# @cd couchjs && python scons/scons.py $(couchjsflags) > >> @./rebar compile > >> > >> rebar: > >> @@ -22,8 +20,6 @@ rebar: > >> @cd src/rebar && make && cp rebar ../.. > >> > >> clean: > >> - @echo "==> couchjs (clean)" > >> -# @cd couchjs && python scons/scons.py --clean > >> @./rebar clean > >> > >> dist: compile > >> > >> > >
