Travis uses gclient.

Author: AlCutter

.travis.yml

@@ -1,47 +1,100 @@
+sudo: false
 
 language: cpp
 
-compiler:
- - clang
-
 env:
- - GOPATH=${TRAVIS_BUILD_DIR}/go CPPFLAGS="-I/usr/src/gmock/include" CXXFLAGS="-Wall -Werror"
+  global:
+    - INSTALL_DIR=${TRAVIS_BUILD_DIR}/../install
+    - PROTOC="${INSTALL_DIR}/bin/protoc"
+    - GOPATH=${INSTALL_DIR}/go
+    - MAKE=make
+
+addons:
+  apt:
+    sources: &common_sources
+      - ubuntu-toolchain-r-test
+      - llvm-toolchain-precise-3.6
+    packages: &common_packages
+      - autoconf
+      - automake
+      - build-essential
+      - python-dev
+      - libstdc++-4.9-dev
+      - tcl8.5
+
+matrix:
+  include:
+    - compiler: clang
+      os: osx
+    - compiler: clang
+      os: linux
+      env: REAL_CC=clang-3.6 REAL_CXX=clang++-3.6
+      addons:
+        apt:
+          sources: *common_sources
+          packages:
+          - *common_packages
+          - clang-3.6
+  exclude:
+    - compiler: gcc
+      os: linux
+      env: REAL_CC=gcc-4.9 REAL_CXX=g++-4.9
+      addons:
+        apt:
+          sources: *common_sources
+          packages:
+          - *common_packages
+          - g++-4.9
+
+cache:
+  apt: true
+  pip: true
+  directories:
+    - $HOME/.cache/pip
+    - $HOME/.ccache
+    - $TRAVIS_BUILD_DIR/../ct
+    - $TRAVIS_BUILD_DIR/../depot_tools
+    - $TRAVIS_BUILD_DIR/../install
 
-cache: apt
 
 before_install:
- - sudo apt-add-repository -y ppa:sao/backports
- - sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test
- - sudo apt-add-repository -y ppa:fcitx-team/nightly
- - sudo apt-add-repository -y ppa:chris-lea/protobuf
- - sudo apt-add-repository -y ppa:asolovets/backports
- - sudo apt-get update -qq
- - sudo apt-get install -qq openssl libssl-dev autoconf automake protobuf-compiler libprotobuf-java libprotobuf-dev python-dev libjson-c-dev libgoogle-glog-dev libgflags-dev libldns-dev libstdc++-4.8-dev libleveldb-dev libsnappy-dev libgoogle-perftools-dev
-# Stupid frikkin' google-mock package on Precise is b0rked, so hack it up:
- - wget https://googlemock.googlecode.com/files/gmock-1.7.0.zip -O /tmp/gmock-1.7.0.zip
- - unzip -d /tmp /tmp/gmock-1.7.0.zip
- - sudo mv /tmp/gmock-1.7.0 /usr/src/gmock
- - wget https://github.com/ellzey/libevhtp/archive/1.2.10.zip -O /tmp/libevhtp-1.2.10.zip
- - unzip -d /tmp/ /tmp/libevhtp-1.2.10.zip
- - mkdir /tmp/libevhtp-1.2.10/build
- - pushd /tmp/libevhtp-1.2.10/build && cmake -DEVHTP_DISABLE_REGEX:STRING=ON -DCMAKE_C_FLAGS="-fPIC" .. && sudo make install; popd
- - sudo pip install -r python/requirements.txt
- - sudo ln -s protobuf-java.jar /usr/share/java/protobuf.jar
+# Set compiler version overrides if we have any:
+ - if [ "${REAL_CC}" != "" ]; then export CC=${REAL_CC} CXX=${REAL_CXX}; fi
+ - if [ "$TRAVIS_OS_NAME" == "osx" ]; then . ./build/travis.osx.before_install.sh; fi
+ - mkdir -p ${INSTALL_DIR}/include ${INSTALL_DIR}/lib ${INSTALL_DIR}/java
+ - echo "INSTALL_DIR=${INSTALL_DIR}"
  - mkdir -p $GOPATH/src/github.com/google
- - ln -s $PWD $GOPATH/src/github.com/google
+ - ln -sf $PWD $GOPATH/src/github.com/google
+ - echo "jars.protobuf = ${INSTALL_DIR}/java/protobuf.jar" > local.properties
+ - echo "protoc.bin = ${PROTOC}" >> local.properties
+
+install:
+ - autoconf --version
+ - pushd ..
+ - mkdir -p ct
+ - wget http://central.maven.org/maven2/com/google/protobuf/protobuf-java/2.6.0/protobuf-java-2.6.0.jar -O ${INSTALL_DIR}/java/protobuf.jar
+ - if [ ! -e depot_tools/gclient ]; then git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git; fi
+ - export PATH="$PATH:/usr/local/bin:"`pwd`/depot_tools
+ - cd ct
+ - ln -s ../certificate-transparency certificate-transparency
+ - if [ ! -f .gclient ]; then gclient config --name="certificate-transparency" --unmanaged https://github.com/${TRAVIS_REPO_SLUG}.git; fi
+ - gclient sync
+ - popd
+ - export PYTHONPATH=$(python -m site --user-site)
+ - pip install --user --upgrade -r python/requirements.txt
 # Sigh, go get -t will fetch part of this package, but doesn't catch the transitive deps so grab it manually:
  - go get github.com/stretchr/testify
  - go get -v -d -t ./...
- - java -version
- - javac -version
- - go version
- - openssl version
-
-install:
- - ./autogen.sh
 
 script:
- - ./configure && make -j$(getconf _NPROCESSORS_ONLN) check VERBOSE=1
+ - getconf _NPROCESSORS_ONLN
+ - ${MAKE} -j$(getconf _NPROCESSORS_ONLN) check VERBOSE=1
  - ant build test
- - make -C python test
- - go test -v ./go/...
+ - ${MAKE} -C python test
+ - |
+   if [ "$TRAVIS_OS_NAME" != "osx" ]; then
+     pushd ${GOPATH}
+     LD_LIBRARY_PATH=${INSTALL_DIR}/lib CGO_CPPFLAGS="-I${INSTALL_DIR}/include" CGO_LDFLAGS="-L${INSTALL_DIR}/lib" go test -v ./src/github.com/google/certificate-transparency/...
+   popd
+   fi
+

DEPS

