diff options
author | Jay Berkenbilt <jberkenbilt@users.noreply.github.com> | 2023-12-16 17:53:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-16 17:53:47 +0100 |
commit | 1d053905852b407eef472b0ef7886d10bb650383 (patch) | |
tree | ea3cc619a139a1fc8f96266a8bdb3432e4671400 /build-scripts | |
parent | 290742b069756218cd9d2075ea18b9fa60fc56ca (diff) | |
parent | 762f232146f3edc234c898b48e9daacf72ee9577 (diff) | |
download | qpdf-1d053905852b407eef472b0ef7886d10bb650383.tar.zst |
Merge pull request #1081 from jberkenbilt/future-build
Future build
Diffstat (limited to 'build-scripts')
-rwxr-xr-x | build-scripts/build-doc | 2 | ||||
-rwxr-xr-x | build-scripts/test-c++-next | 14 | ||||
-rwxr-xr-x | build-scripts/test-pikepdf | 12 |
3 files changed, 26 insertions, 2 deletions
diff --git a/build-scripts/build-doc b/build-scripts/build-doc index e6c72757..7d45d4fa 100755 --- a/build-scripts/build-doc +++ b/build-scripts/build-doc @@ -10,7 +10,7 @@ pip3 install sphinx sphinx_rtd_theme cmake -S . -B build -DBUILD_DOC=1 cmake --build build --verbose --target doc_dist zip -r doc.zip build/manual/doc-dist -version=$(grep -E '^release' manual/conf.py | cut -d"'" -f 2) +version=$(grep -E '^ +VERSION [1-9]' CMakeLists.txt | awk '{print $2}') mv build/manual/doc-dist qpdf-${version}-doc mkdir distribution zip -r distribution/qpdf-${version}-doc-ci.zip qpdf-${version}-doc diff --git a/build-scripts/test-c++-next b/build-scripts/test-c++-next new file mode 100755 index 00000000..343a5a4d --- /dev/null +++ b/build-scripts/test-c++-next @@ -0,0 +1,14 @@ +#!/bin/bash +set -e +sudo apt-get update +sudo apt-get -y install \ + build-essential cmake \ + zlib1g-dev libjpeg-dev libgnutls28-dev libssl-dev +cmake -S . -B build \ + -DCXX_NEXT=ON \ + -DCI_MODE=1 -DBUILD_STATIC_LIBS=0 -DCMAKE_BUILD_TYPE=Release \ + -DREQUIRE_CRYPTO_OPENSSL=1 -DREQUIRE_CRYPTO_GNUTLS=1 \ + -DENABLE_QTC=1 +cmake --build build --verbose -j$(nproc) -- -k +cd build +ctest --verbose diff --git a/build-scripts/test-pikepdf b/build-scripts/test-pikepdf index e6c8a9a4..cdab79cf 100755 --- a/build-scripts/test-pikepdf +++ b/build-scripts/test-pikepdf @@ -1,10 +1,20 @@ #!/bin/bash set -ex +cmake_extra= +future=0 +if [ "$1" = "future" ]; then + future=1 + cmake_extra=-DFUTURE=ON +fi sudo apt-get update sudo apt-get -y install \ build-essential cmake zlib1g-dev libjpeg-dev libgnutls28-dev -cmake -S . -B build -DBUILD_STATIC_LIBS=0 -DCMAKE_BUILD_TYPE=RelWithDebInfo +cmake -S . -B build -DBUILD_STATIC_LIBS=0 -DCMAKE_BUILD_TYPE=RelWithDebInfo $cmake_extra cmake --build build --verbose -j$(nproc) --target libqpdf -- -k +if [ "$future" = "1" ]; then + # Run qpdf's test suite in FUTURE mode as well + ctest --verbose +fi export QPDF_SOURCE_TREE=$PWD export QPDF_BUILD_LIBDIR=$QPDF_SOURCE_TREE/build/libqpdf export LD_LIBRARY_PATH=$QPDF_BUILD_LIBDIR |