Skip to content

Commit 81677fb

Browse files
committed
Update travis for build system changes
1 parent 9c1f698 commit 81677fb

File tree

1 file changed

+3
-65
lines changed

1 file changed

+3
-65
lines changed

.travis.scripts/compile.sh

Lines changed: 3 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#!/bin/bash
22
trap abort_on_failure ERR
33

4-
MONGOC_VERSION=master
5-
LIBBSON_VERSION=master
64
LCOV_VERSION=1.11
75

86

@@ -19,79 +17,19 @@ build_lcov() {
1917
sudo make install
2018
popd
2119
}
22-
build_libmongoc_mci() {
23-
if [ ! -d tmp ]; then
24-
mkdir tmp
25-
fi
26-
27-
pushd tmp
28-
29-
git clone https://github.com/mongodb/mongo-c-driver.git
30-
31-
pushd mongo-c-driver
32-
./build/mci.sh --notest
33-
popd
34-
35-
sudo dpkg -i *.deb
36-
37-
popd
38-
}
39-
40-
build_libmongoc_manually() {
41-
42-
43-
pushd src
44-
if [ "$MONGOC_VERSION" = "master" ]; then
45-
wget -O libmongoc.tar.gz https://github.com/mongodb/mongo-c-driver/archive/master.tar.gz
46-
else
47-
wget -O libmongoc.tar.gz https://github.com/mongodb/mongo-c-driver/releases/download/${MONGOC_VERSION}/mongo-c-driver-${MONGOC_VERSION}.tar.gz
48-
fi
49-
50-
51-
mkdir libmongoc
52-
pushd libmongoc
53-
tar zxf ../libmongoc.tar.gz --strip-components=1
54-
55-
pushd src
56-
if [ "$LIBBSON_VERSION" = "master" ]; then
57-
wget -O libbson.tar.gz https://github.com/mongodb/libbson/archive/master.tar.gz
58-
else
59-
wget -O libbson.tar.gz https://github.com/mongodb/libbson/releases/download/${LIBBSON_VERSION}/libbson-${LIBBSON_VERSION}.tar.gz
60-
fi
61-
62-
pushd libbson
63-
tar zxf ../libbson.tar.gz --strip-components=1
64-
65-
./autogen.sh --enable-debug --enable-tracing --enable-debug-symbols=full --disable-hardening --enable-examples=no --enable-man-pages=no --enable-sasl=no --enable-tests=no --enable-ssl=no --enable-silent-rules --quiet --with-libbson=bundled
66-
popd
67-
68-
popd # src
69-
70-
./autogen.sh --enable-debug --enable-tracing --enable-debug-symbols=full --disable-hardening --enable-examples=no --enable-man-pages=no --enable-sasl=no --enable-tests=no --enable-ssl=no --enable-silent-rules --quiet --with-libbson=bundled
71-
72-
make -s -j2 all
73-
sudo make install
74-
75-
popd # libmongoc
76-
popd # src
77-
}
78-
79-
80-
81-
# This shouldn't be needed anymore as we submodule it now..
82-
#build_libmongoc_manually
8320
build_lcov
8421

8522
phpize
86-
./configure --enable-coverage
23+
./configure --enable-developer-flags --enable-coverage
24+
make patch
8725
make all
8826
sudo make install
8927
echo "Use the most-up-to-date run-tests.. old ones like 5.3 don't report failure exit codes"
9028
wget -O run-tests.php https://raw.githubusercontent.com/php/php-src/master/run-tests.php
9129

9230

9331

94-
rm -rf tmp-lcov tmp # coveralls may pick it up and lie about our coverage
32+
rm -rf tmp-lcov tmp src/libbson src/libmongoc # coveralls may pick it up and lie about our coverage
9533

9634
echo "extension=phongo.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
9735

0 commit comments

Comments
 (0)