Merge pull request cms-sw#2399 from smuzaffar/IB/CMSSW_8_1_X/stable

toolfile fixes for sherpa, scons and setuptools

cmssw-tool-conf.spec

@@ -159,6 +159,7 @@ Requires: CSCTrackFinderEmulation-toolfile
 Requires: tinyxml-toolfile
 Requires: scons-toolfile
 Requires: md5-toolfile
+Requires: py2-setuptools-toolfile
 
 # Only for Linux platform.
 %if %islinux

py2-setuptools-toolfile.spec

@@ -0,0 +1,23 @@
+### RPM external py2-setuptools-toolfile 1.0
+Requires: py2-setuptools
+%prep
+
+%build
+
+%install
+
+mkdir -p %i/etc/scram.d
+cat << \EOF_TOOLFILE >%i/etc/scram.d/py2-setuptools.xml
+<tool name="py2-setuptools" version="@TOOL_VERSION@">
+  <client>
+    <environment name="PY2_SETUPTOOLS_BASE" default="@TOOL_ROOT@"/>
+  </client>
+  <runtime name="PYTHONPATH" value="$PY2_SETUPTOOLS_BASE/lib/python@PYTHONV@/site-packages" type="path"/>
+  <use name="python"/>
+</tool>
+EOF_TOOLFILE
+
+export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
+
+## IMPORT scram-tools-post
+

scons-toolfile.spec

@@ -1,4 +1,4 @@
-### RPM external scons-toolfile 1.0
+### RPM external scons-toolfile 2.0
 Requires: scons
 
 %prep
@@ -12,7 +12,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/scons.xml
     <environment name="SCONS_BASE" default="@TOOL_ROOT@"/>
     <environment name="BINDIR" default="$SCONS_BASE/bin"/>
   </client>
-  <runtime name="SCONS_LIB_DIR" value="$SCONS_BASE/lib"/>  
+  <runtime name="SCONS_LIB_DIR" value="$SCONS_BASE/lib"/>
+  <runtime name="PATH" value="$SCONS_BASE/bin" type="path"/>
 </tool>
 EOF_TOOLFILE
 

sherpa-toolfile.spec

@@ -1,4 +1,4 @@
-### RPM external sherpa-toolfile 1.0
+### RPM external sherpa-toolfile 2.0
 Requires: sherpa
 %prep
 
@@ -9,28 +9,31 @@ Requires: sherpa
 mkdir -p %i/etc/scram.d
 cat << \EOF_TOOLFILE >%i/etc/scram.d/sherpa.xml
 <tool name="sherpa" version="@TOOL_VERSION@">
-<lib name="SherpaMain"/>
-<lib name="ToolsMath"/>
-<lib name="ToolsOrg"/>
-<client>
-<environment name="SHERPA_BASE" default="@TOOL_ROOT@"/>
-<environment name="BINDIR" default="$SHERPA_BASE/bin"/>
-<environment name="LIBDIR" default="$SHERPA_BASE/lib/SHERPA-MC"/>
-<environment name="INCLUDE" default="$SHERPA_BASE/include/SHERPA-MC"/>
-</client>
-<runtime name="CMSSW_FWLITE_INCLUDE_PATH" value="$SHERPA_BASE/include" type="path"/>
-<runtime name="SHERPA_SHARE_PATH" value="$SHERPA_BASE/share/SHERPA-MC" type="path"/>
-<runtime name="SHERPA_INCLUDE_PATH" value="$SHERPA_BASE/include/SHERPA-MC" type="path"/>
-<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
-<use name="root_cxxdefaults"/>
-<use name="HepMC"/>
-<use name="lhapdf"/>
-<use name="qd"/>
-<use name="blackhat"/>
-<use name="fastjet"/>
-<use name="sqlite"/>
-<use name="openloops"/>
+  <lib name="SherpaMain"/>
+  <lib name="ToolsMath"/>
+  <lib name="ToolsOrg"/>
+  <client>
+    <environment name="SHERPA_BASE" default="@TOOL_ROOT@"/>
+    <environment name="BINDIR" default="$SHERPA_BASE/bin"/>
+    <environment name="LIBDIR" default="$SHERPA_BASE/lib/SHERPA-MC"/>
+    <environment name="INCLUDE" default="$SHERPA_BASE/include/SHERPA-MC"/>
+  </client>
+  <runtime name="CMSSW_FWLITE_INCLUDE_PATH" value="$SHERPA_BASE/include" type="path"/>
+  <runtime name="SHERPA_SHARE_PATH" value="$SHERPA_BASE/share/SHERPA-MC" type="path"/>
+  <runtime name="SHERPA_INCLUDE_PATH" value="$SHERPA_BASE/include/SHERPA-MC" type="path"/>
+  <runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
+  <runtime name="PYTHONPATH" value="$SHERPA_BASE/lib/python@PYTHONV@/site-packages" type="path"/>
+  <use name="root_cxxdefaults"/>
+  <use name="HepMC"/>
+  <use name="lhapdf"/>
+  <use name="qd"/>
+  <use name="blackhat"/>
+  <use name="fastjet"/>
+  <use name="sqlite"/>
+  <use name="openloops"/>
 </tool>
 EOF_TOOLFILE
 
+export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
+
 ## IMPORT scram-tools-post