Update Travis.
This commit is contained in:
+31
-25
@@ -5,10 +5,9 @@ set -e; set -o pipefail
|
||||
# Support for Travis CI -- https://travis-ci.org/upx/upx/builds
|
||||
# Copyright (C) Markus Franz Xaver Johannes Oberhumer
|
||||
|
||||
source "$TRAVIS_BUILD_DIR/.github/travis_init.sh" || exit 1
|
||||
source ./.github/travis_init.sh || exit 1
|
||||
|
||||
echo "BUILD_METHOD='$BUILD_METHOD'"
|
||||
echo "BUILD_DIR='$BUILD_DIR'"
|
||||
echo "UPX_UCLDIR='$UPX_UCLDIR'"
|
||||
echo "CC='$CC'"
|
||||
echo "CXX='$CXX'"
|
||||
@@ -18,17 +17,20 @@ echo "CXXFLAGS='$CXXFLAGS'"
|
||||
echo "LDFLAGS='$LDFLAGS'"
|
||||
echo "LIBS='$LIBS'"
|
||||
echo "SCAN_BUILD='$SCAN_BUILD'"
|
||||
#env | LC_ALL=C sort
|
||||
##env | LC_ALL=C sort
|
||||
|
||||
echo "$CC --version"; $CC --version
|
||||
echo "$CXX --version"; $CXX --version
|
||||
|
||||
# whitespace
|
||||
if test "$TRAVIS_OS_NAME" = "linux"; then
|
||||
if [[ $TRAVIS_OS_NAME == linux ]]; then
|
||||
cd $upx_SRCDIR || exit 1
|
||||
echo "Checking source code for whitespace violations..."
|
||||
find . \
|
||||
-type d -name '.git' -prune -o \
|
||||
-type d -name 'deps' -prune -o \
|
||||
-type d -name '.hg' -prune -o \
|
||||
-type d -name 'build' -prune -o \
|
||||
-type d -name 'tmp' -prune -o \
|
||||
-type f -iname '*.bat' -prune -o \
|
||||
-type f -iname '*.exe' -prune -o \
|
||||
-type f -iname '*.pdf' -prune -o \
|
||||
@@ -43,7 +45,7 @@ xargs -0r perl -n -e '
|
||||
}
|
||||
if (m,\t,) {
|
||||
if ($ARGV =~ m,(^|/)\.gitmodules$,) { }
|
||||
elsif ($ARGV =~ m,(^|/)make(file|vars),i) { }
|
||||
elsif ($ARGV =~ m,(^|/)m?make(file|vars),i) { }
|
||||
elsif ($ARGV =~ m,/tmp/.*\.(disasm|dump)$,) { }
|
||||
elsif ($ARGV =~ m,/src/stub/src/arch/.*\.S$,) { }
|
||||
else { print "ERROR: hard TAB detected $ARGV: $_"; exit(1); }
|
||||
@@ -58,38 +60,42 @@ set -x
|
||||
# build UCL
|
||||
#
|
||||
|
||||
cd /; cd "$UPX_UCLDIR" || exit 1
|
||||
./configure --enable-static --disable-shared --disable-asm
|
||||
cd $ucl_BUILDDIR || exit 1
|
||||
if [[ ! -f config.status ]]; then
|
||||
$ucl_SRCDIR/configure --enable-static --disable-shared --disable-asm
|
||||
fi
|
||||
make
|
||||
|
||||
#
|
||||
# build UPX
|
||||
#
|
||||
|
||||
cd /; cd "$BUILD_DIR" || exit 1
|
||||
make="make -f $TRAVIS_BUILD_DIR/src/Makefile"
|
||||
export EXTRA_CPPFLAGS="-DUCL_NO_ASM"
|
||||
case $BUILD_METHOD in
|
||||
debug | debug+* | *+debug | *+debug+*)
|
||||
make="$make USE_DEBUG=1" ;;
|
||||
cd $upx_BUILDDIR || exit 1
|
||||
make="make -f $upx_SRCDIR/src/Makefile"
|
||||
EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS -DUCL_NO_ASM"
|
||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -L$ucl_BUILDDIR/src/.libs"
|
||||
case $BUILD_METHOD in coverage | coverage+* | *+coverage | *+coverage+*)
|
||||
EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -fprofile-arcs -ftest-coverage"
|
||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -fprofile-arcs -ftest-coverage" ;;
|
||||
esac
|
||||
case $BUILD_METHOD in
|
||||
sanitize | sanitize+* | *+sanitize | *+sanitize+*)
|
||||
case $TRAVIS_OS_NAME-$CC in linux-gcc*) export EXTRA_LDFLAGS="-fuse-ld=gold" ;; esac
|
||||
make="$make USE_SANITIZE=1" ;;
|
||||
case $BUILD_METHOD in debug | debug+* | *+debug | *+debug+*)
|
||||
make="$make USE_DEBUG=1" ;;
|
||||
esac
|
||||
case $BUILD_METHOD in
|
||||
scan-build | scan-build+* | *+scan-build | *+scan-build+*)
|
||||
make="$SCAN_BUILD $make" ;;
|
||||
case $BUILD_METHOD in sanitize | sanitize+* | *+sanitize | *+sanitize+*)
|
||||
case $TRAVIS_OS_NAME-$CC in linux-gcc*) EXTRA_LDFLAGS="$EXTRA_LDFLAGS -fuse-ld=gold" ;; esac
|
||||
make="$make USE_SANITIZE=1" ;;
|
||||
esac
|
||||
case $BUILD_METHOD in
|
||||
valgrind | valgrind+* | *+valgrind | *+valgrind+*)
|
||||
export EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS -DWITH_VALGRIND" ;;
|
||||
case $BUILD_METHOD in scan-build | scan-build+* | *+scan-build | *+scan-build+*)
|
||||
make="$SCAN_BUILD $make" ;;
|
||||
esac
|
||||
if test "$ALLOW_FAIL" = "1"; then
|
||||
case $BUILD_METHOD in valgrind | valgrind+* | *+valgrind | *+valgrind+*)
|
||||
EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS -DWITH_VALGRIND" ;;
|
||||
esac
|
||||
if [[ $ALLOW_FAIL == 1 ]]; then
|
||||
echo "ALLOW_FAIL=$ALLOW_FAIL"
|
||||
set +e
|
||||
fi
|
||||
export EXTRA_CPPFLAGS EXTRA_CXXFLAGS EXTRA_LDFLAGS
|
||||
|
||||
$make
|
||||
|
||||
|
||||
Reference in New Issue
Block a user