From 2542aca4a538a37061bc80cab68ef503ac063838 Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Mon, 7 Mar 2016 22:54:15 +0100 Subject: travis: actually commit the build script --- build-aux/build-travis.sh | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100755 build-aux/build-travis.sh (limited to 'build-aux') diff --git a/build-aux/build-travis.sh b/build-aux/build-travis.sh new file mode 100755 index 0000000..68f8b05 --- /dev/null +++ b/build-aux/build-travis.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +set -ex + +rm -rf build +mkdir -p build + +MAKE_TARGET="${TARGET}" + +if test "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" + test "x${TARGET}" = "xw32" && export CHOST="i686-w64-mingw32" + MAKE_TARGET="all" +else + export CFLAGS="-Wall -g" + export CONFIGURE_ARGS="--enable-tests --enable-valgrind" +fi + +pushd build > /dev/null + +../configure \ + ${CHOST:+--host=${CHOST} --target=${CHOST}} \ + --enable-ronn \ + --disable-silent-rules \ + ${CONFIGURE_ARGS} + +popd > /dev/null + +make -C build "${MAKE_TARGET}" -- cgit v1.2.3-18-g5258 From 392b63f752103eed3febd68a49daf8a653ee5eba Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Mon, 7 Mar 2016 22:59:51 +0100 Subject: travis: remove wrong quotes from build script --- build-aux/build-travis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build-aux') diff --git a/build-aux/build-travis.sh b/build-aux/build-travis.sh index 68f8b05..d178495 100755 --- a/build-aux/build-travis.sh +++ b/build-aux/build-travis.sh @@ -7,7 +7,7 @@ mkdir -p build MAKE_TARGET="${TARGET}" -if test "x${TARGET}" = "xw*"; then +if test "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" -- cgit v1.2.3-18-g5258 From 99661b01b0dbf6a0ccb34574f599992e714ac726 Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Mon, 7 Mar 2016 23:07:36 +0100 Subject: travis: fix if statement in build script --- build-aux/build-travis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build-aux') diff --git a/build-aux/build-travis.sh b/build-aux/build-travis.sh index d178495..eb6262a 100755 --- a/build-aux/build-travis.sh +++ b/build-aux/build-travis.sh @@ -7,7 +7,7 @@ mkdir -p build MAKE_TARGET="${TARGET}" -if test "x${TARGET}" = xw*; then +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" -- cgit v1.2.3-18-g5258 From 9d3ec71e43bb00e9750c53cfd8f5ac095d392f5a Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Tue, 8 Mar 2016 05:04:51 +0100 Subject: travis: trying to create windows zip --- build-aux/build-travis.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'build-aux') diff --git a/build-aux/build-travis.sh b/build-aux/build-travis.sh index eb6262a..0d656e3 100755 --- a/build-aux/build-travis.sh +++ b/build-aux/build-travis.sh @@ -29,3 +29,17 @@ pushd build > /dev/null popd > /dev/null make -C build "${MAKE_TARGET}" + +if [[ "x${TARGET}" = xw* ]]; then + VERSION="$(grep PACKAGE_VERSION config.h | cut -d\" -f2)" + DEST_DIR="blogc-${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 "${DEST_DIR}.zip" "${DEST_DIR}"/* +fi -- cgit v1.2.3-18-g5258 From d8f0fc6cb36a9d7c153a974b5095a4efb8c8add0 Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Tue, 8 Mar 2016 05:10:51 +0100 Subject: travis: minor fix --- build-aux/build-travis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build-aux') diff --git a/build-aux/build-travis.sh b/build-aux/build-travis.sh index 0d656e3..d400494 100755 --- a/build-aux/build-travis.sh +++ b/build-aux/build-travis.sh @@ -31,7 +31,7 @@ popd > /dev/null make -C build "${MAKE_TARGET}" if [[ "x${TARGET}" = xw* ]]; then - VERSION="$(grep PACKAGE_VERSION config.h | cut -d\" -f2)" + VERSION="$(grep PACKAGE_VERSION build/config.h | cut -d\" -f2)" DEST_DIR="blogc-${VERSION}-${TARGET}" rm -rf "${DEST_DIR}" -- cgit v1.2.3-18-g5258 From 214d09891909ce5505d7bdbc5c848a9c4be23c0d Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Tue, 8 Mar 2016 20:33:21 +0100 Subject: travis: added script to upload distfiles --- build-aux/build-travis.sh | 45 ----------------------------------- build-aux/build-windows.sh | 48 ------------------------------------- build-aux/travis-build.sh | 47 ++++++++++++++++++++++++++++++++++++ build-aux/travis-deploy.sh | 59 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 106 insertions(+), 93 deletions(-) delete mode 100755 build-aux/build-travis.sh delete mode 100755 build-aux/build-windows.sh create mode 100755 build-aux/travis-build.sh create mode 100755 build-aux/travis-deploy.sh (limited to 'build-aux') diff --git a/build-aux/build-travis.sh b/build-aux/build-travis.sh deleted file mode 100755 index d400494..0000000 --- a/build-aux/build-travis.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -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" - test "x${TARGET}" = "xw32" && export CHOST="i686-w64-mingw32" - MAKE_TARGET="all" -else - export CFLAGS="-Wall -g" - export CONFIGURE_ARGS="--enable-tests --enable-valgrind" -fi - -pushd build > /dev/null - -../configure \ - ${CHOST:+--host=${CHOST} --target=${CHOST}} \ - --enable-ronn \ - --disable-silent-rules \ - ${CONFIGURE_ARGS} - -popd > /dev/null - -make -C build "${MAKE_TARGET}" - -if [[ "x${TARGET}" = xw* ]]; then - VERSION="$(grep PACKAGE_VERSION build/config.h | cut -d\" -f2)" - DEST_DIR="blogc-${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 "${DEST_DIR}.zip" "${DEST_DIR}"/* -fi diff --git a/build-aux/build-windows.sh b/build-aux/build-windows.sh deleted file mode 100755 index bdecc8b..0000000 --- a/build-aux/build-windows.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -# This script builds windows binaries, given a source tarball. -# It was designed to work on Fedora, and requires the following packages: -# -# mingw32-gcc mingw64-gcc zip -# -# This script must be called with the xz source tarball and the target version -# as arguments. - - -set -ex - -[[ $# -eq 2 ]] - - -build() { - local version=${2} - local arch=${3} - local build_dir="/tmp/blogc_build_${version}_${arch}" - local dest_dir="/tmp/blogc-${version}-w${arch}" - - rm -rf "${build_dir}" - mkdir -p "${build_dir}" - tar -xvf "${1}" -C "${build_dir}" - - pushd "${build_dir}/blogc-${version}" &> /dev/null - "mingw${arch}-configure" - make - popd &> /dev/null - - rm -rf "${dest_dir}" - mkdir -p "${dest_dir}" - cp "${build_dir}/blogc-${version}/.libs/blogc.exe" "${dest_dir}/" - cp "${build_dir}/blogc-${version}/LICENSE" "${dest_dir}/" - cp "${build_dir}/blogc-${version}/README.md" "${dest_dir}/" - - pushd "$(dirname ${dest_dir})" &> /dev/null - zip "$(basename ${dest_dir}).zip" "$(basename ${dest_dir})"/* - popd &> /dev/null - - mv "${dest_dir}.zip" . -} - - -for arch in 32 64; do - build "$1" "$2" "${arch}" -done diff --git a/build-aux/travis-build.sh b/build-aux/travis-build.sh new file mode 100755 index 0000000..d03cafd --- /dev/null +++ b/build-aux/travis-build.sh @@ -0,0 +1,47 @@ +#!/bin/bash + +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" +else + export CFLAGS="-Wall -g" + export CONFIGURE_ARGS="--enable-tests --enable-valgrind" +fi + +pushd build > /dev/null + +../configure \ + ${CHOST:+--host=${CHOST} --target=${CHOST}} \ + --enable-ronn \ + --with-squareball=internal \ + --disable-silent-rules \ + ${CONFIGURE_ARGS} + +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 diff --git a/build-aux/travis-deploy.sh b/build-aux/travis-deploy.sh new file mode 100755 index 0000000..267c8d5 --- /dev/null +++ b/build-aux/travis-deploy.sh @@ -0,0 +1,59 @@ +#!/bin/bash + +set -e + +if [[ "x${TARGET}" != xw* ]] && [[ "x${TARGET}" != xdist* ]]; then + echo "Nothing to deploy." + exit 0 +fi + +if [[ ! -d build ]]; then + echo "Build directory not found." + exit 1 +fi + +if [[ "x${TARGET}" = xw* ]]; then + FILES=( build/*.zip ) +elif [[ "x${TARGET}" = "xdist-srpm" ]]; then + FILES=( build/*.src.rpm ) +else + FILES=( build/*.{*.tar.{gz,bz2,xz},zip} ) +fi + +TARNAME="$(grep PACKAGE_TARNAME build/config.h | cut -d\" -f2)" +VERSION="$(grep PACKAGE_VERSION build/config.h | cut -d\" -f2)" + +do_curl() { + curl \ + --silent \ + --ftp-create-dirs \ + --upload-file "${1}" \ + --user "${FTP_USER}:${FTP_PASSWORD}" \ + "ftp://${FTP_HOST}/public_html/${TARNAME}/${TARNAME}-${VERSION}/$(basename ${1})" +} + +echo " * Found files:" +for f in "${FILES[@]}"; do + echo " $(basename ${f})" +done +echo + +for f in "${FILES[@]}"; do + echo " * Processing file: $(basename ${f}):" + + echo -n " Generating SHA512 checksum ... " + pushd build > /dev/null + sha512sum "$(basename ${f})" > "$(basename ${f}).sha512" + popd > /dev/null + echo "done" + + echo -n " Uploading file ... " + do_curl "${f}" + echo "done" + + echo -n " Uploading SHA512 checksum ... " + do_curl "${f}.sha512" + echo "done" + + echo +done -- cgit v1.2.3-18-g5258 From b8206af55ad7143fecb8c82e549571466b53680f Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Tue, 8 Mar 2016 23:44:04 +0100 Subject: travis: temporary remove --silent from curl call --- build-aux/travis-deploy.sh | 1 - 1 file changed, 1 deletion(-) (limited to 'build-aux') diff --git a/build-aux/travis-deploy.sh b/build-aux/travis-deploy.sh index 267c8d5..a959ccb 100755 --- a/build-aux/travis-deploy.sh +++ b/build-aux/travis-deploy.sh @@ -25,7 +25,6 @@ VERSION="$(grep PACKAGE_VERSION build/config.h | cut -d\" -f2)" do_curl() { curl \ - --silent \ --ftp-create-dirs \ --upload-file "${1}" \ --user "${FTP_USER}:${FTP_PASSWORD}" \ -- cgit v1.2.3-18-g5258 From 847aab8299bcff9d259aa5b6eb4686ae4f2fb763 Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Wed, 9 Mar 2016 00:10:36 +0100 Subject: travis: optimize --- build-aux/travis-deploy.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'build-aux') diff --git a/build-aux/travis-deploy.sh b/build-aux/travis-deploy.sh index a959ccb..65f162e 100755 --- a/build-aux/travis-deploy.sh +++ b/build-aux/travis-deploy.sh @@ -2,7 +2,7 @@ set -e -if [[ "x${TARGET}" != xw* ]] && [[ "x${TARGET}" != xdist* ]]; then +if [[ "x${TARGET}" != xw* ]] && [[ "x${TARGET}" != xdist* ]] && [[ "x${CC}" != xgcc ]]; then echo "Nothing to deploy." exit 0 fi @@ -25,6 +25,7 @@ VERSION="$(grep PACKAGE_VERSION build/config.h | cut -d\" -f2)" do_curl() { curl \ + --silent \ --ftp-create-dirs \ --upload-file "${1}" \ --user "${FTP_USER}:${FTP_PASSWORD}" \ -- cgit v1.2.3-18-g5258 From 70f1a705c4b12486dd75a4f61aeae730772b5e84 Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Wed, 9 Mar 2016 00:22:41 +0100 Subject: travis: optimize --- build-aux/travis-deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build-aux') diff --git a/build-aux/travis-deploy.sh b/build-aux/travis-deploy.sh index 65f162e..267c8d5 100755 --- a/build-aux/travis-deploy.sh +++ b/build-aux/travis-deploy.sh @@ -2,7 +2,7 @@ set -e -if [[ "x${TARGET}" != xw* ]] && [[ "x${TARGET}" != xdist* ]] && [[ "x${CC}" != xgcc ]]; then +if [[ "x${TARGET}" != xw* ]] && [[ "x${TARGET}" != xdist* ]]; then echo "Nothing to deploy." exit 0 fi -- cgit v1.2.3-18-g5258 From 3ead966f48bc47444d7ec72f46e94e73557695a5 Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Wed, 9 Mar 2016 22:22:48 +0100 Subject: travis: improved deploy conditions --- build-aux/travis-deploy.sh | 5 ----- 1 file changed, 5 deletions(-) (limited to 'build-aux') diff --git a/build-aux/travis-deploy.sh b/build-aux/travis-deploy.sh index 267c8d5..71469ff 100755 --- a/build-aux/travis-deploy.sh +++ b/build-aux/travis-deploy.sh @@ -2,11 +2,6 @@ set -e -if [[ "x${TARGET}" != xw* ]] && [[ "x${TARGET}" != xdist* ]]; then - echo "Nothing to deploy." - exit 0 -fi - if [[ ! -d build ]]; then echo "Build directory not found." exit 1 -- cgit v1.2.3-18-g5258 From fb15c8477e178abeb72e196f77da168e956768bf Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Wed, 6 Apr 2016 01:04:43 +0200 Subject: travis: trying to fix deploy --- build-aux/travis-deploy.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'build-aux') diff --git a/build-aux/travis-deploy.sh b/build-aux/travis-deploy.sh index 71469ff..0ef28bf 100755 --- a/build-aux/travis-deploy.sh +++ b/build-aux/travis-deploy.sh @@ -2,6 +2,21 @@ set -e +if [[ "x${TRAVIS_PULL_REQUEST}" != "xfalse" ]]; then + echo "This is a pull request. skipping deploy ..." + exit 0 +fi + +if [[ "x${TRAVIS_BRANCH}" != "xmaster" ]] && [[ "x${TRAVIS_TAG}" != xv* ]]; then + echo "This isn't master branch nor a valid tag. skipping deploy ..." + exit 0 +fi + +if [[ "x${CC}" != "xgcc" ]] || [[ "x${TARGET}" = "xvalgrind" ]]; then + echo "Invalid target for deploy. skipping ..." + exit 0 +fi + if [[ ! -d build ]]; then echo "Build directory not found." exit 1 -- cgit v1.2.3-18-g5258 From 9699bf0ce6b34c0d05c509925f3367f2200caad5 Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Wed, 27 Apr 2016 02:34:19 +0200 Subject: remove squareball for good --- build-aux/travis-build.sh | 1 - 1 file changed, 1 deletion(-) (limited to 'build-aux') diff --git a/build-aux/travis-build.sh b/build-aux/travis-build.sh index d03cafd..1fcac10 100755 --- a/build-aux/travis-build.sh +++ b/build-aux/travis-build.sh @@ -23,7 +23,6 @@ pushd build > /dev/null ../configure \ ${CHOST:+--host=${CHOST} --target=${CHOST}} \ --enable-ronn \ - --with-squareball=internal \ --disable-silent-rules \ ${CONFIGURE_ARGS} -- cgit v1.2.3-18-g5258 From 6f975248895d0300c6fd8783b1138bdd4be00bcc Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Wed, 27 Apr 2016 03:22:31 +0200 Subject: blogc-git-receiver: import external tool to blogc repository still in the effort to reduce maintenance work, I'm importing blogc-git-receiver tool to the main blogc repository. the tool is build by default, if needed headers are found. that means that it will probably only be built for posix-compliant operating systems. --- build-aux/travis-build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'build-aux') diff --git a/build-aux/travis-build.sh b/build-aux/travis-build.sh index 1fcac10..4187575 100755 --- a/build-aux/travis-build.sh +++ b/build-aux/travis-build.sh @@ -13,9 +13,10 @@ if [[ "x${TARGET}" = xw* ]]; then export CHOST="x86_64-w64-mingw32" [[ "x${TARGET}" = "xw32" ]] && export CHOST="i686-w64-mingw32" MAKE_TARGET="all" + CONFIGURE_ARGS="--disable-git-receiver" else export CFLAGS="-Wall -g" - export CONFIGURE_ARGS="--enable-tests --enable-valgrind" + CONFIGURE_ARGS="--enable-tests --enable-valgrind" fi pushd build > /dev/null -- cgit v1.2.3-18-g5258 From c4b294c890c28004d33f650b7af5064c4099f608 Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Wed, 27 Apr 2016 03:51:42 +0200 Subject: blogc-runserver: import external tool to blogc repository still in the effort to reduce maintenance work, I'm importing blogc-runserver tool to the main blogc repository. the tool is build by default, if needed headers and libraries are found. --- build-aux/travis-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build-aux') diff --git a/build-aux/travis-build.sh b/build-aux/travis-build.sh index 4187575..e16e5c7 100755 --- a/build-aux/travis-build.sh +++ b/build-aux/travis-build.sh @@ -13,10 +13,10 @@ if [[ "x${TARGET}" = xw* ]]; then export CHOST="x86_64-w64-mingw32" [[ "x${TARGET}" = "xw32" ]] && export CHOST="i686-w64-mingw32" MAKE_TARGET="all" - CONFIGURE_ARGS="--disable-git-receiver" + CONFIGURE_ARGS="--disable-tests --disable-valgrind --disable-git-receiver --disable-runserver" else export CFLAGS="-Wall -g" - CONFIGURE_ARGS="--enable-tests --enable-valgrind" + CONFIGURE_ARGS="--enable-tests --enable-valgrind --enable-git-receiver --enable-runserver" fi pushd build > /dev/null -- cgit v1.2.3-18-g5258 From 4b62c5dbb57fabdf48f72e142442af6c6a3334b9 Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Thu, 28 Apr 2016 03:08:34 +0200 Subject: build: drop windows support --- build-aux/travis-build.sh | 38 ++++++-------------------------------- build-aux/travis-deploy.sh | 4 +--- 2 files changed, 7 insertions(+), 35 deletions(-) (limited to 'build-aux') 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} ) -- cgit v1.2.3-18-g5258