diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..e4b2b82 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,22 @@ +sudo: false +dist: trusty +language: c++ +compiler: + - gcc +addons: + apt: + packages: + - libreadline6-dev + - libncurses5-dev + - perl + - clang + - g++-mingw-w64-i686 +env: + - BRBASE=3.16 WINE=32 + - BRBASE=3.16 USR_CXXFLAGS=-std=c++11 CMPLR=clang + - BRBASE=3.15 + - BRBASE=3.14 +install: + - ./build-deps.sh +script: + - make -j2 diff --git a/ci/travis-prepare.sh b/build-deps.sh similarity index 62% rename from ci/travis-prepare.sh rename to build-deps.sh index 2362a35..3d08589 100755 --- a/ci/travis-prepare.sh +++ b/build-deps.sh @@ -1,20 +1,28 @@ #!/bin/sh set -e -x +CURDIR="$PWD" + cat << EOF > configure/RELEASE.local EPICS_BASE=$HOME/.source/epics-base PVDATA=$HOME/.source/pvDataCPP +PVACCESS=$HOME/.source/pvAccessCPP +NORMATIVETYPES=$HOME/.source/normativeTypesCPP EOF cat configure/RELEASE.local install -d "$HOME/.source" cd "$HOME/.source" -git clone --quiet --depth 5 --branch "${BRBASE:-master}" https://github.com/${SRCBASE:-epics-base}/epics-base.git epics-base -git clone --quiet --depth 5 --branch "${BRPVD:-master}" https://github.com/${SRCPVD:-epics-base}/pvDataCPP.git pvDataCPP +git clone --quiet --depth 5 --branch "${BRBASE:-master}" https://github.com/epics-base/epics-base.git epics-base +git clone --quiet --depth 5 --branch "${BRPVD:-master}" https://github.com/epics-base/pvDataCPP.git pvDataCPP +git clone --quiet --depth 5 --branch "${BRPVA:-master}" https://github.com/epics-base/pvAccessCPP.git pvAccessCPP +git clone --quiet --depth 5 --branch "${BRNT:-master}" https://github.com/epics-base/normativeTypesCPP.git normativeTypesCPP (cd epics-base && git log -n1 ) (cd pvDataCPP && git log -n1 ) +(cd pvAccessCPP && git log -n1 ) +(cd normativeTypesCPP && git log -n1 ) EPICS_HOST_ARCH=`sh epics-base/startup/EpicsHostArch` @@ -31,15 +39,6 @@ CROSS_COMPILER_TARGET_ARCHS+=win32-x86-mingw EOF fi -if [ "$STATIC" = "YES" ] -then - echo "Build static libraries/executables" - cat << EOF >> epics-base/configure/CONFIG_SITE -SHARED_LIBRARIES=NO -STATIC_BUILD=YES -EOF -fi - case "$CMPLR" in clang) echo "Host compiler is clang" @@ -65,5 +64,18 @@ cat << EOF > pvDataCPP/configure/RELEASE.local EPICS_BASE=$HOME/.source/epics-base EOF +cat << EOF > pvAccessCPP/configure/RELEASE.local +PVDATA=$HOME/.source/pvDataCPP +EPICS_BASE=$HOME/.source/epics-base +EOF + +cat << EOF > normativeTypesCPP/configure/RELEASE.local +PVDATA=$HOME/.source/pvDataCPP +EPICS_BASE=$HOME/.source/epics-base +PVACCESS=$HOME/.source/pvAccessCPP +EOF + make -j2 -C epics-base make -j2 -C pvDataCPP +make -j2 -C pvAccessCPP +make -j2 -C normativeTypesCPP diff --git a/ci/travis-build.sh b/ci/travis-build.sh deleted file mode 100755 index 36c49cf..0000000 --- a/ci/travis-build.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -set -e -x - -make -j2 - -if [ "$TEST" != "NO" ] -then - make tapfiles - find . -name '*.tap' -print0 | xargs -0 -n1 prove -e cat -f -fi