Skip to content

Commit

Permalink
Merge IB/CMSSW_11_1_X/master into IB/CMSSW_11_1_X/rootmaster.
Browse files Browse the repository at this point in the history
  • Loading branch information
cmsbuild committed Jan 22, 2020
2 parents d4d0c54 + 51fdd3e commit 1e4c138
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
12 changes: 6 additions & 6 deletions crab/crab-setup.csh.file
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
#!/bin/tcsh
#CMSDIST_FILE_REVISION=1
setenv CRABCLINET_TYPE ""
setenv CRABCLIENT_TYPE ""
switch ("X$1Y")
case XprodY:
case XpreY:
case XdevY:
setenv CRABCLINET_TYPE "$1"
setenv CRABCLIENT_TYPE "$1"
breaksw
case XY:
setenv CRABCLINET_TYPE "prod"
setenv CRABCLIENT_TYPE "prod"
breaksw
default:
echo "ERROR: Invalid CRAB type '$1' provided. Valid values are prod, pre and dev."
echo "Usage: $0 [prod|pre|dev]"
breaksw
endsw
if (${?CRABCLINET_TYPE}) then
if (${?CRABCLIENT_TYPE}) then
set crab_shared_dir="@CMS_PATH@/share/cms/crab/@CRAB_COMMON_VERSION@"
if (${?PYTHONPATH}) then
setenv PYTHONPATH "${crab_shared_dir}/lib/${CRABCLINET_TYPE}:$PYTHONPATH"
setenv PYTHONPATH "${crab_shared_dir}/lib/${CRABCLIENT_TYPE}:$PYTHONPATH"
else
setenv PYTHONPATH "${crab_shared_dir}/lib/${CRABCLINET_TYPE}"
setenv PYTHONPATH "${crab_shared_dir}/lib/${CRABCLIENT_TYPE}"
endif
unset crab_shared_dir
endif
10 changes: 5 additions & 5 deletions crab/crab-setup.sh.file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#!/bin/bash
#CMSDIST_FILE_REVISION=1
case "X$1Y" in
XprodY|XdevY|XpreY) CRABCLINET_TYPE="$1" ;;
XY ) CRABCLINET_TYPE="prod" ;;
XprodY|XdevY|XpreY) CRABCLIENT_TYPE="$1" ;;
XY ) CRABCLIENT_TYPE="prod" ;;
* )
echo "ERROR: Invalid CRAB type '$1' provided, valid values are prod, pre and dev."
echo "Usage: $0 [prod|pre|dev]"
return 1
;;
esac
export CRABCLINET_TYPE
export CRABCLIENT_TYPE
crab_shared_dir="@CMS_PATH@/share/cms/crab/@CRAB_COMMON_VERSION@"
export PYTHONPATH="${crab_shared_dir}/lib/${CRABCLINET_TYPE}${PYTHONPATH:+:$PYTHONPATH}"
complete -F _UseCrab_${CRABCLINET_TYPE} -o filenames crab
export PYTHONPATH="${crab_shared_dir}/lib/${CRABCLIENT_TYPE}${PYTHONPATH:+:$PYTHONPATH}"
complete -F _UseCrab_${CRABCLIENT_TYPE} -o filenames crab
unset crab_shared_dir
4 changes: 2 additions & 2 deletions crab/crab.sh.file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#Use crab-prod for default crab command
crab_pkg=$(basename $0)
if [ "${crab_pkg}" = "crab" ] ; then
if [ "$CRABCLINET_TYPE" = "" ] ; then CRABCLINET_TYPE="prod" ; fi
crab_pkg="crab-${CRABCLINET_TYPE}"
if [ "$CRABCLIENT_TYPE" = "" ] ; then CRABCLIENT_TYPE="prod" ; fi
crab_pkg="crab-${CRABCLIENT_TYPE}"
fi

#Search for latest crab version for cmsos
Expand Down
2 changes: 1 addition & 1 deletion scram-project-build.file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Requires: glibc
%endif

%if "%{?configtag:set}" != "set"
%define configtag V05-08-74
%define configtag V05-08-75
%endif

%if "%{?cvssrc:set}" != "set"
Expand Down

0 comments on commit 1e4c138

Please sign in to comment.