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.16 by eulisse, Tue Jul 18 07:59:11 2006 UTC vs.
Revision 1.23 by eulisse, Wed Jul 26 12:14:39 2006 UTC

# Line 15 | Line 15 | mkdir -p %{instroot}/%{cmsplatf}/etc/pro
15  
16   cat << \EOF_CMSSET_DEFAULT_SH > %instroot/cmsset_default.sh
17   export PATH=%instroot/bin:$PATH
18 < export LD_LIBRARY_PATH=%instroot/lib:$LD_LIBRARY_PATH
19 < export DYLD_FALLBACK_LIBRARY_PATH=%instroot/lib:$DYLD_FALLBACK_LIBRARY
20 < SCRAM_ARCH=$(cmsos)
21 <
22 < # We need to assume 1 compiler per platform.
23 < # There is no other way around this.
24 < case $SCRAM_ARCH in
25 <    slc3_ia32) compilerv=gcc323;;
26 <    slc3_amd64) compilerv=gcc345;;
27 <    osx104_ia32) compilerv=gcc400;;
28 <    osx104_pcc32) compilerv=gcc400;;
29 < esac
30 < SCRAM_ARCH=${SCRAM_ARCH}_$compilerv
18 > #export LD_LIBRARY_PATH=%instroot/lib:$LD_LIBRARY_PATH
19 > #export DYLD_FALLBACK_LIBRARY_PATH=%instroot/lib:$DYLD_FALLBACK_LIBRARY
20  
21 < if [ $# -gt 0 ]
21 > if [ ! $SCRAM_ARCH ]
22   then
23 <    SCRAM_ARCH=$1
24 < fi
23 >    SCRAM_ARCH=$(cmsos)
24 >
25 >    # We need to assume 1 compiler per platform.
26 >    # There is no other way around this.
27 >    case $SCRAM_ARCH in
28 >        slc3_ia32) compilerv=gcc323;;
29 >        slc3_amd64) compilerv=gcc344;;
30 >        slc4_ia32) compilerv=gcc345;;
31 >        slc4_amd64) compilerv=gcc345;;
32 >        osx104_ia32) compilerv=gcc400;;
33 >        osx104_pcc32) compilerv=gcc400;;
34 >    esac
35 >    SCRAM_ARCH=${SCRAM_ARCH}_$compilerv
36  
37 < export SCRAM_ARCH
37 >    if [ $# -gt 0 ]
38 >    then
39 >        SCRAM_ARCH=$1
40 >    fi
41 >    export SCRAM_ARCH
42 > fi
43  
44   here=%{instroot}
45  
# Line 51 | Line 56 | fi
56   if [ ! -d $here/${SCRAM_ARCH}/etc/profile.d ]
57   then
58      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"
54    exit 1
59   fi
60  
61   for pkg in `/bin/ls $here/${SCRAM_ARCH}/etc/profile.d/ | grep -e'^S.*[.]sh'`
62   do
63          source $here/${SCRAM_ARCH}/etc/profile.d/$pkg
64   done
65 < export CMS_PATH=$here
65 >
66 > if [ ! $CMS_PATH ]
67 > then
68 >    export CMS_PATH=$here
69 > fi
70   EOF_CMSSET_DEFAULT_SH
71  
72  
# Line 72 | Line 80 | else
80      setenv PATH %instroot/bin
81   endif
82  
83 < if (${?LD_LIBRARY_PATH}) then
84 <    setenv LD_LIBRARY_PATH %instroot/lib:$LD_LIBRARY_PATH
85 < else
86 <    setenv LD_LIBRARY_PATH %instroot/lib
87 < endif
88 <
89 < if (${?DYLD_FALLBACK_LIBRARY_PATH}) then
90 <    setenv DYLD_FALLBACK_LIBRARY_PATH %instroot/lib:$DYLD_FALLBACK_LIBRARY_PATH
91 < else
92 <    setenv DYLD_FALLBACK_LIBRARY_PATH %instroot/lib
93 < endif
83 > #if (${?LD_LIBRARY_PATH}) then
84 > #    setenv LD_LIBRARY_PATH %instroot/lib:$LD_LIBRARY_PATH
85 > #else
86 > #    setenv LD_LIBRARY_PATH %instroot/lib
87 > #endif
88 >
89 > #if (${?DYLD_FALLBACK_LIBRARY_PATH}) then
90 > #    setenv DYLD_FALLBACK_LIBRARY_PATH %instroot/lib:$DYLD_FALLBACK_LIBRARY_PATH
91 > #else
92 > #    setenv DYLD_FALLBACK_LIBRARY_PATH %instroot/lib
93 > #endif
94 >
95 > set CMSOSCOMMAND=`which cmsos`
96 > if ( ! ${?SCRAM_ARCH}) then
97 >    setenv SCRAM_ARCH `sh -c $CMSOSCOMMAND`
98 >    set compilerv=gcc323
99 >    switch ( ${SCRAM_ARCH} )
100 >        case slc3_ia32:
101 >            setenv compilerv gcc323
102 >        breaksw
103 >        case slc3_amd64:
104 >            setenv compilerv gcc344
105 >        breaksw
106 >        case slc4_ia32:
107 >            setenv compilerv gcc345
108 >        breaksw
109 >        case slc4_amd64:
110 >            setenv compilerv gcc345
111 >        breaksw
112 >        case osx104_ia32:
113 >            setenv compilerv gcc400
114 >        breaksw
115 >        case osx104_pcc32:
116 >            setenv compilerv gcc400
117 >        breaksw
118 >    endsw
119  
120 < setenv CMSOSCOMMAND `which cmsos`
88 < setenv SCRAM_ARCH `sh -c $CMSOSCOMMAND`
89 < setenv compilerv gcc323
90 < switch ( ${SCRAM_ARCH} )
91 <    case slc3_ia32:
92 <        setenv compilerv gcc323
93 <    breaksw
94 <    case slc3_amd64:
95 <        setenv compilerv gcc345
96 <    breaksw
97 <    case osx104_ia32:
98 <        setenv compilerv gcc400
99 <    breaksw
100 <    case osx104_pcc32:
101 <        setenv compilerv gcc400
102 <    breaksw
103 < endsw
120 >    setenv SCRAM_ARCH ${SCRAM_ARCH}_${compilerv}
121  
122 < setenv SCRAM_ARCH ${SCRAM_ARCH}_${compilerv}
123 <
124 < if ( $# -gt 0 ) then
108 <    setenv SCRAM_ARCH $1
122 >    if ( $# > 0 ) then
123 >        setenv SCRAM_ARCH $1
124 >    endif
125   endif
126 <
111 < setenv here %instroot
126 > set here=%instroot
127  
128   if ( ${?VO_CMS_SW_DIR} ) then
129 <    setenv here $VO_CMS_SW_DIR
129 >    set here=$VO_CMS_SW_DIR
130   else
131      # OSG
132      if ( ${?OSG_APP} ) then
133 <        setenv here $OSG_APP/cmssoft/cms
133 >        set here=$OSG_APP/cmssoft/cms
134      endif
135      # OSG                      
136   endif
# Line 127 | Line 142 | endif
142   foreach pkg ( `/bin/ls ${here}/${SCRAM_ARCH}/etc/profile.d/ | grep -e'^S.*[.]csh'` )
143          source ${here}/${SCRAM_ARCH}/etc/profile.d/$pkg
144   end
145 < setenv CMS_PATH $here
145 > if ( ! ${?CMS_PATH} ) then
146 >    setenv CMS_PATH $here
147 > endif
148 > unset here
149 > unset CMSOSCOMMAND
150 > unset compilerv
151   EOF_CMSSET_DEFAULT_CSH
152  
153   %pre

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines