Skip to content

Commit d760adf

Browse files
committed
Use autoconf/automake.
This gets us many things. - much easier control of variables controlling compilation (for example, overriding CXXFLAGS, and adding -I/-L flags to CPPFLAGS/LDFLAGS) - gtest/gmock is now compiled with compilation flags consistent with the rest of our build (as per their recommendations) - faster automatic dependencies - concurrent execution of tests Still missing is validation that all required tools and libraries are found and working, but it should be possible to point at working ones without modifying any Makefile or scripts.
1 parent cf4c398 commit d760adf

18 files changed

+1083
-589
lines changed

.gitignore

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,36 @@
22

33
# Various common files to exclude.
44
*.a
5+
*.log
56
*.o
67
*.pb.cc
78
*.pb.h
89
*.pyc
910
*.so
11+
*.trs
1012
*_pb2.py
1113
*~
1214
.*.sw[lmnop]
1315
.depend
16+
.deps/
17+
.dirstamp
1418

1519
# More specific files.
20+
/Makefile
21+
/Makefile.in
22+
/aclocal.m4
23+
/ar-lib
24+
/autom4te.cache/
25+
/compile
26+
/config.log
27+
/config.status
28+
/configure
1629
/cpp/base/notification_test
1730
/cpp/client/ct
18-
/cpp/gmock/
31+
/cpp/config.h
32+
/cpp/config.h.in
33+
/cpp/gmock-all.cc
34+
/cpp/gtest-all.cc
1935
/cpp/local.mk
2036
/cpp/log/cert_checker_test
2137
/cpp/log/cert_submission_handler_test
@@ -48,6 +64,7 @@
4864
/cpp/server/ct-dns-server
4965
/cpp/server/ct-server
5066
/cpp/server/proxy_test
67+
/cpp/stamp-h1
5168
/cpp/tools/ct-clustertool
5269
/cpp/tools/dump_cert
5370
/cpp/tools/dump_sth
@@ -63,9 +80,13 @@
6380
/cpp/util/sync_etcd_test
6481
/cpp/util/sync_task_test
6582
/cpp/util/task_test
83+
/depcomp
84+
/install-sh
6685
/java/build
6786
/local.properties
87+
/missing
6888
/python/_trial_temp/
89+
/test-driver
6990
/test/*.bin
7091
/test/*.csr
7192
/test/*.der

.travis.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ compiler:
55
- clang
66

77
env:
8-
- GOPATH=${TRAVIS_BUILD_DIR}/go
8+
- GOPATH=${TRAVIS_BUILD_DIR}/go CPPFLAGS="-I/usr/src/gmock/include" CXXFLAGS="-Wall -Werror"
99

1010
cache: apt
1111

@@ -14,8 +14,9 @@ before_install:
1414
- sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test
1515
- sudo apt-add-repository -y ppa:fcitx-team/nightly
1616
- sudo apt-add-repository -y ppa:chris-lea/protobuf
17+
- sudo apt-add-repository -y ppa:asolovets/backports
1718
- sudo apt-get update -qq
18-
- sudo apt-get install -qq openssl libssl-dev protobuf-compiler libprotobuf-java libprotobuf-dev python-dev libjson-c-dev libgoogle-glog-dev libgflags-dev libldns-dev libstdc++-4.8-dev
19+
- 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
1920
# Stupid frikkin' google-mock package on Precise is b0rked, so hack it up:
2021
- wget https://googlemock.googlecode.com/files/gmock-1.7.0.zip -O /tmp/gmock-1.7.0.zip
2122
- unzip -d /tmp /tmp/gmock-1.7.0.zip
@@ -30,6 +31,11 @@ before_install:
3031
- go version
3132
- openssl version
3233

34+
install:
35+
- ./autogen.sh
36+
3337
script:
34-
- make alltests
38+
- ./configure && make && make check
39+
- ant build test
40+
- make -C python test
3541
- go test -v ./go/...

Makefile

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)