ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CMSDIST/cms-env.spec
(Generate patch)

Comparing COMP/CMSDIST/cms-env.spec (file contents):
Revision 1.29 by eulisse, Wed Aug 2 19:17:11 2006 UTC vs.
Revision 1.37 by ratnik, Thu Mar 8 21:06:28 2007 UTC

# Line 18 | Line 18 | osarch=`%instroot/bin/cmsos`
18   compilerv=gcc323
19   # We need to assume 1 compiler per platform.
20   # There is no other way around this.
21 < if [! $SCRAM_ARCH ]
21 > if [ ! "$SCRAM_ARCH" ]
22   then
23      case $osarch in
24          slc3_ia32) compilerv=gcc323;;
25          slc3_amd64) compilerv=gcc344;;
26          slc4_ia32) compilerv=gcc345;;
27 <        slc4_amd64) compilerv=gcc345;;
28 <        osx104_ia32) compilerv=gcc400;;
27 >        slc4_amd64) compilerv=gcc345; osarch=slc4_ia32;;
28 >        osx104_ia32) compilerv=gcc401;;
29          osx104_pcc32) compilerv=gcc400;;
30      esac
31      echo ${osarch}_${compilerv}
# Line 73 | Line 73 | if [ ! $CMS_PATH ]
73   then
74      export CMS_PATH=$here
75   fi
76 +
77 + if [ -f $CMS_PATH/SITECONF/local/JobConfig/cmsset_local.sh ]; then
78 +        . $CMS_PATH/SITECONF/local/JobConfig/cmsset_local.sh
79 + fi
80   EOF_CMSSET_DEFAULT_SH
81  
82  
# Line 112 | Line 116 | end
116   if ( ! ${?CMS_PATH} ) then
117      setenv CMS_PATH $here
118   endif
119 +
120 + if( -e $CMS_PATH/SITECONF/local/JobConfig/cmsset_local.csh ) then
121 +        source $CMS_PATH/SITECONF/local/JobConfig/cmsset_local.csh
122 + endif
123   unset here
124   EOF_CMSSET_DEFAULT_CSH
125   touch %instroot/%cmsplatf/etc/profile.d/dummy

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines