Merge pull request #1289 from degano/roofit_merge_74Xroot6

Compile roofit inside root. No longer separate package.
cms-sw · Jan 14, 2015 · a7cea36 · a7cea36
2 parents e6093f4 + 9c4f0aa
commit a7cea36
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 155 deletions.
diff --git a/cmssw-tool-conf.spec b/cmssw-tool-conf.spec
@@ -62,7 +62,6 @@ Requires: pythia6-toolfile
 Requires: pythia8-toolfile
 Requires: python-toolfile
 Requires: qt-toolfile
-Requires: roofit-toolfile
 Requires: root-toolfile
 Requires: sherpa-toolfile
 Requires: sigcpp-toolfile

diff --git a/roofit-toolfile.spec b/roofit-toolfile.spec
diff --git a/roofit.spec b/roofit.spec
diff --git a/root-toolfile.spec b/root-toolfile.spec
@@ -345,6 +345,69 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/rootguihtml.xml
 </tool>
 EOF_TOOLFILE
 
+# roofitcore toolfile
+cat << \EOF_TOOLFILE >%i/etc/scram.d/roofitcore.xml
+<tool name="roofitcore" version="@TOOL_VERSION@">
+  <info url="http://root.cern.ch/root/"/>
+  <lib name="RooFitCore"/>
+  <client>
+    <environment name="ROOFIT_BASE" default="@TOOL_ROOT@"/>
+    <environment name="LIBDIR" default="$ROOFIT_BASE/lib"/>
+    <environment name="INCLUDE" default="$ROOFIT_BASE/include"/>
+  </client>
+  <runtime name="ROOFITSYS" value="$ROOFIT_BASE/"/>
+  <runtime name="PATH"      value="$ROOFIT_BASE/bin" type="path"/>
+  <runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
+  <use name="rootcore"/>
+  <use name="roothistmatrix"/>
+  <use name="rootgpad"/>
+  <use name="rootminuit"/>
+  <use name="root_cxxdefaults"/>
+</tool>
+EOF_TOOLFILE
+
+# roofit toolfile
+cat << \EOF_TOOLFILE >%i/etc/scram.d/roofit.xml
+<tool name="roofit" version="@TOOL_VERSION@">
+  <info url="http://root.cern.ch/root/"/>
+  <lib name="RooFit"/>
+  <use name="roofitcore"/>
+  <use name="rootcore"/>
+  <use name="rootmath"/>
+  <use name="roothistmatrix"/>
+</tool>
+EOF_TOOLFILE
+
+# roostats toolfile
+cat << \EOF_TOOLFILE >%i/etc/scram.d/roostats.xml
+<tool name="roostats" version="@TOOL_VERSION@">
+  <info url="http://root.cern.ch/root/"/>
+  <lib name="RooStats"/>
+  <use name="roofitcore"/>
+  <use name="roofit"/>
+  <use name="rootcore"/>
+  <use name="roothistmatrix"/>
+  <use name="rootgpad"/>
+</tool>
+EOF_TOOLFILE
+
+# histfactory toolfile
+cat << \EOF_TOOLFILE >%i/etc/scram.d/histfactory.xml
+<tool name="histfactory" version="@TOOL_VERSION@">
+  <info url="http://root.cern.ch/root/"/>
+  <lib name="HistFactory"/>
+  <use name="roofitcore"/>
+  <use name="roofit"/>
+  <use name="roostats"/>
+  <use name="rootcore"/>
+  <use name="roothistmatrix"/>
+  <use name="rootgpad"/>
+  <use name="rootxml"/>
+  <use name="rootfoam"/>
+</tool>
+EOF_TOOLFILE
+
+
 case %cmsos in
   *_ia32)
     GENREFLEX_GCCXMLOPT="-m32"

diff --git a/root.spec b/root.spec
@@ -53,12 +53,12 @@ done
 
 export ROOT_INCLUDE_PATH
 
-CONFIG_ARGS="--enable-table 
+CONFIG_ARGS="--enable-table
              --disable-builtin-pcre
              --disable-builtin-freetype
              --disable-builtin-zlib
              --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python${PYTHONV}
-             --enable-explicitlink 
+             --enable-explicitlink
              --enable-mathmore
              --enable-minuit2
              --disable-builtin-lzma
@@ -83,7 +83,8 @@ CONFIG_ARGS="--enable-table
              --disable-qt
              --disable-qtgsi
              --disable-hdfs
-             --disable-oracle ${EXTRA_CONFIG_ARGS}"
+             --disable-oracle ${EXTRA_CONFIG_ARGS}
+             --enable-roofit"
 
 #if #isarmv7
 #cp ./cint/iosenum/iosenum.linux3 ./cint/iosenum/iosenum.linuxarm3
@@ -94,7 +95,7 @@ TARGET_PLATF=
 
 %if %islinux
   TARGET_PLATF=linuxx8664gcc
-  EXTRA_OPTS="${EXTRA_OPTS} --with-rfio-libdir=${CASTOR_ROOT}/lib 
+  EXTRA_OPTS="${EXTRA_OPTS} --with-rfio-libdir=${CASTOR_ROOT}/lib
                             --with-rfio-incdir=${CASTOR_ROOT}/include/shift
                             --with-castor-libdir=${CASTOR_ROOT}/lib
                             --with-castor-incdir=${CASTOR_ROOT}/include/shift