Commit db4a44c7 authored by Andrea Valassi's avatar Andrea Valassi
Browse files

Recreate tag COOL_3_1_4 for LCG85swan1


git-svn-id: file:///git/lcgcool.svndb/cool/tags/COOL_3_1_4@20033 4525493e-7705-40b1-a816-d608a930855b
parents fca61d63 0d667477
......@@ -10,12 +10,17 @@ message(STATUS "LD_LIBRARY_PATH is $ENV{LD_LIBRARY_PATH}")
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
# Workaround for CORALCOOL-2806 (for lcgcmake without HEPToolsMacros.cmake)
set(Boost_ADDITIONAL_VERSIONS "1.59.0" "1.59")
# Workarounds for lcgcmake without HEPToolsMacros.cmake
# See CORALCOOL-2806 (1.59) and CORALCOOL-2903 (1.61)
# See also CORALCOOL-2846 for how this is likely to change eventually
set(Boost_ADDITIONAL_VERSIONS "1.59.0" "1.59" "1.61.0" "1.61")
# Workaround for CORALCOOL-2806 (CMAKE_COMPILER_IS_GNUCXX not set on Mac/clang)
IF(CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin")
set(Boost_COMPILER "-xgcc42")
# Workaround for SPI-842 (Boost tag is -clang38 for clang38 builds)
ELSEIF(BINARY_TAG MATCHES "clang38")
set(Boost_COMPILER "-clang38")
# Workaround for SPI-842 (Boost tag is -clang37 for clang37 builds)
ELSEIF(BINARY_TAG MATCHES "clang37")
set(Boost_COMPILER "-clang37")
......
......@@ -43,6 +43,7 @@
################################################################################
$(info -- Hostname is $(shell hostname))
$(info -- OS is $(shell uname -sr))
$(info -- Date is $(shell date))
$(info -- Starting build from $(shell pwd))
$(info -- BINARY_TAG is $(BINARY_TAG))
......@@ -62,11 +63,14 @@ endif
# Use ninja for faster builds (make for top-level commands, ninja internally)!
# [moved here from setupCmake.sh to use it also in lcgcmake (SPI-854)]
# Use AFS if no cvmfs (e.g. on buildcoverity, SPI-863)
# The hardcoded ninja path is valid on Linux but not on Darwin (CORALCOOL-2911)
ifeq ($(shell uname -s),Linux)
NINJADIR := /cvmfs/sft.cern.ch/lcg/contrib/ninja/1.4.0/x86_64-slc6
ifeq ($(wildcard $(NINJADIR)),)
NINJADIR := /afs/cern.ch/sw/lcg/contrib/ninja/1.4.0/x86_64-slc6
endif
export PATH := $(NINJADIR):$(PATH)
endif
NINJA := $(shell env PATH=$(NINJADIR):$(PATH) which ninja 2> /dev/null)
###NINJA := $(shell which ninja 2> /dev/null)
$(info -- Using NINJA=$(NINJA))
......
......@@ -14,7 +14,8 @@ if [ "$?" != "0" ]; then
exit 1
fi
source CMT_env.sh > /dev/null
export CMTPROJECTPATH=/cvmfs/sft.cern.ch/lcg/releases:$CMTPROJECTPATH
###export CMTPROJECTPATH=/cvmfs/sft.cern.ch/lcg/releases:$CMTPROJECTPATH
export CMTPROJECTPATH=/afs/cern.ch/sw/lcg/releases:$CMTPROJECTPATH # Temporary workaround for SPI-912
if [ ! -f setup.sh ]; then cmt config; fi
source setup.sh
popd > /dev/null
......
......@@ -81,10 +81,17 @@ for env in $envs; do
fi
done
echo "=== Compare $env"
# Compare cvmfs paths even if CMT uses afs (workaround for SPI-912)
cmt=`echo "$cmt" | sed 's|/afs/cern.ch/sw/lcg/releases|/cvmfs/sft.cern.ch/lcg/releases|g'`; cmt=${cmt%:}
# Use simpler expressions for equivalent paths (and remove trailing ":")
cmt=`echo "$cmt" | tr ":" "\n" | sed 's|releases/LCGCMT/LCGCMT_..root6/LCG_Settings/\.\./\.\./\.\.|releases|g' | tr "\n" ":"`; cmt=${cmt%:}
cmt=`echo "$cmt" | tr ":" "\n" | sed 's|releases/LCGCMT/LCGCMT_../LCG_Settings/\.\./\.\./\.\.|releases|g' | tr "\n" ":"`; cmt=${cmt%:}
cmt=`echo "$cmt" | tr ":" "\n" | sed 's|/src/../|/|g' | sed "s|$BINARY_TAG/../$BINARY_TAG|$BINARY_TAG|g" | tr "\n" ":"`; cmt=${cmt%:}
# Do not hardcode the specific BINARY_TAG in path dumps
cmt=`echo "$cmt" | sed 's|'$BINARY_TAG'/|${BINARY_TAG}/|g'`; cmt=${cmt%:}
cmk=`echo "$cmk" | sed 's|'$BINARY_TAG'/|${BINARY_TAG}/|g'`; cmk=${cmk%:}
cmt=`echo "$cmt" | sed 's|/'$BINARY_TAG'|/${BINARY_TAG}|g'`; cmt=${cmt%:}
cmk=`echo "$cmk" | sed 's|/'$BINARY_TAG'|/${BINARY_TAG}|g'`; cmk=${cmk%:}
# Compare the two environments and dump them if they differ
if [ "$cmt" != "$cmk" ]; then
cmtls=`echo $cmt | tr ":" "\n" | sort -u`
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment