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.41 by elmer, Tue May 1 11:31:21 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;;
29 <        osx104_pcc32) compilerv=gcc400;;
27 >        slc4_amd64) compilerv=gcc345; osarch=slc4_ia32;;
28 >        osx104_ia32) compilerv=gcc401;;
29 >        osx104_ppc32) compilerv=gcc400;;
30      esac
31      echo ${osarch}_${compilerv}
32   else
# Line 61 | Line 61 | fi
61  
62   if [ ! -d $here/${SCRAM_ARCH}/etc/profile.d ]
63   then
64 <    echo "Your shell is not able to find where cmsset_default.sh is. Either cd into the directory where it is or move to zsh"
64 >    echo "Your shell is not able to find where cmsset_default.sh is located."
65 >    echo "Either you have not set VO_CMS_SW_DIR or OSG_APP correctly"
66 >    echo "or SCRAM_ARCH is not set to a valid architecture."
67   fi
68  
69   for pkg in `/bin/ls $here/${SCRAM_ARCH}/etc/profile.d/ | grep 'S.*[.]sh'`
# Line 73 | Line 75 | if [ ! $CMS_PATH ]
75   then
76      export CMS_PATH=$here
77   fi
78 +
79 + if [ -f $CMS_PATH/SITECONF/local/JobConfig/cmsset_local.sh ]; then
80 +        . $CMS_PATH/SITECONF/local/JobConfig/cmsset_local.sh
81 + fi
82   EOF_CMSSET_DEFAULT_SH
83  
84  
# Line 112 | Line 118 | end
118   if ( ! ${?CMS_PATH} ) then
119      setenv CMS_PATH $here
120   endif
121 +
122 + if( -e $CMS_PATH/SITECONF/local/JobConfig/cmsset_local.csh ) then
123 +        source $CMS_PATH/SITECONF/local/JobConfig/cmsset_local.csh
124 + endif
125   unset here
126   EOF_CMSSET_DEFAULT_CSH
127   touch %instroot/%cmsplatf/etc/profile.d/dummy

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines