diff options
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rwxr-xr-x | build-aux/travis-build.sh | 38 | ||||
| -rwxr-xr-x | build-aux/travis-deploy.sh | 4 |
3 files changed, 7 insertions, 43 deletions
diff --git a/.travis.yml b/.travis.yml index c4bd479..15c4906 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,6 @@ language: c addons: apt: packages: - - gcc-mingw-w64-i686 - - gcc-mingw-w64-x86-64 - libcmocka-dev - libmagic-dev - libevent-dev @@ -21,16 +19,10 @@ env: - TARGET=valgrind - TARGET=distcheck - TARGET=dist-srpm - - TARGET=w32 - - TARGET=w64 matrix: exclude: - compiler: clang - env: TARGET=w32 - - compiler: clang - env: TARGET=w64 - - compiler: clang env: TARGET=dist-srpm install: gem install ronn diff --git a/build-aux/travis-build.sh b/build-aux/travis-build.sh index e16e5c7..53cf589 100755 --- a/build-aux/travis-build.sh +++ b/build-aux/travis-build.sh @@ -5,43 +5,17 @@ set -ex rm -rf build mkdir -p build -MAKE_TARGET="${TARGET}" - -if [[ "x${TARGET}" = xw* ]]; then - unset CC - export CFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4" - export CHOST="x86_64-w64-mingw32" - [[ "x${TARGET}" = "xw32" ]] && export CHOST="i686-w64-mingw32" - MAKE_TARGET="all" - CONFIGURE_ARGS="--disable-tests --disable-valgrind --disable-git-receiver --disable-runserver" -else - export CFLAGS="-Wall -g" - CONFIGURE_ARGS="--enable-tests --enable-valgrind --enable-git-receiver --enable-runserver" -fi - pushd build > /dev/null ../configure \ - ${CHOST:+--host=${CHOST} --target=${CHOST}} \ + CFLAGS="-Wall -g" \ --enable-ronn \ --disable-silent-rules \ - ${CONFIGURE_ARGS} + --enable-tests \ + --enable-valgrind \ + --enable-git-receiver \ + --enable-runserver popd > /dev/null -make -C build "${MAKE_TARGET}" - -if [[ "x${TARGET}" = xw* ]]; then - TARNAME="$(grep PACKAGE_TARNAME build/config.h | cut -d\" -f2)" - VERSION="$(grep PACKAGE_VERSION build/config.h | cut -d\" -f2)" - DEST_DIR="${TARNAME}-${VERSION}-${TARGET}" - - rm -rf "${DEST_DIR}" - mkdir -p "${DEST_DIR}" - - cp build/.libs/blogc.exe "${DEST_DIR}/" - cp LICENSE "${DEST_DIR}/" - cp README.md "${DEST_DIR}/" - - zip "build/${DEST_DIR}.zip" "${DEST_DIR}"/* -fi +make -C build "${TARGET}" diff --git a/build-aux/travis-deploy.sh b/build-aux/travis-deploy.sh index 0ef28bf..51aac3e 100755 --- a/build-aux/travis-deploy.sh +++ b/build-aux/travis-deploy.sh @@ -22,9 +22,7 @@ if [[ ! -d build ]]; then exit 1 fi -if [[ "x${TARGET}" = xw* ]]; then - FILES=( build/*.zip ) -elif [[ "x${TARGET}" = "xdist-srpm" ]]; then +if [[ "x${TARGET}" = "xdist-srpm" ]]; then FILES=( build/*.src.rpm ) else FILES=( build/*.{*.tar.{gz,bz2,xz},zip} ) |