Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
0d3c2c2
.travis.yml: define simple freebsd scenarios
jimklimov Nov 22, 2020
80d3cc8
ci_build.sh: as of now, skip building cgi (needs libgd) on freebsd to…
jimklimov Nov 22, 2020
048ca17
.travis.yml: mark "gnu99-gcc-freebsd-nowarn" and "gnu99-clang-freebsd…
jimklimov Nov 22, 2020
0146824
.travis.yml: introduce freebsd test cases with warnings
jimklimov Nov 22, 2020
d72ee17
.travis.yml: introduce freebsd test cases with nowarn and gnu17
jimklimov Nov 22, 2020
2e44273
.travis.yml: add _matrix_freebsd_gnustd_warn to _matrix_freebsd
jimklimov Nov 22, 2020
61c4de9
.travis.yml: define a NUT_MATRIX_TAG="gnu99-clang-win-warn" test case…
jimklimov Nov 19, 2020
73e8142
.travis.yml: for windows builds, add /C/tools/cygwin/bin to PATH
jimklimov Nov 19, 2020
0d4da45
Revert ".travis.yml: run Windows test cases with cygwin bash"
jimklimov Nov 21, 2020
72f1d95
.travis.yml: use cygwin bins as last resort (e.g. for autoconf)
jimklimov Nov 21, 2020
286fa13
.travis.yml: allow to skip cygwin autotools install if it was done ea…
jimklimov Nov 21, 2020
34f633e
.travis.yml: use cygwin bins in PATH also with /cygdrive/ prefix just…
jimklimov Nov 21, 2020
9ba5804
.travis.yml: use choco bins in PATH also with /cygdrive/ prefix just …
jimklimov Nov 21, 2020
c8691b6
.travis.yml: amend cygwin bin files ACLs to let them execute
jimklimov Nov 21, 2020
681dfcf
ci_build.sh: parameterize $CONFIGURE_SCRIPT as it may be called diffe…
jimklimov Nov 22, 2020
3a5e990
ci_build.sh: fix whitespace
jimklimov Nov 22, 2020
225e472
autogen.sh: do not hide the progress of autoreconf
jimklimov Nov 22, 2020
2fd807a
.travis.yml: curiously, gcc-7 in Travis does not alias -std=gnu++99 t…
jimklimov Nov 22, 2020
93776db
Introduce m4/ax_c_pragmas.m4
jimklimov Nov 22, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
146 changes: 131 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ _matrix_linux_gnustd_nowarn:
packages:
- *deps_driverlibs

- env: NUT_MATRIX_TAG="gnu99-gcc-7-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu99" CXXFLAGS="-std=gnu++99" CC=gcc-7 CXX=g++-7
- env: NUT_MATRIX_TAG="gnu99-gcc-7-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu99" CXXFLAGS="-std=gnu++98" CC=gcc-7 CXX=g++-7
os: linux
sudo: false
services:
Expand Down Expand Up @@ -451,7 +451,7 @@ _matrix_linux_gnustd_warn_viable:
packages:
- *deps_driverlibs

- env: NUT_MATRIX_TAG="gnu99-gcc-7-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu99" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++99" CC=gcc-7 CXX=g++-7
- env: NUT_MATRIX_TAG="gnu99-gcc-7-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu99" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++98" CC=gcc-7 CXX=g++-7
os: linux
sudo: false
services:
Expand Down Expand Up @@ -589,6 +589,71 @@ _matrix_linux_cstd_warn:
packages:
- *deps_driverlibs

_matrix_freebsd_gnustd_nowarn:
include: &_matrix_freebsd_gnustd_nowarn
- env: NUT_MATRIX_TAG="gnu99-gcc-freebsd-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu99" CXXFLAGS="-std=gnu++99" CC=gcc CXX=g++
os: freebsd
compiler: gcc
cache:
directories:
- $HOME/.ccache

- env: NUT_MATRIX_TAG="gnu99-clang-freebsd-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu99" CXXFLAGS="-std=gnu++99" CC=clang CXX=clang++
os: freebsd
compiler: clang
cache:
directories:
- $HOME/.ccache

- env: NUT_MATRIX_TAG="gnu17-gcc-freebsd-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu17" CXXFLAGS="-std=gnu++17" CC=gcc CXX=g++
os: freebsd
compiler: gcc
cache:
directories:
- $HOME/.ccache

- env: NUT_MATRIX_TAG="gnu17-clang-freebsd-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu17" CXXFLAGS="-std=gnu++17" CC=clang CXX=clang++
os: freebsd
compiler: clang
cache:
directories:
- $HOME/.ccache

_matrix_freebsd_gnustd_warn:
include: &_matrix_freebsd_gnustd_warn
- env: NUT_MATRIX_TAG="gnu99-gcc-default-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu99" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++99" CC=gcc CXX=g++
os: freebsd
compiler: gcc
if: branch =~ fightwarn
cache:
directories:
- $HOME/.ccache

- env: NUT_MATRIX_TAG="gnu17-gcc-default-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu17" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++17" CC=gcc CXX=g++
os: freebsd
compiler: gcc
if: branch =~ fightwarn
cache:
directories:
- $HOME/.ccache

- env: NUT_MATRIX_TAG="gnu99-clang-freebsd-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -pedantic -std=gnu99" CXXFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -std=gnu++99" CC=clang CXX=clang++
os: freebsd
compiler: clang
if: branch =~ fightwarn
cache:
directories:
- $HOME/.ccache

- env: NUT_MATRIX_TAG="gnu17-clang-freebsd-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -pedantic -std=gnu17" CXXFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -std=gnu++17" CC=clang CXX=clang++
os: freebsd
compiler: clang
if: branch =~ fightwarn
cache:
directories:
- $HOME/.ccache


# Try also a range of platforms for MacOS X builds
# Inspired by https://github.com/taocpp/operators/blob/master/.travis.yml
_matrix_osx_gnustd_nowarn:
Expand Down Expand Up @@ -717,6 +782,18 @@ _matrix_windows_gnustd_nowarn:
- $HOME/.ccache
- /C/tools

_matrix_windows_gnustd_warn:
include: &_matrix_windows_gnustd_warn
- env: NUT_MATRIX_TAG="gnu99-clang-win-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -pedantic -std=c99" CXXFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -std=c++99" CC=clang CXX=clang++
os: windows
compiler: clang
if: branch =~ fightwarn
cache:
directories:
- $HOME/AppData/Local/Temp/chocolatey
- $HOME/.ccache
- /C/tools

_matrix_windows_cstd_nowarn:
include: &_matrix_windows_cstd_nowarn
- env: NUT_MATRIX_TAG="c99-clang-win-nowarn" BUILD_TYPE=default-all-errors CPPFLAGS="-fms-extensions" CFLAGS="-std=c99" CXXFLAGS="-std=c++99" CC=clang CXX=clang++
Expand Down Expand Up @@ -785,6 +862,19 @@ _matrix_linux:
- *_matrix_required_linux
- *_matrix_allowfail_linux

_matrix_freebsd:
include: &_matrix_freebsd
- *_matrix_freebsd_gnustd_nowarn
- *_matrix_freebsd_gnustd_warn

_matrix_required_freebsd:
include: &_matrix_required_freebsd
- *_matrix_freebsd_gnustd_nowarn

_matrix_allowfail_freebsd:
include: &_matrix_allowfail_freebsd
- *_matrix_freebsd_gnustd_warn

_matrix_allowfail_osx:
include: &_matrix_allowfail_osx
- *_matrix_osx_cstd_nowarn
Expand All @@ -807,6 +897,7 @@ _matrix_osx:
_matrix_allowfail_windows:
include: &_matrix_allowfail_windows
- *_matrix_windows_gnustd_nowarn
- *_matrix_windows_gnustd_warn
- *_matrix_windows_cstd_nowarn
- *_matrix_windows_cstd_warn

Expand All @@ -826,25 +917,31 @@ _matrix_gnustd_nowarn:
include: &_matrix_gnustd_nowarn
- *_matrix_osx_gnustd_nowarn
- *_matrix_linux_gnustd_nowarn
- *_matrix_freebsd_gnustd_nowarn
# -*_matrix_windows_gnustd_nowarn

_matrix_warn:
include: &_matrix_warn
- *_matrix_linux_gnustd_warn
- *_matrix_linux_cstd_warn
- *_matrix_freebsd_gnustd_warn
- *_matrix_osx_gnustd_warn
- *_matrix_osx_cstd_warn
- *_matrix_windows_gnustd_warn
- *_matrix_windows_cstd_warn

# Default "jobs:" matrix should reference at least this for master branches
_matrix_required:
include: &_matrix_required
- *_matrix_required_linux
- *_matrix_required_freebsd
- *_matrix_required_osx
# - *_matrix_required_windows

_matrix_all:
include: &_matrix_all
- *_matrix_linux
- *_matrix_freebsd
- *_matrix_osx
- *_matrix_windows

Expand All @@ -856,6 +953,7 @@ _matrix_master:
### following items from becoming green:
- *_matrix_allowfail_linux
- *_matrix_allowfail_osx
- *_matrix_allowfail_freebsd
- *_matrix_windows

_matrix_fixbugs:
Expand Down Expand Up @@ -884,7 +982,7 @@ jobs:
# Note: "env" lines below must exactly describe a matrix option defined above
allow_failures:
#OK# - env: NUT_MATRIX_TAG="gnu99-gcc-default-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu99" CXXFLAGS="-std=gnu++99"
#OK# - env: NUT_MATRIX_TAG="gnu99-gcc-7-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu99" CXXFLAGS="-std=gnu++99" CC=gcc-7 CXX=g++-7
#OK# - env: NUT_MATRIX_TAG="gnu99-gcc-7-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu99" CXXFLAGS="-std=gnu++98" CC=gcc-7 CXX=g++-7
#OK# - env: NUT_MATRIX_TAG="gnu11-gcc-7-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu11" CXXFLAGS="-std=gnu++11" CC=gcc-7 CXX=g++-7
#OK# - env: NUT_MATRIX_TAG="gnu17-gcc-9-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu17" CXXFLAGS="-std=gnu++17" CC=gcc-9 CXX=g++-9
#OK# - env: NUT_MATRIX_TAG="gnu99-clang-5.0-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu99" CXXFLAGS="-std=gnu++99" CC=clang-5.0 CXX=clang++-5.0
Expand All @@ -898,14 +996,23 @@ jobs:
#OK# - env: NUT_MATRIX_TAG="cDefault-gcc-default-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic" CXXFLAGS="-Wall -Wextra -Werror"
#OK# - env: NUT_MATRIX_TAG="gnu99-gcc-default-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu99" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++99"
- env: NUT_MATRIX_TAG="c99-gcc-default-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=c99" CXXFLAGS="-Wall -Wextra -Werror -std=c++99"
#OK# - env: NUT_MATRIX_TAG="gnu99-gcc-7-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu99" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++99" CC=gcc-7 CXX=g++-7
#OK# - env: NUT_MATRIX_TAG="gnu99-gcc-7-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu99" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++98" CC=gcc-7 CXX=g++-7
- env: NUT_MATRIX_TAG="c99-clang-5.0-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -pedantic -std=c99" CXXFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -std=c++99" CC=clang-5.0 CXX=clang++-5.0
- env: NUT_MATRIX_TAG="c11-clang-5.0-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -pedantic -std=c11" CXXFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -std=c++11" CC=clang-5.0 CXX=clang++-5.0
- env: NUT_MATRIX_TAG="c11-gcc-default-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=c11" CXXFLAGS="-Wall -Wextra -Werror -std=c++11"
#OK# - env: NUT_MATRIX_TAG="gnu11-gcc-default-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu11" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++11"
#OK# - env: NUT_MATRIX_TAG="gnu89-gcc-default-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu89" CXXFLAGS="-std=gnu++89"
- env: NUT_MATRIX_TAG="c89-gcc-default-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=c89" CXXFLAGS="-Wall -Wextra -Werror -std=c++89"
- env: NUT_MATRIX_TAG="gnu89-gcc-default-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu89" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++89"
### FreeBSD
#OK# - env: NUT_MATRIX_TAG="gnu99-gcc-freebsd-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu99" CXXFLAGS="-std=gnu++99" CC=gcc CXX=g++
#OK# - env: NUT_MATRIX_TAG="gnu99-clang-freebsd-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu99" CXXFLAGS="-std=gnu++99" CC=clang CXX=clang++
#OK# - env: NUT_MATRIX_TAG="gnu17-gcc-freebsd-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu99" CXXFLAGS="-std=gnu++17" CC=gcc CXX=g++
#OK# - env: NUT_MATRIX_TAG="gnu17-clang-freebsd-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu99" CXXFLAGS="-std=gnu++17" CC=clang CXX=clang++
- env: NUT_MATRIX_TAG="gnu99-gcc-default-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu99" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++99" CC=gcc CXX=g++
- env: NUT_MATRIX_TAG="gnu17-gcc-default-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu17" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++17" CC=gcc CXX=g++
- env: NUT_MATRIX_TAG="gnu99-clang-freebsd-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -pedantic -std=gnu99" CXXFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -std=gnu++99" CC=clang CXX=clang++
- env: NUT_MATRIX_TAG="gnu17-clang-freebsd-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -pedantic -std=gnu17" CXXFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -std=gnu++17" CC=clang CXX=clang++
### macosx
#OK# - env: NUT_MATRIX_TAG="gnu99-clang-xcode10.2-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu99" CXXFLAGS="-std=gnu++99" CC=clang CXX=clang++
#OK# - env: NUT_MATRIX_TAG="gnu17-clang-xcode10.2-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu17" CXXFLAGS="-std=gnu++17" CC=clang CXX=clang++
Expand All @@ -919,6 +1026,7 @@ jobs:
- env: NUT_MATRIX_TAG="c11-clang-xcode7.3-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -pedantic -std=c11" CXXFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -std=c++11" CC=clang CXX=clang++
### windows
- env: NUT_MATRIX_TAG="gnu99-clang-win-nowarn" BUILD_TYPE=default-all-errors CPPFLAGS="-fms-extensions" CFLAGS="-std=gnu99" CXXFLAGS="-std=gnu++99" CC=clang CXX=clang++
- env: NUT_MATRIX_TAG="gnu99-clang-win-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -pedantic -std=c99" CXXFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -std=c++99" CC=clang CXX=clang++
- env: NUT_MATRIX_TAG="c99-clang-win-nowarn" BUILD_TYPE=default-all-errors CPPFLAGS="-fms-extensions" CFLAGS="-std=c99" CXXFLAGS="-std=c++99" CC=clang CXX=clang++
- env: NUT_MATRIX_TAG="c99-clang-win-warn" BUILD_TYPE=default-all-errors CPPFLAGS="-fms-extensions" CFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -pedantic -std=c99" CXXFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -std=c++99" CC=clang CXX=clang++
- env: NUT_MATRIX_TAG="c20-clang-win-warn" BUILD_TYPE=default-all-errors CPPFLAGS="-fms-extensions" CFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -pedantic -std=c20" CXXFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -std=c++20" CC=clang CXX=clang++
Expand All @@ -941,10 +1049,17 @@ before_install:
export XML_CATALOG_FILES
fi
fi

# Please forgive the funny syntax below to dance around
# both YAML escaping and windows-acceptable shell syntax
- |-
if [[ $TRAVIS_OS_NAME == "windows" ]] ; then
choco install cygwin
C:\\tools\\cygwin\\cygwinsetup.exe -q -P make,unzip,automake,autoconf,zip
if [[ ! -s C:/tools/cygwin/bin/autoreconf.exe ]] ; then
if [[ ! -s C:/tools/cygwin/bin/autoreconf ]] ; then
choco install cygwin
C:\\tools\\cygwin\\cygwinsetup.exe -q -P make,unzip,automake,autoconf,zip
fi
fi
if [[ ! -s C:/tools/bin/ccache.exe ]] ; then
mkdir -p C:/tools/bin/
pushd C:/tools/bin/ || exit
Expand All @@ -953,18 +1068,19 @@ before_install:
rm -f ccache-3.7.12-windows-64.zip
popd
fi
export PATH=/C/tools/bin:$PATH
export PATH=/C/tools/bin:/cygdrive/c/tools/bin:$PATH:/C/tools/cygwin/bin:/cygdrive/c/tools/cygwin/bin
CI_TRACE=true
CI_TIME=false
export CI_TRACE CI_TIME
( echo "user::rwx"
echo "group::r--"
echo "mask:rwx"
echo "other:r--"
) > /tmp/faclx
if ! setfacl -f /tmp/faclx /cygdrive/c/tools/cygwin/*bin/* ; then
setfacl -f /tmp/faclx /C/tools/cygwin/*bin/*
fi
fi
- if [ -n "${NUT_MATRIX_TAG}" ] ; then export CFLAGS CXXFLAGS ; [ -z "$CC" ] || export CC ; [ -z "$CXX" ] || export CXX ; fi

# Hand off to generated script for each BUILD_TYPE
script:
- |-
if [[ $OS_BUILD == "windows" ]]; then
powershell -Command "C:\tools\cygwin\bin\bash.exe -c './ci_build.sh'";
else
./ci_build.sh
fi
script: ./ci_build.sh
2 changes: 1 addition & 1 deletion autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ fi

# now we can safely call autoreconf
echo "Calling autoreconf..."
autoreconf -i
autoreconf -iv
14 changes: 10 additions & 4 deletions ci_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,15 @@ case "$CI_TRACE" in
esac

configure_nut() {
echo "=== CONFIGURING NUT: ./configure ${CONFIG_OPTS[*]}"
local CONFIGURE_SCRIPT=./configure
if [[ "$TRAVIS_OS_NAME" == "windows" ]] ; then
find . -ls
CONFIGURE_SCRIPT=./configure.bat
fi

echo "=== CONFIGURING NUT: $CONFIGURE_SCRIPT ${CONFIG_OPTS[*]}"
echo "=== CC='$CC' CXX='$CXX' CPP='$CPP'"
$CI_TIME ./configure "${CONFIG_OPTS[@]}" \
$CI_TIME $CONFIGURE_SCRIPT "${CONFIG_OPTS[@]}" \
|| { RES=$?
echo "FAILED ($RES) to configure nut, will dump config.log in a second to help troubleshoot CI" >&2
echo " (or press Ctrl+C to abort now if running interactively)" >&2
Expand All @@ -46,7 +52,7 @@ build_to_only_catch_errors() {

echo "`date`: Starting a 'make check' for quick sanity test of the products built with the current compiler and standards"
$CI_TIME make VERBOSE=0 check \
&& echo "`date`: SUCCESS" \
&& echo "`date`: SUCCESS" \
|| return $?

return 0
Expand Down Expand Up @@ -194,7 +200,7 @@ default|default-alldrv|default-all-errors|default-spellcheck|default-shellcheck|
CONFIG_OPTS+=("--with-doc=skip")
# Enable as many binaries to build as current worker setup allows
CONFIG_OPTS+=("--with-all=auto")
if [[ "$TRAVIS_OS_NAME" != "windows" ]] ; then
if [[ "$TRAVIS_OS_NAME" != "windows" ]] && [[ "$TRAVIS_OS_NAME" != "freebsd" ]] ; then
# Currently --with-all implies this, but better be sure to
# really build everything we can to be certain it builds:
CONFIG_OPTS+=("--with-cgi=yes")
Expand Down
1 change: 1 addition & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ AC_C_BIGENDIAN
AC_C_INLINE
AC_C_FLEXIBLE_ARRAY_MEMBER
AC_C_VARARRAYS
AX_C_PRAGMAS
AX_C___ATTRIBUTE__
AC_CHECK_FUNCS(flock lockf fcvt fcvtl pow10 round abs_val abs)
AC_CHECK_FUNCS(fabs, [], [], [#include <math.h>])
Expand Down
Loading