Fix bashism in clean-xfd

The '[[' shell command is a bash-ism - and isn't supported by /bin/sh
and friends (e.g. /bin/dash on Debian-derived distros.

Replace with -(cd ns_server

Fix bashism in clean-xfd

The '[[' shell command is a bash-ism - and isn't supported by /bin/sh
and friends (e.g. /bin/dash on Debian-derived distros.

Replace with -(cd ns_server && <do cmd>)

Change-Id: I6fb19efad6decb24c99463d5f6a2927e2a22f06b
Reviewed-on: http://review.couchbase.org/59275
Tested-by: buildbot <build@couchbase.com>
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>

show more ...

CBD-1751: Support multiple versions of Go

Introduces "multi-go" mode and makes it the default. In this mode, all
GoInstall() targets may declare a GOVERSION (the default is set to 1.5.2

CBD-1751: Support multiple versions of Go

Introduces "multi-go" mode and makes it the default. In this mode, all
GoInstall() targets may declare a GOVERSION (the default is set to 1.5.2
currently). All desired Go compilers will be downloaded as part of the
build and cached locally in a manner similar to cbdeps.

The go compiler caches compiled go libraries in pkg/ directories. To
prevent collisions, each go version is given a separate pkg/ directory
in the build tree using the -pkgdir go option. Because Go 1.4.x did not
support this option (meaning 1.4 projects will all share the default
pkg/ directory), the build is limited to a single 1.4.x version of Go,
which is defined by the variable GO_14x_VERSION. Targets may specify
"GOVERSION 1.4.x" to use this version. Attempting to specify an explicit
version such as "GOVERSION 1.4.2" will result in a CMake error.

Change-Id: If82c3b78bd6774d408f2a3244d4d5bf2f8f60131
Reviewed-on: http://review.couchbase.org/59245
Tested-by: buildbot <build@couchbase.com>
Reviewed-by: Chris Hillery <ceej@couchbase.com>

show more ...

Skip cleaning ns_server if it doesn't exist

Recent changes to manifest allow checking out a subset of the
projects, which means that ns_server isn't necessarily always checked
out. U

Skip cleaning ns_server if it doesn't exist

Recent changes to manifest allow checking out a subset of the
projects, which means that ns_server isn't necessarily always checked
out. Update the 'clean-xfd' rule to only perform a `git clean` on
ns_server if it exists.

Change-Id: I45e873500052824e9ef6c75ac7b82e8113affde0
Reviewed-on: http://review.couchbase.org/59273
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: buildbot <build@couchbase.com>

show more ...

Fix geocouch-build-for-tests compilation

geocouch needs a special build step to run unit tests. On the master
branch it the `CMAKE_ARGS` variable doesn't contain the
`CMAKE_INSTALL_P

Fix geocouch-build-for-tests compilation

geocouch needs a special build step to run unit tests. On the master
branch it the `CMAKE_ARGS` variable doesn't contain the
`CMAKE_INSTALL_PREFIX` any longer, hence dependencies couldn't be
found.

Change-Id: Ic4d9a5395f24133fa4fadce12a3b55095a9f51a0
Reviewed-on: http://review.couchbase.org/58733
Tested-by: Volker Mische <volker.mische@gmail.com>
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: buildbot <build@couchbase.com>

show more ...

Move Couchbase defaults into CMakeLists.txt

Move some of the default values for the build from the wrapper
Makefile into CMake proper. This makes it simpler to invoke cmake
directly

Move Couchbase defaults into CMakeLists.txt

Move some of the default values for the build from the wrapper
Makefile into CMake proper. This makes it simpler to invoke cmake
directly (for example when you don't want/need to use NMake)

Change-Id: I2c013ee8f221920a38fc1533f247d77d087bf4aa
Reviewed-on: http://review.couchbase.org/55717
Tested-by: buildbot <build@couchbase.com>
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Reviewed-by: Chris Hillery <ceej@couchbase.com>

show more ...

MB-13931: Enhance "make clean" and add "make reset"

"make clean" now invokes the CMake "realclean" target first, which allows it to
remove in-source generated files in ns_server etc. It

MB-13931: Enhance "make clean" and add "make reset"

"make clean" now invokes the CMake "realclean" target first, which allows it to
remove in-source generated files in ns_server etc. It also explicitly deletes
the ns_server/build CMake directory.

"make reset" is a pass-through to the CMake "reset" target, which calls "git
clean -dfx" in all repo projects.

Change-Id: I52b759dde687d24ef0ec9388fe695a2557ef5f56
Reviewed-on: http://review.couchbase.org/53460
Tested-by: buildbot <build@couchbase.com>
Reviewed-by: Dave Rigby <daver@couchbase.com>

show more ...

Revert "Makefile: Allow building with generators other than Make"

With this commit parallel build options (-jN) are not getting passed
down to sub-makes correctly.

Reverting it

Revert "Makefile: Allow building with generators other than Make"

With this commit parallel build options (-jN) are not getting passed
down to sub-makes correctly.

Reverting it while I figure out an altenative implementaiton which
doesn't suffer from this issue.

This reverts commit 8416e2200bc52c75f3f66c63415398e386e11d9b.

Change-Id: I1dd40530b77b977e08eefc16b42f70dd1c8f2e8f
Reviewed-on: http://review.couchbase.org/53327
Tested-by: buildbot <build@couchbase.com>
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>

show more ...

Makefile: Allow building with generators other than Make

The top-level Makefile explicitly uses $(MAKE) to build with. While CMake
itself supports other build generators, the use of $(MA

Makefile: Allow building with generators other than Make

The top-level Makefile explicitly uses $(MAKE) to build with. While CMake
itself supports other build generators, the use of $(MAKE) in the Makefile
makes it difficult to use anything other than Make in our existing
infrasturcture.

Change to use whatever generator CMake was configured with.

Change-Id: Ia357111212b9b8a53984db5680d736662a3500e4
Reviewed-on: http://review.couchbase.org/53177
Tested-by: buildbot <build@couchbase.com>
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>

show more ...

CBD-1385: Set CMAKE_BUILD_TYPE to RelWithDebInfo by default

Also include notes mentioning that the Make-based build scripts are
unsupported by Couchbase build team.

Change-Id: I

CBD-1385: Set CMAKE_BUILD_TYPE to RelWithDebInfo by default

Also include notes mentioning that the Make-based build scripts are
unsupported by Couchbase build team.

Change-Id: Id1ebd55218f7b5be6b52f46fff455b68327feb83
Reviewed-on: http://review.couchbase.org/46623
Reviewed-by: Chris Hillery <ceej@couchbase.com>
Tested-by: Chris Hillery <ceej@couchbase.com>

show more ...

MB-13192: Build geocouch for unit tests with default parameters

Without using the default parameters the geocouch build for unit tests
won't find the correct escript.

Change-Id:

MB-13192: Build geocouch for unit tests with default parameters

Without using the default parameters the geocouch build for unit tests
won't find the correct escript.

Change-Id: I406276998dab802613d5859ce8ee0c8b4c734834
Reviewed-on: http://review.couchbase.org/45786
Reviewed-by: Dave Rigby <daver@couchbase.com>
Tested-by: Volker Mische <volker.mische@gmail.com>

show more ...

Fixup the copy rule for win32

Windows accept that you use / in the filename, but some commands
in a dos shell use /option causing the shell to print an error
if it finds / in the pat

Fixup the copy rule for win32

Windows accept that you use / in the filename, but some commands
in a dos shell use /option causing the shell to print an error
if it finds / in the path instead of \.

Change-Id: I1de003c32b025307fe6482913c798b77489e262e
Reviewed-on: http://review.couchbase.org/44184
Tested-by: buildbot <build@couchbase.com>
Reviewed-by: Dave Rigby <daver@couchbase.com>

show more ...

Nuke the go build stuff from make clean

Change-Id: I9421a6918dca83ee8894dcbdff501a93eb7d9bba
Reviewed-on: http://review.couchbase.org/44183
Tested-by: buildbot <build@couchbase.com>

Nuke the go build stuff from make clean

Change-Id: I9421a6918dca83ee8894dcbdff501a93eb7d9bba
Reviewed-on: http://review.couchbase.org/44183
Tested-by: buildbot <build@couchbase.com>
Reviewed-by: Dave Rigby <daver@couchbase.com>

show more ...

Only ns_server needs clean-dfxq

Change-Id: If63a0d276f92b8d452ca9f15e1f9c968d6b35840
Reviewed-on: http://review.couchbase.org/43669
Tested-by: buildbot <build@couchbase.com>
Revi

Only ns_server needs clean-dfxq

Change-Id: If63a0d276f92b8d452ca9f15e1f9c968d6b35840
Reviewed-on: http://review.couchbase.org/43669
Tested-by: buildbot <build@couchbase.com>
Reviewed-by: Dave Rigby <daver@couchbase.com>
Reviewed-by: Volker Mische <volker.mische@gmail.com>

show more ...

Add make target to build geocouch for unit tests

geocouch needs a special build in order to run unit tests. With the
make target `geocouch-build-for-testing` this build will be created

Add make target to build geocouch for unit tests

geocouch needs a special build in order to run unit tests. With the
make target `geocouch-build-for-testing` this build will be created
in a subdirectory called `geocouch-for-testing`. From within this
directory you can then run `make test` to run the unit tests.

Change-Id: I0d932bd80dd31f355e48cfa15d55fc8bfa3f6b95
Reviewed-on: http://review.couchbase.org/41992
Reviewed-by: Chris Hillery <ceej@couchbase.com>
Reviewed-by: Volker Mische <volker.mische@gmail.com>
Tested-by: Volker Mische <volker.mische@gmail.com>

show more ...

Add rules to update CMakeLists.txt, Makefile and GNUmakefile

The <copyfile> element in repo don't seem to be honored for
repo sync

Change-Id: Iceb484d20b298af17c2e5723a822d360d9

Add rules to update CMakeLists.txt, Makefile and GNUmakefile

The <copyfile> element in repo don't seem to be honored for
repo sync

Change-Id: Iceb484d20b298af17c2e5723a822d360d9ef92e5
Reviewed-on: http://review.couchbase.org/38864
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>

show more ...

Wordwrap to fit in a 80 column editor

Change-Id: Ifef46530b7a54cc9bcbd2f614888ff927edfbd40
Reviewed-on: http://review.couchbase.org/39009
Reviewed-by: Trond Norbye <trond.norbye@gmai

Wordwrap to fit in a 80 column editor

Change-Id: Ifef46530b7a54cc9bcbd2f614888ff927edfbd40
Reviewed-on: http://review.couchbase.org/39009
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>

show more ...

MB-11341: Add support for running Clang static analyser

Adds a `make analyze` convenience rule to run Clang's static analyzer
over the whole codebase. See README.markdown for more detail

MB-11341: Add support for running Clang static analyser

Adds a `make analyze` convenience rule to run Clang's static analyzer
over the whole codebase. See README.markdown for more details and full
instructions.

Change-Id: I5a2484729335e8f38417f17236a8a3b78c16d872
Reviewed-on: http://review.couchbase.org/37955
Reviewed-by: Chris Hillery <ceej@couchbase.com>
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>

show more ...

Allow for specifying alternate cmake

This allows to specify a different installation of cmake to use, for
systems which have an older version of cmake installed. Using the `make
CMAK

Allow for specifying alternate cmake

This allows to specify a different installation of cmake to use, for
systems which have an older version of cmake installed. Using the `make
CMAKE=/path/to/cmake-bin` syntax one may specify an alternate version of
CMake

Change-Id: I6c9338286882d6755f289a98ea1cc01d4cdf1275
Reviewed-on: http://review.couchbase.org/37609
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>

show more ...

MB-10701: Fix usage of CMAKE_PREFIX_PATH and other CMake find fixes
Change-Id: Ie55773573ab019ae295a25624bfb15e31c4374c8
Reviewed-on: http://review.couchbase.org/37378
Reviewed-by: Trond

MB-10701: Fix usage of CMAKE_PREFIX_PATH and other CMake find fixes
Change-Id: Ie55773573ab019ae295a25624bfb15e31c4374c8
Reviewed-on: http://review.couchbase.org/37378
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Chris Hillery <ceej@couchbase.com>

show more ...

Remove target dir as part of the clean target

Change-Id: I5819c99d3a6110eed3320456774d8eaf89a51c82
Reviewed-on: http://review.couchbase.org/37277
Reviewed-by: Chris Hillery <ceej@cou

Remove target dir as part of the clean target

Change-Id: I5819c99d3a6110eed3320456774d8eaf89a51c82
Reviewed-on: http://review.couchbase.org/37277
Reviewed-by: Chris Hillery <ceej@couchbase.com>
Tested-by: Chris Hillery <ceej@couchbase.com>

show more ...

Clean up couchdb too to prevent test_util.erl build breaks
Change-Id: I07aeda0e45fdd3091dd647f336d8108b36da60e5
Reviewed-on: http://review.couchbase.org/37013
Reviewed-by: Eric Limare <er

Clean up couchdb too to prevent test_util.erl build breaks
Change-Id: I07aeda0e45fdd3091dd647f336d8108b36da60e5
Reviewed-on: http://review.couchbase.org/37013
Reviewed-by: Eric Limare <eric.limare@couchbase.com>
Reviewed-by: Chris Hillery <ceej@couchbase.com>
Tested-by: Chris Hillery <ceej@couchbase.com>

show more ...

Fixup problems with space in pwd

Change-Id: I3884a2fa97126d065fb24a3fc63fdfa9c5db471c
Reviewed-on: http://review.couchbase.org/35501
Reviewed-by: Trond Norbye <trond.norbye@gmail.com

Fixup problems with space in pwd

Change-Id: I3884a2fa97126d065fb24a3fc63fdfa9c5db471c
Reviewed-on: http://review.couchbase.org/35501
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>

show more ...

Set the default build type to Debug

May be overridden with BUILD_TYPE set to:
Debug, Release, RelWithDebInfo or MinSizeRel

Additional options may be passed as:
EXTRA_CMA

Set the default build type to Debug

May be overridden with BUILD_TYPE set to:
Debug, Release, RelWithDebInfo or MinSizeRel

Additional options may be passed as:
EXTRA_CMAKE_OPTIONS

Change-Id: I3047cc97f0c398e9a13866f981ef5d4330490a58
Reviewed-on: http://review.couchbase.org/35488
Reviewed-by: Chris Hillery <ceej@couchbase.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>

show more ...

Pass through PRODUCT_VERSION

Change-Id: Ia2576b4b449393c9649437ef6020d716fbdcc8c6
Reviewed-on: http://review.couchbase.org/35420
Reviewed-by: Eric Limare <eric.limare@couchbase.com>

Pass through PRODUCT_VERSION

Change-Id: Ia2576b4b449393c9649437ef6020d716fbdcc8c6
Reviewed-on: http://review.couchbase.org/35420
Reviewed-by: Eric Limare <eric.limare@couchbase.com>
Reviewed-by: Chris Hillery <ceej@couchbase.com>
Tested-by: Chris Hillery <ceej@couchbase.com>

show more ...

Add dependency for build/Makefile for compile

Change-Id: Iab2c8ec53a6d0f97ae84b544626a320748ae756a
Reviewed-on: http://review.couchbase.org/35361
Reviewed-by: Volker Mische <volker.m

Add dependency for build/Makefile for compile

Change-Id: Iab2c8ec53a6d0f97ae84b544626a320748ae756a
Reviewed-on: http://review.couchbase.org/35361
Reviewed-by: Volker Mische <volker.mische@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>

show more ...