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.24 by eulisse, Wed Jul 26 12:35:28 2006 UTC vs.
Revision 1.29 by eulisse, Wed Aug 2 19:17:11 2006 UTC

# Line 11 | Line 11 | mkdir -p %instroot/bin
11   install -m 755 %_sourcedir/cmsos %instroot/bin/cmsos
12   mkdir -p %{instroot}/%{cmsplatf}/etc/profile.d
13  
14 < ### BASH code
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 <
21 < if [ ! $SCRAM_ARCH ]
14 > ### Detects the SCRAM_ARCH to be used.
15 > cat << \EOF_CMSARCH_SH >%instroot/bin/cmsarch
16 > #!/bin/sh
17 > 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 ]
22   then
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
23 >    case $osarch in
24          slc3_ia32) compilerv=gcc323;;
25          slc3_amd64) compilerv=gcc344;;
26          slc4_ia32) compilerv=gcc345;;
# Line 32 | Line 28 | then
28          osx104_ia32) compilerv=gcc400;;
29          osx104_pcc32) compilerv=gcc400;;
30      esac
31 <    SCRAM_ARCH=${SCRAM_ARCH}_$compilerv
31 >    echo ${osarch}_${compilerv}
32 > else
33 >    echo $SCRAM_ARCH
34 > fi
35  
36 <    if [ $# -gt 0 ]
37 <    then
38 <        SCRAM_ARCH=$1
39 <    fi
36 > EOF_CMSARCH_SH
37 > chmod 755 %instroot/bin/cmsarch
38 >
39 > ### BASH code
40 >
41 > cat << \EOF_CMSSET_DEFAULT_SH > %instroot/cmsset_default.sh
42 > export PATH=%instroot/bin:$PATH
43 >
44 > if [ ! $SCRAM_ARCH ]
45 > then
46 >    SCRAM_ARCH=`%instroot/bin/cmsarch`
47      export SCRAM_ARCH
48   fi
49  
# Line 58 | Line 64 | 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"
65   fi
66  
67 < for pkg in `/bin/ls $here/${SCRAM_ARCH}/etc/profile.d/ | grep -e'^S.*[.]sh'`
67 > for pkg in `/bin/ls $here/${SCRAM_ARCH}/etc/profile.d/ | grep 'S.*[.]sh'`
68   do
69          source $here/${SCRAM_ARCH}/etc/profile.d/$pkg
70   done
# Line 80 | Line 86 | else
86      setenv PATH %instroot/bin
87   endif
88  
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`
89   if ( ! ${?SCRAM_ARCH}) then
90 <    setenv SCRAM_ARCH `sh -c $CMSOSCOMMAND`
98 <    set compilerv=gcc323
99 <    switch ( ${SCRAM_ARCH} )
100 <        case slc3_ia32:
101 <            set compilerv=gcc323
102 <        breaksw
103 <        case slc3_amd64:
104 <            set compilerv=gcc344
105 <        breaksw
106 <        case slc4_ia32:
107 <            set compilerv=gcc345
108 <        breaksw
109 <        case slc4_amd64:
110 <            set compilerv=gcc345
111 <        breaksw
112 <        case osx104_ia32:
113 <            set compilerv=gcc400
114 <        breaksw
115 <        case osx104_pcc32:
116 <            set compilerv=gcc400
117 <        breaksw
118 <    endsw
119 <
120 <    setenv SCRAM_ARCH ${SCRAM_ARCH}_${compilerv}
121 <
122 <    if ( $# > 0 ) then
123 <        setenv SCRAM_ARCH $1
124 <    endif
90 >    setenv SCRAM_ARCH `sh -c %instroot/bin/cmsarch`
91   endif
92 +
93   set here=%instroot
94  
95   if ( ${?VO_CMS_SW_DIR} ) then
# Line 139 | Line 106 | if ( ! -e $here/cmsset_default.csh ) the
106      echo "Please cd into the directory where cmsset_default.csh is."
107   endif
108  
109 < foreach pkg ( `/bin/ls ${here}/${SCRAM_ARCH}/etc/profile.d/ | grep -e'^S.*[.]csh'` )
109 > foreach pkg ( `/bin/ls ${here}/${SCRAM_ARCH}/etc/profile.d/ | grep 'S.*[.]csh'` )
110          source ${here}/${SCRAM_ARCH}/etc/profile.d/$pkg
111   end
112   if ( ! ${?CMS_PATH} ) then
113      setenv CMS_PATH $here
114   endif
115   unset here
149 unset CMSOSCOMMAND
150 unset compilerv
116   EOF_CMSSET_DEFAULT_CSH
117 <
117 > touch %instroot/%cmsplatf/etc/profile.d/dummy
118   %pre
119   [ -f $RPM_INSTALL_PREFIX/cmsset_default.sh ] && cp $RPM_INSTALL_PREFIX/cmsset_default.sh $RPM_INSTALL_PREFIX/cmsset_default.sh.old`date +%Y%m%d`
120   [ -f $RPM_INSTALL_PREFIX/cmsset_default.csh ] && cp $RPM_INSTALL_PREFIX/cmsset_default.csh $RPM_INSTALL_PREFIX/cmsset_default.csh.old`date +%Y%m%d`
# Line 159 | Line 124 | echo $RPM_INSTALL_PREFIX
124   perl -p -i -e "s|%{instroot}|$RPM_INSTALL_PREFIX|g" $RPM_INSTALL_PREFIX/cmsset_default.sh
125   perl -p -i -e "s|%{instroot}|$RPM_INSTALL_PREFIX|g" $RPM_INSTALL_PREFIX/cmsset_default.csh
126   perl -p -i -e "s|%{instroot}|$RPM_INSTALL_PREFIX|g" $RPM_INSTALL_PREFIX/bin/cmsos
127 + perl -p -i -e "s|%{instroot}|$RPM_INSTALL_PREFIX|g" $RPM_INSTALL_PREFIX/bin/cmsarch
128   %files
129   %i
130   %instroot/cmsset_default.sh
131   %instroot/cmsset_default.csh
132   %instroot/bin/cmsos
133 + %instroot/bin/cmsarch
134   %instroot/%cmsplatf/etc/profile.d
135   %exclude %instroot/%cmsplatf/etc/profile.d/*

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines