[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 307/411: travis: use ninja-build for CMake builds
From: |
gnunet |
Subject: |
[gnurl] 307/411: travis: use ninja-build for CMake builds |
Date: |
Wed, 13 Jan 2021 01:22:02 +0100 |
This is an automated email from the git hooks/post-receive script.
nikita pushed a commit to branch master
in repository gnurl.
commit e41ba40debc78d33168855eb4f3aab46b078b53e
Author: Sergei Nikulov <sergey.nikulov@gmail.com>
AuthorDate: Wed Oct 14 13:19:35 2020 +0300
travis: use ninja-build for CMake builds
Added package ninja-build to environment
Use ninja to speed up CMake builds
Closes #6077
---
.travis.yml | 6 ++++--
scripts/travis/before_script.sh | 23 +++++++++--------------
2 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 5609c26bc..84e555221 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,6 +46,7 @@ addons:
- libidn2-dev
- gnutls-bin
- python-impacket
+ - ninja-build
jobs:
include:
@@ -79,6 +80,7 @@ jobs:
- gnutls-bin
# The above list is common_packages minus impacket.
- libssh-dev
+ - ninja-build
- env:
- T=normal C="--enable-ares"
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
@@ -246,7 +248,7 @@ jobs:
- T=iconv
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
- env:
- - T=cmake BORINGSSL=yes QUICHE=yes C="-DUSE_QUICHE=1
-DOPENSSL_ROOT_DIR=$HOME/boringssl -DCURL_BROTLI=1 -DCURL_ZSTD=1"
+ - T=cmake BORINGSSL=yes QUICHE=yes C="-GNinja -DUSE_QUICHE=1
-DOPENSSL_ROOT_DIR=$HOME/boringssl -DCURL_BROTLI=1 -DCURL_ZSTD=1"
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
- PKG_CONFIG_PATH="$HOME/quiche/target/release"
before_install:
@@ -260,7 +262,7 @@ jobs:
- libbrotli-dev
- libzstd-dev
- env:
- - T=cmake NGTCP2=yes C="-DUSE_NGTCP2=ON -DCURL_BROTLI=1 -DCURL_ZSTD=1"
+ - T=cmake NGTCP2=yes C="-GNinja -DUSE_NGTCP2=ON -DCURL_BROTLI=1
-DCURL_ZSTD=1"
- *clang
- PKG_CONFIG_PATH="$HOME/ngbuild/lib/pkgconfig"
compiler: clang
diff --git a/scripts/travis/before_script.sh b/scripts/travis/before_script.sh
index 4d3d6f74a..5dd2c7773 100755
--- a/scripts/travis/before_script.sh
+++ b/scripts/travis/before_script.sh
@@ -71,21 +71,16 @@ if [ "$TRAVIS_OS_NAME" = linux -a "$BORINGSSL" ]; then
cd $HOME
git clone --depth=1 https://boringssl.googlesource.com/boringssl
cd boringssl
- mkdir build
- cd build
- CXX="g++" CC="gcc" cmake -DCMAKE_BUILD_TYPE=release -DBUILD_SHARED_LIBS=1 ..
- make
- cd ..
+ CXX="g++" CC="gcc" cmake -H. -Bbuild -GNinja -DCMAKE_BUILD_TYPE=release
-DBUILD_SHARED_LIBS=1
+ cmake --build build
mkdir lib
- cd lib
- cp ../build/crypto/libcrypto.so .
- cp ../build/ssl/libssl.so .
- echo "BoringSSL lib dir: "`pwd`
- cd ../build
- make clean
- rm -f CMakeCache.txt
- CXX="g++" CC="gcc" cmake -DCMAKE_POSITION_INDEPENDENT_CODE=on ..
- make
+ cp ./build/crypto/libcrypto.so ./lib/
+ cp ./build/ssl/libssl.so ./lib/
+ echo "BoringSSL lib dir: "`pwd`"/lib"
+ cmake --build build --target clean
+ rm -f build/CMakeCache.txt
+ CXX="g++" CC="gcc" cmake -H. -Bbuild -GNinja
-DCMAKE_POSITION_INDEPENDENT_CODE=on
+ cmake --build build
export LIBS=-lpthread
fi
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnurl] 366/411: urldata: remove 'void *protop' and create the union 'p', (continued)
- [gnurl] 366/411: urldata: remove 'void *protop' and create the union 'p', gnunet, 2021/01/12
- [gnurl] 344/411: cirrus: build with FreeBSD 12.2 in CirrusCI, gnunet, 2021/01/12
- [gnurl] 313/411: copyright: fix year ranges, gnunet, 2021/01/12
- [gnurl] 373/411: tool_writeout: use off_t getinfo-types instead of doubles, gnunet, 2021/01/12
- [gnurl] 341/411: RELEASE-NOTES: synced, gnunet, 2021/01/12
- [gnurl] 304/411: rtsp: fixed Session ID comparison to refuse prefix, gnunet, 2021/01/12
- [gnurl] 350/411: KNOWN_BUGS: cmake build doesn't fail if zlib not found, gnunet, 2021/01/12
- [gnurl] 323/411: FAQ: remove "Why is there a HTTP/1.1 in my HTTP/2 request?", gnunet, 2021/01/12
- [gnurl] 365/411: winbuild: remove docs from Makefiles and refer to README.md, gnunet, 2021/01/12
- [gnurl] 343/411: tests/*server.py: close log file after each log line, gnunet, 2021/01/12
- [gnurl] 307/411: travis: use ninja-build for CMake builds,
gnunet <=
- [gnurl] 287/411: tests: fix some http/2 tests for older versions of nghttpx, gnunet, 2021/01/12
- [gnurl] 408/411: gnurl adjustments (paths), gnunet, 2021/01/12
- [gnurl] 405/411: urldata: restore comment on ssl_connect_data.use, gnunet, 2021/01/12
- [gnurl] 396/411: scripts/completion.pl: parse all opts, gnunet, 2021/01/12
- [gnurl] 388/411: cmake: check for linux/tcp.h, gnunet, 2021/01/12
- [gnurl] 401/411: ftp: make wc_statemach loop instead of recurse, gnunet, 2021/01/12
- [gnurl] 395/411: RELEASE-NOTES: synced, gnunet, 2021/01/12
- [gnurl] 390/411: quiche: close the connection, gnunet, 2021/01/12
- [gnurl] 404/411: VERSIONS: refreshed, gnunet, 2021/01/12
- [gnurl] 402/411: openssl: make the OCSP verification verify the certificate id, gnunet, 2021/01/12