@@ -1,17 +1,16 @@
 deps = {
      "gflags":  	 			 "https://github.com/gflags/gflags.git@v2.1.2",
-     "glog": 			 			 "https://github.com/google/glog.git@v0.3.4",
-     "gperftools": 			 "https://github.com/gperftools/gperftools.git@gperftools-2.4",
+     "glog":             "https://github.com/benlaurie/glog.git@0.3.4-fix",
      "googlemock": 			 "https://github.com/google/googlemock.git@release-1.7.0",
      "googlemock/gtest": "https://github.com/google/googletest.git@release-1.7.0",
-     "json-c": 					 "https://github.com/json-c/json-c.git@json-c-0.12-20140410",
-     "ldns": 						 "git://git.nlnetlabs.nl/ldns@release-1.6.17",
+     "json-c": 					 "https://github.com/AlCutter/json-c.git@json-c-0.12-20140410-fix",
+     "ldns":             "https://github.com/benlaurie/ldns.git@1.6.17-fix",
      "leveldb": 				 "https://github.com/google/leveldb.git@v1.18",
      "libevent": 				 "https://github.com/libevent/libevent.git@release-2.0.22-stable",
      "libevhtp": 				 "https://github.com/ellzey/libevhtp.git@ba4c44eed1fb7a5cf8e4deb236af4f7675cc72d5",
-     "openssl": 				 "https://github.com/benlaurie/openssl.git@fd5d2ba5e09f86e9ccf797dddd2d09ac8e197e35", # 1.0.2-freebsd
-     "protobuf/gtest": 	 "https://github.com/google/googletest.git@release-1.5.0",
-     "protobuf": 			 	 "https://github.com/google/protobuf.git@v2.6.1",
+     "openssl": 				 "https://github.com/openssl/openssl.git@OpenSSL_1_0_2d",
+     "protobuf":         "https://github.com/google/protobuf.git@v2.6.1",
+     "protobuf/gtest":   "https://github.com/google/googletest.git@release-1.7.0",
      # Randomly chosen github mirror
      "sqlite3-export": 	 "http://repo.or.cz/sqlite-export.git",
      "sqlite3": 				 "http://repo.or.cz/sqlite.git@version-3.8.10.1",
@@ -23,10 +22,12 @@ deps_overrides = {
   "freebsd10": {
      "googlemock": 			 "https://github.com/AlCutter/googlemock-fbsd.git@1.7.0",
      "googlemock/gtest": "https://github.com/AlCutter/googletest-fbsd.git@1.7.0",
-     "protobuf/gtest": "https://github.com/benlaurie/googletest.git@1.5.0-fix",
-     "protobuf": "https://github.com/benlaurie/protobuf.git@2.6.1-fix",
-     "glog": "https://github.com/benlaurie/glog.git@0.3.4-fix",
-     "ldns": "https://github.com/benlaurie/ldns.git@1.6.17-fix",
+     "protobuf":         "https://github.com/benlaurie/protobuf.git@2.6.1-fix",
+     "protobuf/gtest":   "https://github.com/AlCutter/googletest-fbsd.git@1.7.0",
+     "libunwind":        "git://git.sv.gnu.org/libunwind.git@v1.1",
+  },
+  "linux2": {
+     "libunwind":        "git://git.sv.gnu.org/libunwind.git@v1.1",
   },
   "darwin": {
      "ldns": "https://github.com/benlaurie/ldns.git@1.6.17-fix",
@@ -39,6 +40,7 @@ make_os = {
 }
 
 import os
+import multiprocessing
 import sys
 
 print "Host platform is %s" % sys.platform
@@ -49,15 +51,78 @@ if sys.platform in make_os:
 	make = make_os[sys.platform]
 else:
 	make = "make"
-print "Using make %s" % make
+
+num_cores = multiprocessing.cpu_count()
+
+print "Using make %s with %d jobs" % (make, num_cores)
 
 here = os.getcwd()
-install = os.path.join(here, "install")
 
 hooks = [
     {
-        "name": "deps",
-        "pattern": ".",
-        "action": [ make, "-f", os.path.join(here, "certificate-transparency/build.gclient"), "INSTALL_DIR=%s"%install],
+        "name": "libunwind",
+        "pattern": "^libunwind/",
+        "action": [ make, "-f", os.path.join(here, "certificate-transparency/build.gclient"), "_libunwind" ],
+    },
+    {
+        "name": "tcmalloc",
+        "pattern": "^tcmalloc/",
+        "action": [ make, "-f", os.path.join(here, "certificate-transparency/build.gclient"), "_tcmalloc" ],
+    },
+    {
+        "name": "openssl",
+        "pattern": "^openssl/",
+        "action": [ make, "-f", os.path.join(here, "certificate-transparency/build.gclient"), "_openssl" ],
+    },
+    {
+        "name": "protobuf",
+        "pattern": "^protobuf/",
+        "action": [ make, "-f", os.path.join(here, "certificate-transparency/build.gclient"), "_protobuf" ],
+    },
+    {
+        "name": "libevent",
+        "pattern": "^libevent/",
+        "action": [ make, "-f", os.path.join(here, "certificate-transparency/build.gclient"), "_libevent" ],
+    },
+    {
+        "name": "libevhtp",
+        "pattern": "^libevhtp/",
+        "action": [ make, "-f", os.path.join(here, "certificate-transparency/build.gclient"), "_libevhtp" ],
     },
+    {
+        "name": "gflags",
+        "pattern": "^gflags/",
+        "action": [ make, "-f", os.path.join(here, "certificate-transparency/build.gclient"), "_gflags" ],
+    },
+    {
+        "name": "glog",
+        "pattern": "^glog/",
+        "action": [ make, "-f", os.path.join(here, "certificate-transparency/build.gclient"), "_glog" ],
+    },
+    {
+        "name": "ldns",
+        "pattern": "^ldns/",
+        "action": [ make, "-f", os.path.join(here, "certificate-transparency/build.gclient"), "_ldns" ],
+    },
+    {
+        "name": "sqlite3",
+        "pattern": "^sqlite3/",
+        "action": [ make, "-f", os.path.join(here, "certificate-transparency/build.gclient"), "_sqlite3" ],
+    },
+    {
+        "name": "leveldb",
+        "pattern": "^leveldb/",
+        "action": [ make, "-f", os.path.join(here, "certificate-transparency/build.gclient"), "_leveldb" ],
+    },
+    {
+        "name": "json-c",
+        "pattern": "^json-c/",
+        "action": [ make, "-f", os.path.join(here, "certificate-transparency/build.gclient"), "_json-c" ],
+    },
+    # Do this last
+    {
+        "name": "ct",
+        "pattern": "^certificate-transparency/",
+        "action": [ make, "-j", str(num_cores), "-f", os.path.join(here, "certificate-transparency/build.gclient"), "_configure-ct" ],
+    }
 ]

Makefile.am

@@ -1,3 +1,4 @@
+ACLOCAL_AMFLAGS = -Im4
 
 AM_CPPFLAGS = \
 	-I$(GMOCK_DIR)/include \
@@ -18,7 +19,11 @@ BUILT_SOURCES = \
 BUILD_VERSION = `git describe --abbrev=0 --dirty --always --tags`
 
 AM_TESTS_ENVIRONMENT = \
-export LD_LIBRARY_PATH=$(LIBRARY_PATH);
+	LD_LIBRARY_PATH=$(INSTALL_DIR)/lib
+
+# TODO(pphaneuf): change these to autoconf substitutions
+export PROTOC
+export INSTALL_DIR
 
 .PHONY: cpp/version.cc
 cpp/version.o: \
@@ -48,6 +53,9 @@ noinst_LIBRARIES = \
 	cpp/libtest.a
 
 check_PROGRAMS = \
+	cpp/util/thread_pool_test \
+	cpp/monitoring/gcm/exporter_test \
+	cpp/net/url_fetcher_test \
 	$(TESTS)
 
 # TODO(pphaneuf): ct-dns-server-test.py has been disabled, because of
@@ -79,9 +87,7 @@ TESTS = \
 	cpp/monitor/database_test \
 	cpp/monitoring/counter_test \
 	cpp/monitoring/gauge_test \
-	cpp/monitoring/gcm/exporter_test \
 	cpp/monitoring/registry_test \
-	cpp/net/url_fetcher_test \
 	cpp/proto/serializer_test \
 	cpp/server/proxy_test \
 	cpp/util/etcd_delete_test \
@@ -91,11 +97,10 @@ TESTS = \
 	cpp/util/libevent_wrapper_test \
 	cpp/util/masterelection_test \
 	cpp/util/sync_task_test \
-	cpp/util/task_test \
-	cpp/util/thread_pool_test
+	cpp/util/task_test
 
 all-local:
-	$(MAKE) -C python PROTOC=$(PROTOC)
+	$(MAKE) -C python
 
 clean-local:
 	$(MAKE) -C python clean

README.md

@@ -73,6 +73,7 @@ Best and test Go code:
  - git
  - GNU make
  - libtool
+ - shtool
  - Tcl
  - pkgconf
  - python27
@@ -89,7 +90,7 @@ of above deps], and Ubuntu 14.04.
 ```bash
 mkdir ct  # or whatever directory you prefer
 cd ct
-gclient config git@github.com:google/certificate-transparency.git
+gclient config --name="certificate-transparency" git@github.com:google/certificate-transparency.git
 gclient sync
 # substitute gmake or gnumake below if that's that your platform calls it:
 make -C certificate-transparency check