travis: consider base build (BASE=SELF)
This commit is contained in:
@@ -45,23 +45,31 @@ fold_end load.settings
|
|||||||
# Check out dependencies
|
# Check out dependencies
|
||||||
# ----------------------
|
# ----------------------
|
||||||
|
|
||||||
fold_start check.out.dependencies "Checking/cloning dependencies"
|
if [ "$BASE" != "SELF" ]
|
||||||
|
then
|
||||||
|
fold_start check.out.dependencies "Checking/cloning dependencies"
|
||||||
|
|
||||||
for mod in BASE $ADD_MODULES $MODULES
|
for mod in BASE $ADD_MODULES $MODULES
|
||||||
do
|
do
|
||||||
mod_uc=${mod^^}
|
mod_uc=${mod^^}
|
||||||
eval add_dependency $mod_uc \${${mod_uc}:=master}
|
eval add_dependency $mod_uc \${${mod_uc}:=master}
|
||||||
done
|
done
|
||||||
[ -e ./configure ] && cp ${CACHEDIR}/RELEASE.local ./configure/RELEASE.local
|
[ -e ./configure ] && cp ${CACHEDIR}/RELEASE.local ./configure/RELEASE.local
|
||||||
|
|
||||||
fold_end check.out.dependencies
|
fold_end check.out.dependencies
|
||||||
|
fi
|
||||||
|
|
||||||
# Set up compiler
|
# Set up compiler
|
||||||
# ---------------
|
# ---------------
|
||||||
|
|
||||||
fold_start set.up.epics_build "Setting up EPICS build system"
|
fold_start set.up.epics_build "Setting up EPICS build system"
|
||||||
|
|
||||||
eval $(grep "EPICS_BASE=" ${CACHEDIR}/RELEASE.local)
|
if [ "$BASE" = "SELF" ]
|
||||||
|
then
|
||||||
|
EPICS_BASE=$CURDIR
|
||||||
|
else
|
||||||
|
eval $(grep "EPICS_BASE=" ${CACHEDIR}/RELEASE.local)
|
||||||
|
fi
|
||||||
export EPICS_BASE
|
export EPICS_BASE
|
||||||
echo "EPICS_BASE=$EPICS_BASE"
|
echo "EPICS_BASE=$EPICS_BASE"
|
||||||
|
|
||||||
@@ -70,7 +78,7 @@ echo "EPICS_BASE=$EPICS_BASE"
|
|||||||
export EPICS_HOST_ARCH
|
export EPICS_HOST_ARCH
|
||||||
echo "EPICS_HOST_ARCH=$EPICS_HOST_ARCH"
|
echo "EPICS_HOST_ARCH=$EPICS_HOST_ARCH"
|
||||||
|
|
||||||
if echo ${modules_to_compile} | grep -q "$EPICS_BASE"
|
if echo ${modules_to_compile} | grep -q "$EPICS_BASE" || [ "$BASE" = "SELF" ]
|
||||||
then
|
then
|
||||||
|
|
||||||
# requires wine and g++-mingw-w64-i686
|
# requires wine and g++-mingw-w64-i686
|
||||||
@@ -180,6 +188,8 @@ fold_end set.up.compiler
|
|||||||
echo "\$ make --version"
|
echo "\$ make --version"
|
||||||
make --version
|
make --version
|
||||||
|
|
||||||
|
[ "$BASE" = "SELF" ] && exit 0
|
||||||
|
|
||||||
# Build required dependencies
|
# Build required dependencies
|
||||||
# ---------------------------
|
# ---------------------------
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user