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

Comparing COMP/CMSDIST/rivet-toolfile.spec (file contents):
Revision 1.1 by elmer, Tue Nov 2 13:59:26 2010 UTC vs.
Revision 1.4 by elmer, Fri Dec 3 13:40:19 2010 UTC

# Line 8 | Line 8 | Requires: rivet
8   %install
9   mkdir -p %i/etc/scram.d
10   cat << \EOF_TOOLFILE >%i/etc/scram.d/rivet.xml
11 < <tool name="rivet" version="%v">
12 < <lib name="rivet"/>
11 > <tool name="rivet" version="@TOOL_VERSION@">
12 > <lib name="Rivet"/>
13   <client>
14 < <environment name="RIVET_BASE" default="%i"/>
14 > <environment name="RIVET_BASE" default="@TOOL_ROOT@"/>
15   <environment name="LIBDIR" default="$RIVET_BASE/lib"/>
16   <environment name="INCLUDE" default="$RIVET_BASE/include"/>
17 <environment name="PDFPATH" default="$RIVET_BASE/share"/>
17   </client>
18 < <runtime name="PATH" value="$RIVET_BASE/bin"/>
19 < <runtime name="LD_LIBRARY_PATH" value="$RIVET_BASE/lib"/>
20 < <runtime name="PYTHONPATH" value="$RIVET_BASE/lib/python2.6/site-packages"/>
21 < <runtime name="RIVET_ANALYSIS_PATH" value="$RIVET_BASE/lib"/>
18 > <runtime name="PATH" value="$RIVET_BASE/bin" type="path"/>
19 > <runtime name="PYTHONPATH" value="$RIVET_BASE/lib/python@PYTHONV@/site-packages" type="path"/>
20 > <runtime name="RIVET_ANALYSIS_PATH" value="$RIVET_BASE/lib" type="path"/>
21 > <runtime name="PDFPATH" default="$RIVET_BASE/share" type="path"/>
22   </tool>
23   EOF_TOOLFILE
24  
25 + export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
26 +
27   ## IMPORT scram-tools-post
28  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines