Skip to content

Commit f163609

Browse files
ceejatecceejatec
committed
Cool new manifest features: private projects, annotations, and overrides, oh my!
Change-Id: Ife651e0f004763527fd1334eba10cd43d20b5035 Reviewed-on: http://review.couchbase.org/42201 Reviewed-by: Chris Hillery <ceej@couchbase.com> Tested-by: Chris Hillery <ceej@couchbase.com>
1 parent 3d9568a commit f163609

File tree

1 file changed

+36
-11
lines changed

1 file changed

+36
-11
lines changed

‎toy/toy-ceej.xml

+36-11
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<manifest>
33
<remote name="couchbase" fetch="git://github.com/couchbase/" review="review.couchbase.org" />
4+
<remote name="couchbase-priv" fetch="ssh://git@github.com/couchbase/" review="review.couchbase.org" />
45
<remote name="couchbaselabs" fetch="ssh://git@github.com/couchbaselabs/" />
56
<remote name="membase" fetch="git://github.com/membase/" review="review.couchbase.org" />
6-
<remote name="t3rm1n4l" fetch="git://github.com/t3rm1n4l/" />
7+
<remote name="membase-priv" fetch="ssh://git@github.com/membase/" review="review.couchbase.org" />
78
<remote name="prataprc" fetch="git://github.com/prataprc/" />
89
<remote name="dustin" fetch="git://github.com/dustin/" />
910
<remote name="gorilla" fetch="git://github.com/gorilla/" />
1011
<remote name="sbinet" fetch="git://github.com/sbinet/" />
1112
<remote name="ceejatec" fetch="git://github.com/ceejatec/" />
13+
<remote name="erlang" fetch="git://github.com/erlang/" />
1214

1315
<default remote="couchbase" revision="master" />
1416

17+
<!-- Core Couchbase Server projects -->
1518
<project name="couchbase-cli" />
1619
<project name="couchbase-examples" />
1720
<project name="couchbase-python-client" revision="couchbase-181" />
@@ -27,10 +30,19 @@
2730
<project name="platform" />
2831
<project name="sigar" />
2932
<project name="testrunner" />
33+
<project name="tlm" remote="ceejatec">
34+
<copyfile src="GNUmakefile" dest="GNUmakefile" />
35+
<copyfile src="Makefile" dest="Makefile" />
36+
<copyfile src="CMakeLists.txt" dest="CMakeLists.txt" />
37+
</project>
3038

31-
<project name="indexing-build-scripts" remote="t3rm1n4l" />
32-
<project name="gomemcached" path="godeps/src/github.com/couchbase/gomemcached"/>
39+
<!-- Sherlock extension projects -->
40+
<project name="forestdb" remote="ceejatec" />
41+
<project name="indexing" path="goproj/src/github.com/couchbase/indexing" />
42+
<project name="tuqtng" remote="ceejatec" path="goproj/src/github.com/couchbaselabs/tuqtng"/>
3343

44+
<!-- Go support libraries - Couchbase-supported -->
45+
<project name="gomemcached" path="godeps/src/github.com/couchbase/gomemcached"/>
3446
<project name="goprotobuf" remote="couchbaselabs" path="godeps/src/code.google.com/p/goprotobuf"/>
3547
<project name="goprotobuf" remote="couchbaselabs" path="godeps/src/github.com/couchbaselabs/goprotobuf"/>
3648
<project name="collatejson" remote="prataprc" path="godeps/src/github.com/prataprc/collatejson"/>
@@ -40,20 +52,33 @@
4052
<project name="clog" remote="couchbaselabs" path="godeps/src/github.com/couchbaselabs/clog" />
4153
<project name="go-slab" remote="couchbaselabs" path="godeps/src/github.com/couchbaselabs/go-slab" />
4254
<project name="goforestdb" remote="couchbaselabs" path="godeps/src/github.com/couchbaselabs/goforestdb" />
55+
56+
<!-- Go support libraries - third-party -->
4357
<project name="go-jsonpointer" remote="dustin" path="godeps/src/github.com/dustin/go-jsonpointer"/>
4458
<project name="gojson" remote="dustin" path="godeps/src/github.com/dustin/gojson" />
4559
<project name="mux" remote="gorilla" path="godeps/src/github.com/gorilla/mux" />
4660
<project name="context" remote="gorilla" path="godeps/src/github.com/gorilla/context" />
4761
<project name="liner" remote="sbinet" path="godeps/src/github.com/sbinet/liner" />
4862

49-
<project name="forestdb" remote="ceejatec" />
50-
<project name="indexing" path="goproj/src/github.com/couchbase/indexing" />
51-
<project name="tuqtng" remote="ceejatec" path="goproj/src/github.com/couchbaselabs/tuqtng"/>
63+
<!-- Non-Go third-party libraries (should eventually be removed from manifest) -->
64+
<project name="otp" path="otp" revision="refs/tags/OTP_R16B03-1" remote="erlang" groups="notdefault,3rdparty" />
65+
<project name="icu4c" path="icu4c" revision="26359393672c378f41f2103a8699c4357c894be7" groups="notdefault,3rdparty" />
66+
<project name="snappy" path="snappy" revision="009c4325f40e04700ca7956e866ad342f020e214" groups="notdefault,3rdparty" />
67+
<project name="gperftools" path="gperftools" revision="refs/tags/gperftools-2.2" groups="notdefault,3rdparty" />
68+
<project name="pysqlite" path="pysqlite" revision="master" groups="notdefault,3rdparty" />
69+
<project name="v8" path="v8" revision="3.21.17-couchbase" groups="notdefault,3rdparty" />
70+
<!-- Following two are v8 dependencies -->
71+
<project name="gyp" path="v8/build/gyp" revision="couchbase-v8-3.21.17" groups="notdefault,3rdparty" />
72+
<project name="icu46" path="v8/third_party/icu" revision="73170776491a3e38f68ab0367f3121256a3cc289" groups="notdefault,3rdparty" />
73+
<project name="python-snappy" path="python-snappy" revision="master" groups="notdefault,3rdparty" />
5274

53-
<project name="tlm" remote="ceejatec">
54-
<copyfile src="GNUmakefile" dest="GNUmakefile" />
55-
<copyfile src="Makefile" dest="Makefile" />
56-
<copyfile src="CMakeLists.txt" dest="CMakeLists.txt" />
75+
<!-- Couchbase internal build infrastructure -->
76+
<project name="build" path="cbbuild" groups="notdefault,build">
77+
<annotation name="BLD_NUM" value="@BLD_NUM@" keep="true"/>
78+
<annotation name="RELEASE" value="@RELEASE@" keep="true"/>
79+
<annotation name="EDITION" value="@EDITION@" keep="true"/>
5780
</project>
58-
81+
<project name="voltron" remote="couchbase-priv" groups="notdefault,build" />
82+
<project name="grommit" remote="membase-priv" groups="notdefault,build" />
5983
</manifest>
84+

0 commit comments

Comments
 (0)