diff --git a/travis/build.sh b/travis/build.sh index a1b5d89..98052d0 100755 --- a/travis/build.sh +++ b/travis/build.sh @@ -4,6 +4,15 @@ set -e # Set VV in .travis.yml to make scripts verbose [ "$VV" ] && set -x +CACHEDIR="$HOME/.cache" + +eval $(grep "EPICS_BASE=" ${CACHEDIR}/RELEASE.local) +export EPICS_BASE + +[ -z "$EPICS_HOST_ARCH" -a -f $EPICS_BASE/src/tools/EpicsHostArch.pl ] && EPICS_HOST_ARCH=$(perl $EPICS_BASE/src/tools/EpicsHostArch.pl) +[ -z "$EPICS_HOST_ARCH" -a -f $EPICS_BASE/startup/EpicsHostArch.pl ] && EPICS_HOST_ARCH=$(perl $EPICS_BASE/startup/EpicsHostArch.pl) +export EPICS_HOST_ARCH + make -j2 $EXTRA if [ "$TEST" != "NO" ] diff --git a/travis/prepare.sh b/travis/prepare.sh index fed3739..e04a910 100755 --- a/travis/prepare.sh +++ b/travis/prepare.sh @@ -49,10 +49,12 @@ fold_end check.out.dependencies fold_start set.up.epics_build "Setting up EPICS build system" eval $(grep "EPICS_BASE=" ${CACHEDIR}/RELEASE.local) +export EPICS_BASE echo "EPICS_BASE=$EPICS_BASE" [ -z "$EPICS_HOST_ARCH" -a -f $EPICS_BASE/src/tools/EpicsHostArch.pl ] && EPICS_HOST_ARCH=$(perl $EPICS_BASE/src/tools/EpicsHostArch.pl) [ -z "$EPICS_HOST_ARCH" -a -f $EPICS_BASE/startup/EpicsHostArch.pl ] && EPICS_HOST_ARCH=$(perl $EPICS_BASE/startup/EpicsHostArch.pl) +export EPICS_HOST_ARCH echo "EPICS_HOST_ARCH=$EPICS_HOST_ARCH" if echo ${modules_to_compile} | grep -q "$EPICS_BASE"