Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Compile roofit inside root. No longer separate package. #1289

Merged
1 commit merged into from Jan 14, 2015
Merged

Compile roofit inside root. No longer separate package. #1289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion cmssw-tool-conf.spec
View file
Open in desktop
Expand Up @@ -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
Expand Down
74 changes: 0 additions & 74 deletions roofit-toolfile.spec
View file
Open in desktop

This file was deleted.

76 changes: 0 additions & 76 deletions roofit.spec
View file
Open in desktop

This file was deleted.

63 changes: 63 additions & 0 deletions root-toolfile.spec
View file
Open in desktop
Expand Up @@ -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"
Expand Down
9 changes: 5 additions & 4 deletions root.spec
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down