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.3 by eulisse, Thu Jun 15 23:32:15 2006 UTC vs.
Revision 1.4 by eulisse, Fri Jun 16 12:15:00 2006 UTC

# Line 14 | Line 14 | cat << \EOF_CMSSET_DEFAULT_SH > %instroo
14   export PATH=%instroot/bin:$PATH
15   export LD_LIBRARY_PATH=%instroot/lib:$LD_LIBRARY_PATH
16   export DYLD_FALLBACK_LIBRARY_PATH=%instroot/lib:$DYLD_FALLBACK_LIBRARY
17 < SCRAM_ARCH=$(cmsos); export SCRAM_ARCH
17 > SCRAM_ARCH=$(cmsos)
18  
19   # We need to assume 1 compiler per platform.
20   # There is no other way around this.
# Line 25 | Line 25 | case $SCRAM_ARCH in
25      osx104_pcc32) compilerv=gcc400;;
26   esac
27   SCRAM_ARCH=${SCRAM_ARCH}_$compilerv
28 + export SCRAM_ARCH
29  
30   source %instroot/$SCRAM_ARCH/lcg/SCRAM/V0_20_0/etc/profile.d/init.sh
31   source %instroot/$SCRAM_ARCH/lcg/SCRAMV1/V1_0_2/etc/profile.d/init.sh
32   EOF_CMSSET_DEFAULT_SH
33  
34   cat << \EOF_CMSSET_DEFAULT_CSH > %instroot/cmsset_default.csh
35 < setenv PATH %instroot/bin:$PATH
36 < setenv LD_LIBRARY_PATH %instroot/lib:$LD_LIBRARY_PATH
37 < setenv DYLD_FALLBACK_LIBRARY_PATH %instroot/lib:$DYLD_FALLBACK_LIBRARY
38 < setenv SCRAM_ARCH `cmsos`
39 < sentenv compilerv gcc323
40 < switch ( $SCRAM_ARCH )
35 > if (${?PATH}) then
36 >    setenv PATH %instroot/bin:$PATH
37 > else
38 >    setenv PATH %instroot/bin
39 > endif
40 >
41 > if (${?LD_LIBRARY_PATH}) then
42 >    setenv LD_LIBRARY_PATH %instroot/lib:$LD_LIBRARY_PATH
43 > else
44 >    setenv LD_LIBRARY_PATH %instroot/lib
45 > endif
46 >
47 > if (${?DYLD_FALLBACK_LIBRARY_PATH}) then
48 >    setenv DYLD_FALLBACK_LIBRARY_PATH %instroot/lib:$DYLD_FALLBACK_LIBRARY_PATH
49 > else
50 >    setenv DYLD_FALLBACK_LIBRARY_PATH %instroot/lib
51 > endif
52 >
53 > setenv CMSOSCOMMAND `which cmsos`
54 > setenv SCRAM_ARCH `sh -c $CMSOSCOMMAND`
55 > setenv compilerv gcc323
56 > switch ( ${SCRAM_ARCH} )
57      case slc3_ia32:
58          setenv compilerv gcc323
59      breaksw
# Line 51 | Line 68 | switch ( $SCRAM_ARCH )
68      breaksw
69   endsw
70  
71 < . %instroot/$SCRAM_ARCH/lcg/SCRAM/V0_20_0/etc/profile.d/init.csh
72 < . %instroot/$SCRAM_ARCH/lcg/SCRAMV1/V1_0_2/etc/profile.d/init.csh
71 > setenv SCRAM_ARCH ${SCRAM_ARCH}_${compilerv}
72 >
73 > source %instroot/${SCRAM_ARCH}/lcg/SCRAM/V0_20_0/etc/profile.d/init.csh
74 > source %instroot/${SCRAM_ARCH}/lcg/SCRAMV1/V1_0_2/etc/profile.d/init.csh
75   EOF_CMSSET_DEFAULT_CSH
76  
77   %post

Diff Legend

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