v1.20.1
This commit is contained in:
+9
-6
@@ -3,8 +3,8 @@
|
||||
#<facility = sls sls2 sf> default is sf
|
||||
#<target_language = cpp matlab python>
|
||||
module unload gcc
|
||||
module load gcc/7.5.0 #7.5.0 for py38 py310 7.3.0 py37
|
||||
#module load gcc/8.5.0 #rhel8
|
||||
#module load gcc/7.3.0 #7.5.0 for py38 py310 7.3.0 py37
|
||||
module load gcc/10.4.0 ##rhel8
|
||||
### psi specific - end
|
||||
|
||||
rm -f configure.ac
|
||||
@@ -24,7 +24,7 @@ automake --force --add-missing --copy
|
||||
#Used by ./configure
|
||||
#Assumes format ${EPICS}/base-3.14.12
|
||||
#source cafeVersion-gcc-7.3.0
|
||||
CAFE_V="cafe-1.19.3"
|
||||
CAFE_V="cafe-1.20.1"
|
||||
EPICS_BASE='base-7.0.7' #
|
||||
|
||||
#For later check of existence of HOST_ARCH for $EPICS/include/os/$HOST_ARCH
|
||||
@@ -52,8 +52,11 @@ echo $EPICS_BASE
|
||||
FACILITY=$(echo "$1" | tr '[:upper:]' '[:lower:]')
|
||||
CACLIENT=$(echo "$2" | tr '[:upper:]' '[:lower:]')
|
||||
|
||||
FACILITY_DEFAULT="sf"
|
||||
CACLIENT_DEFAULT="python"
|
||||
#FACILITY_DEFAULT="sf"
|
||||
#CACLIENT_DEFAULT="python"
|
||||
|
||||
FACILITY_DEFAULT="sls2"
|
||||
CACLIENT_DEFAULT="py37"
|
||||
|
||||
FACILITY_TEMP=""
|
||||
CACLIENT_TEMP=""
|
||||
@@ -92,7 +95,7 @@ fi
|
||||
|
||||
if [ -z "$FACILITY" ]
|
||||
then
|
||||
FACILITY="sf"
|
||||
FACILITY=$FACILITY_DEFAULT
|
||||
echo "FACILITY = " $FACILITY
|
||||
if [ -z $CACLIENT ]
|
||||
then
|
||||
|
||||
Reference in New Issue
Block a user