diff --git a/OpenBLAS-toolfile.spec b/OpenBLAS-toolfile.spec
deleted file mode 100644
index d106619cf60..00000000000
--- a/OpenBLAS-toolfile.spec
+++ /dev/null
@@ -1,32 +0,0 @@
-### RPM external OpenBLAS-toolfile 2.0
-%define base_package %(echo %{n} | sed 's|-toolfile||')
-%define base_package_uc %(echo %{base_package} | tr '[a-z-]' '[A-Z_]')
-%{expand:%(for v in %{package_vectorization}; do echo Requires: %{base_package}_$v; done)}
-Requires: %{base_package}
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/%{base_package}.xml
-
-
-
-
-
-
-
-EOF_TOOLFILE
-for v in $(echo %{package_vectorization} | tr '[a-z-]' '[A-Z_]') ; do
- r=`eval echo \\$%{base_package_uc}_${v}_ROOT`
- echo " " >> %i/etc/scram.d/%{base_package}.xml
-done
-cat << \EOF_TOOLFILE >>%i/etc/scram.d/%{base_package}.xml
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/alpaka-toolfile.spec b/alpaka-toolfile.spec
deleted file mode 100644
index fc198300980..00000000000
--- a/alpaka-toolfile.spec
+++ /dev/null
@@ -1,44 +0,0 @@
-### RPM external alpaka-toolfile 1.0
-Requires: alpaka
-
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/alpaka.xml
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/alpaka-serial.xml
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/alpaka-tbb.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/alpaka-cuda.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/boost-toolfile.spec b/boost-toolfile.spec
deleted file mode 100644
index db04af5c2f2..00000000000
--- a/boost-toolfile.spec
+++ /dev/null
@@ -1,158 +0,0 @@
-### RPM external boost-toolfile 1.4
-Requires: boost
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-# boost toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/boost.xml
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# boost_chrono toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/boost_chrono.xml
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# boost_filesystem toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/boost_filesystem.xml
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# boost_system toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/boost_system.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-# boost_program_options toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/boost_program_options.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-# boost_python toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/boost_python.xml
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# boost_regex toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/boost_regex.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/boost_serialization.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/boost_test.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/boost_iostreams.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-# boost_mpi toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/boost_mpi.xml
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# boost_header toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/boost_header.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-case $(uname) in Darwin ) so=dylib ;; * ) so=so ;; esac
-getLibName()
-{
- libname=`find $BOOST_ROOT/lib -name "libboost_$1.$so" -follow -exec basename {} \;`
- echo $libname | sed -e 's|[.][^-]*$||;s|^lib||'
-}
-
-export BOOST_THREAD_LIB=`getLibName thread`
-export BOOST_CHRONO_LIB=`getLibName chrono`
-export BOOST_FILESYSTEM_LIB=`getLibName filesystem`
-export BOOST_DATE_TIME_LIB=`getLibName date_time`
-export BOOST_SYSTEM_LIB=`getLibName system`
-export BOOST_PROGRAM_OPTIONS_LIB=`getLibName program_options`
-export BOOST_PYTHON_LIB=`getLibName python%{cms_python3_major_minor}`
-export BOOST_REGEX_LIB=`getLibName regex`
-export BOOST_SERIALIZATION_LIB=`getLibName serialization`
-export BOOST_IOSTREAMS_LIB=`getLibName iostream`
-export BOOST_MPI_LIB=`getLibName mpi`
-
-## IMPORT scram-tools-post
diff --git a/cascade-toolfile.spec b/cascade-toolfile.spec
deleted file mode 100644
index 1752897c1b6..00000000000
--- a/cascade-toolfile.spec
+++ /dev/null
@@ -1,35 +0,0 @@
-### RPM external cascade-toolfile 1.0
-Requires: cascade
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/cascade.xml
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/cascade_headers.xml
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
-
diff --git a/cms_oracleocci_abi_hack-fake-toolfile.spec b/cms_oracleocci_abi_hack-fake-toolfile.spec
deleted file mode 100644
index fd2e4da3f40..00000000000
--- a/cms_oracleocci_abi_hack-fake-toolfile.spec
+++ /dev/null
@@ -1,35 +0,0 @@
-### RPM cms cms_oracleocci_abi_hack-fake-toolfile 1.1
-Requires: cms_oracleocci_abi_hack-fake
-
-%define cms_oracleocci_libname cms_oracleocci_abi_hack
-%define soext so
-%ifarch darwin
-%define soext dylib
-%endif
-
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-if [ -e ${CMS_ORACLEOCCI_ABI_HACK_FAKE_ROOT}/lib/lib%{cms_oracleocci_libname}.%{soext} ] ; then
- export CMS_ORACLEOCCI_LIB=''
- export CMS_ORACLEOCCI_LIBDIR=''
- export CMS_ORACLEOCCI_LD_PRELOAD=''
-fi
-cat << \EOF_TOOLFILE >%i/etc/scram.d/oracleocci.xml
-
- @CMS_ORACLEOCCI_LIB@
-
-
-
-
- @CMS_ORACLEOCCI_LIBDIR@
-
- @CMS_ORACLEOCCI_LD_PRELOAD@
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/cms_oracleocci_abi_hack-toolfile.spec b/cms_oracleocci_abi_hack-toolfile.spec
deleted file mode 100644
index 478df31ee37..00000000000
--- a/cms_oracleocci_abi_hack-toolfile.spec
+++ /dev/null
@@ -1,35 +0,0 @@
-### RPM cms cms_oracleocci_abi_hack-toolfile 1.1
-Requires: cms_oracleocci_abi_hack
-
-%define cms_oracleocci_libname cms_oracleocci_abi_hack
-%define soext so
-%ifarch darwin
-%define soext dylib
-%endif
-
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-if [ -e ${CMS_ORACLEOCCI_ABI_HACK_ROOT}/lib/lib%{cms_oracleocci_libname}.%{soext} ] ; then
- export CMS_ORACLEOCCI_LIB=''
- export CMS_ORACLEOCCI_LIBDIR=''
- export CMS_ORACLEOCCI_LD_PRELOAD=''
-fi
-cat << \EOF_TOOLFILE >%i/etc/scram.d/oracleocci.xml
-
- @CMS_ORACLEOCCI_LIB@
-
-
-
-
- @CMS_ORACLEOCCI_LIBDIR@
-
- @CMS_ORACLEOCCI_LD_PRELOAD@
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/cmssw-patch-tool-conf.spec b/cmssw-patch-tool-conf.spec
index b9f8de03083..3d0b8a97a97 100644
--- a/cmssw-patch-tool-conf.spec
+++ b/cmssw-patch-tool-conf.spec
@@ -5,9 +5,9 @@
## NOCOMPILER
## INSTALL_DEPENDENCIES cmsLHEtoEOSManager gcc-fixincludes
-Requires: cmssw-toolfile
+Requires: cmssw
# still need this (from the non-patch tool-conf spec ...
%define skipreqtools jcompiler
-## IMPORT scramv1-tool-conf
+## INCLUDE scram-tool-conf
diff --git a/cmssw-tool-conf.spec b/cmssw-tool-conf.spec
index ba8dd825749..1e3931f840e 100644
--- a/cmssw-tool-conf.spec
+++ b/cmssw-tool-conf.spec
@@ -1,194 +1,190 @@
-### RPM cms cmssw-tool-conf 46.0
+### RPM cms cmssw-tool-conf 50.0
# With cmsBuild, change the above version only when a new tool is added
## NOCOMPILER
## INSTALL_DEPENDENCIES cmsLHEtoEOSManager gcc-fixincludes cmssw-osenv cms-git-tools
## UPLOAD_DEPENDENCIES dqmgui
+%define vectorized_packages OpenBLAS fastjet mkfit rivet tensorflow vecgeom zlib
+%{expand:%(for t in %{vectorized_packages} ; do echo Requires: $t; for v in %{package_vectorization}; do echo Requires: ${t}_${v}; done; done)}
+
Requires: crab
Requires: cmssw-wm-tools
-Requires: google-benchmark-toolfile
-Requires: catch2-toolfile
-Requires: starlight-toolfile
-Requires: alpgen-toolfile
-Requires: boost-toolfile
-Requires: bz2lib-toolfile
-Requires: charybdis-toolfile
-Requires: classlib-toolfile
-Requires: clhep-toolfile
-Requires: coral-toolfile
-Requires: cppunit-toolfile
-Requires: curl-toolfile
-Requires: das_client-toolfile
-Requires: db6-toolfile
-Requires: davix-toolfile
-Requires: evtgen-toolfile
-Requires: expat-toolfile
+Requires: google-benchmark
+Requires: catch2
+Requires: starlight
+Requires: alpgen
+Requires: boost
+Requires: bz2lib
+Requires: charybdis
+Requires: classlib
+Requires: clhep
+Requires: coral
+Requires: cppunit
+Requires: curl
+Requires: das_client
+Requires: db6
+Requires: davix
+Requires: evtgen
+Requires: expat
Requires: fakesystem
-Requires: fastjet-toolfile
-Requires: flatbuffers-toolfile
-Requires: fmt-toolfile
-Requires: gbl-toolfile
-Requires: gcc-toolfile
-Requires: gdbm-toolfile
-Requires: geant4-toolfile
-Requires: geant4data-toolfile
-Requires: vecgeom-toolfile
-Requires: glimpse-toolfile
-Requires: gmake-toolfile
-Requires: gsl-toolfile
-Requires: highfive-toolfile
-Requires: hector-toolfile
-Requires: hepmc-toolfile
-Requires: heppdt-toolfile
-Requires: herwig-toolfile
-Requires: herwig7-toolfile
-Requires: hydjet-toolfile
-Requires: ittnotify-toolfile
-Requires: jemalloc-toolfile
-Requires: jemalloc-debug-toolfile
-Requires: jimmy-toolfile
-Requires: json-toolfile
-Requires: ktjet-toolfile
-Requires: lhapdf-toolfile
-Requires: libjpeg-turbo-toolfile
-Requires: libpng-toolfile
-Requires: libtiff-toolfile
-Requires: libungif-toolfile
-Requires: libxml2-toolfile
-Requires: lwtnn-toolfile
-Requires: meschach-toolfile
-Requires: pcre-toolfile
-Requires: photos-toolfile
-Requires: photospp-toolfile
-Requires: pyquen-toolfile
-Requires: pythia6-toolfile
-Requires: pythia8-toolfile
-Requires: python-toolfile
-Requires: python3-toolfile
-Requires: root-toolfile
-Requires: sherpa-toolfile
-Requires: libpciaccess-toolfile
-Requires: numactl-toolfile
-Requires: hwloc-toolfile
+Requires: flatbuffers
+Requires: fmt
+Requires: gbl
+Requires: gcc
+Requires: gdbm
+Requires: geant4
+Requires: geant4data
+Requires: glimpse
+Requires: gmake
+Requires: gsl
+Requires: highfive
+Requires: hector
+Requires: hepmc
+Requires: heppdt
+Requires: herwig
+Requires: herwig7
+Requires: hydjet
+Requires: ittnotify
+Requires: jemalloc
+Requires: jemalloc-debug
+Requires: jimmy
+Requires: json
+Requires: ktjet
+Requires: lhapdf
+Requires: libjpeg-turbo
+Requires: libpng
+Requires: libtiff
+Requires: libungif
+Requires: libxml2
+Requires: lwtnn
+Requires: meschach
+Requires: pcre
+Requires: photos
+Requires: photospp
+Requires: pyquen
+Requires: pythia6
+Requires: pythia8
+Requires: python
+Requires: python3
+Requires: root
+Requires: sherpa
+Requires: libpciaccess
+Requires: numactl
+Requires: hwloc
%ifnarch aarch64
-Requires: gdrcopy-toolfile
+Requires: gdrcopy
%endif
-Requires: ucx-toolfile
-Requires: openmpi-toolfile
-Requires: sigcpp-toolfile
-Requires: sqlite-toolfile
+Requires: ucx
+Requires: openmpi
+Requires: sigcpp
+Requires: sqlite
Requires: systemtools
-Requires: tauola-toolfile
-Requires: tauolapp-toolfile
-Requires: thepeg-toolfile
-Requires: toprex-toolfile
-Requires: libuuid-toolfile
-Requires: xerces-c-toolfile
-Requires: zlib-toolfile
-Requires: dcap-toolfile
-Requires: frontier_client-toolfile
-Requires: xrootd-toolfile
-Requires: dd4hep-toolfile
-Requires: graphviz-toolfile
-Requires: valgrind-toolfile
-Requires: cmsswdata-toolfile
-Requires: zstd-toolfile
-Requires: hls-toolfile
-Requires: opencv-toolfile
-Requires: grpc-toolfile
-Requires: onnxruntime-toolfile
-Requires: triton-inference-client-toolfile
-Requires: hdf5-toolfile
-Requires: rivet-toolfile
-Requires: cascade-toolfile
-Requires: yoda-toolfile
-Requires: fftw3-toolfile
-Requires: fftjet-toolfile
-Requires: professor2-toolfile
-Requires: xz-toolfile
-Requires: lz4-toolfile
-Requires: protobuf-toolfile
-Requires: lcov-toolfile
-Requires: llvm-gcc-toolfile
-Requires: tbb-toolfile
-Requires: mctester-toolfile
-Requires: vdt-toolfile
-Requires: icc-gcc-toolfile
-Requires: gnuplot-toolfile
-Requires: sloccount-toolfile
-Requires: millepede-toolfile
-Requires: pacparser-toolfile
-Requires: git-toolfile
-Requires: cgal-toolfile
-Requires: doxygen-toolfile
-Requires: yaml-cpp-toolfile
-Requires: gmp-static-toolfile
-Requires: mpfr-static-toolfile
-Requires: fastjet-contrib-toolfile
-Requires: opencl-toolfile
-Requires: opencl-cpp-toolfile
-Requires: qd-toolfile
-Requires: blackhat-toolfile
-Requires: sherpa-toolfile
-Requires: geant4-parfullcms-toolfile
+Requires: tauola
+Requires: tauolapp
+Requires: thepeg
+Requires: toprex
+Requires: libuuid
+Requires: xerces-c
+Requires: dcap
+Requires: frontier_client
+Requires: xrootd
+Requires: dd4hep
+Requires: graphviz
+Requires: valgrind
+Requires: cmsswdata
+Requires: zstd
+Requires: hls
+Requires: opencv
+Requires: grpc
+Requires: onnxruntime
+Requires: triton-inference-client
+Requires: hdf5
+Requires: cascade
+Requires: yoda
+Requires: fftw3
+Requires: fftjet
+Requires: professor2
+Requires: xz
+Requires: lz4
+Requires: protobuf
+Requires: lcov
+Requires: llvm
+Requires: tbb
+Requires: mctester
+Requires: vdt
+Requires: icc
+Requires: gnuplot
+Requires: sloccount
+Requires: millepede
+Requires: pacparser
+Requires: git
+Requires: cgal
+Requires: doxygen
+Requires: yaml-cpp
+Requires: gmp-static
+Requires: mpfr-static
+Requires: fastjet-contrib
+Requires: opencl
+Requires: opencl-cpp
+Requires: qd
+Requires: blackhat
+Requires: sherpa
+Requires: geant4-parfullcms
Requires: fasthadd
-Requires: eigen-toolfile
-Requires: gdb-toolfile
-Requires: libxslt-toolfile
-Requires: giflib-toolfile
-Requires: freetype-toolfile
-Requires: utm-toolfile
-Requires: libffi-toolfile
-Requires: CSCTrackFinderEmulation-toolfile
-Requires: tinyxml2-toolfile
-Requires: md5-toolfile
-Requires: gosamcontrib-toolfile
-Requires: gosam-toolfile
-Requires: madgraph5amcatnlo-toolfile
+Requires: eigen
+Requires: gdb
+Requires: libxslt
+Requires: giflib
+Requires: freetype
+Requires: utm
+Requires: libffi
+Requires: CSCTrackFinderEmulation
+Requires: tinyxml2
+Requires: md5
+Requires: gosamcontrib
+Requires: gosam
+Requires: madgraph5amcatnlo
Requires: python_tools
Requires: dasgoclient
-Requires: OpenBLAS-toolfile
-Requires: mxnet-predict-toolfile
-Requires: mkfit-toolfile
-Requires: dablooms-toolfile
+Requires: mxnet-predict
+Requires: dablooms
# Only for Linux platform.
%ifos linux
-Requires: openldap-toolfile
-Requires: gperftools-toolfile
-Requires: cuda-toolfile
-Requires: alpaka-toolfile
-Requires: cupla-toolfile
+Requires: openldap
+Requires: gperftools
+Requires: cuda
+Requires: alpaka
+Requires: cupla
%if "%{cmsos}" != "slc7_aarch64"
-Requires: cudnn-toolfile
+Requires: cudnn
%endif
-Requires: libunwind-toolfile
+Requires: libunwind
%ifnarch ppc64le
-Requires: igprof-toolfile
-Requires: openloops-toolfile
+Requires: igprof
+Requires: openloops
%endif
%ifarch x86_64
-Requires: dmtcp-toolfile
-Requires: tkonlinesw-toolfile
-Requires: oracle-toolfile
+Requires: dmtcp
+Requires: tkonlinesw
+Requires: oracle
Requires: intel-vtune
Requires: cmsmon-tools
-Requires: dip-toolfile
+Requires: dip
%else
-Requires: tkonlinesw-fake-toolfile
-Requires: oracle-fake-toolfile
+Requires: tkonlinesw-fake
+Requires: oracle-fake
%endif
%endif
-Requires: tensorflow-toolfile
-Requires: xtensor-toolfile
-Requires: xtl-toolfile
-Requires: xgboost-toolfile
+Requires: xtensor
+Requires: xtl
+Requires: xgboost
%define skipreqtools jcompiler icc-cxxcompiler icc-ccompiler icc-f77compiler rivet2 opencl opencl-cpp nvidia-drivers intel-vtune jemalloc-debug
-## IMPORT scramv1-tool-conf
+## INCLUDE scram-tool-conf
diff --git a/cmsswdata-toolfile.spec b/cmsswdata-toolfile.spec
deleted file mode 100644
index 5f6c2e21e7f..00000000000
--- a/cmsswdata-toolfile.spec
+++ /dev/null
@@ -1,34 +0,0 @@
-### RPM cms cmsswdata-toolfile 3.0
-Requires: cmsswdata
-%prep
-
-%build
-
-%install
-
-# SCRAM ToolBox toolfile
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/cmsswdata.xml
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE > %i/searchpath.xml
-
-
-EOF_TOOLFILE
-
-for toolbase in `echo %pkgreqs | tr ' ' '\n' | grep 'cms/data-'` ; do
- toolver=`basename $toolbase`
- pack=`echo $toolbase | cut -d/ -f2 | sed 's|data-||;s|-|/|'`
- echo " " >> %i/etc/scram.d/cmsswdata.xml
- echo " " >> %i/searchpath.xml
-done
-
-cat %i/searchpath.xml >> %i/etc/scram.d/cmsswdata.xml
-echo " " >> %i/etc/scram.d/cmsswdata.xml
-rm -f %i/searchpath.xml
-
-## IMPORT scram-tools-post
diff --git a/cmsswdata.spec b/cmsswdata.spec
index 15bff051bb2..fdbf9695814 100644
--- a/cmsswdata.spec
+++ b/cmsswdata.spec
@@ -1,4 +1,4 @@
-### RPM cms cmsswdata 36
+### RPM cms cmsswdata 40.0
## NOCOMPILER
Source: none
@@ -90,9 +90,36 @@ Requires: data-GeneratorInterface-ReggeGribovPartonMCInterface
%install
+mkdir -p %i/etc/scram.d
+cat << \EOF_TOOLFILE >%i/etc/scram.d/cmsswdata.xml
+
+
+
+
+EOF_TOOLFILE
+
+cat << \EOF_TOOLFILE > %i/searchpath.xml
+
+
+EOF_TOOLFILE
+
+for toolbase in `echo %pkgreqs | tr ' ' '\n' | grep 'cms/data-'` ; do
+ toolver=`basename $toolbase`
+ pack=`echo $toolbase | cut -d/ -f2 | sed 's|data-||;s|-|/|'`
+ echo " " >> %i/etc/scram.d/cmsswdata.xml
+ echo " " >> %i/searchpath.xml
+done
+
+cat %i/searchpath.xml >> %i/etc/scram.d/cmsswdata.xml
+echo " " >> %i/etc/scram.d/cmsswdata.xml
+rm -f %i/searchpath.xml
+
%post
+%{relocateConfig}etc/scram.d/*.xml
echo "%{BaseTool}_ROOT='$CMS_INSTALL_PREFIX/%{pkgrel}'" > $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.sh
echo "set %{BaseTool}_ROOT='$CMS_INSTALL_PREFIX/%{pkgrel}'" > $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.csh
+echo "%{BaseTool}_PKGREQUIRED='%pkgreqs'" >> $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.sh
+echo "set %{BaseTool}_PKGREQUIRED='%pkgreqs'" >> $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.csh
for DATA_PATH in %directpkgreqs; do
PKG_DIR=$(echo $DATA_PATH | cut -d/ -f2)
@@ -113,4 +140,5 @@ for DATA_PATH in %directpkgreqs; do
if [ ! -L $SOURCE/$PKG_DATA ] ; then
rm -rf $SOURCE/$PKG_DATA && ln -fs ../../../../share/$DATA_PATH/$PKG_DATA $SOURCE/$PKG_DATA
fi
-done
\ No newline at end of file
+done
+
diff --git a/coral-tool-conf.spec b/coral-tool-conf.spec
index 3aac1c35c68..16eb4b6141d 100644
--- a/coral-tool-conf.spec
+++ b/coral-tool-conf.spec
@@ -1,24 +1,23 @@
-### RPM cms coral-tool-conf 2.1
+### RPM cms coral-tool-conf 10.0
## NOCOMPILER
-Requires: pcre-toolfile
-Requires: python3-toolfile
-Requires: expat-toolfile
-Requires: boost-toolfile
-Requires: frontier_client-toolfile
-Requires: gcc-toolfile
-
-Requires: sqlite-toolfile
-Requires: libuuid-toolfile
-Requires: zlib-toolfile
-Requires: bz2lib-toolfile
-Requires: cppunit-toolfile
-Requires: xerces-c-toolfile
+Requires: pcre
+Requires: python
+Requires: expat
+Requires: boost
+Requires: frontier_client
+Requires: gcc
+Requires: sqlite
+Requires: libuuid
+Requires: zlib
+Requires: bz2lib
+Requires: cppunit
+Requires: xerces-c
Requires: systemtools
%ifarch x86_64
-Requires: oracle-toolfile
+Requires: oracle
%endif
%define skipreqtools jcompiler
-## IMPORT scramv1-tool-conf
+## INCLUDE scram-tool-conf
diff --git a/cuda-toolfile.spec b/cuda-toolfile.spec
deleted file mode 100644
index 0e5afb5c94a..00000000000
--- a/cuda-toolfile.spec
+++ /dev/null
@@ -1,184 +0,0 @@
-### RPM external cuda-toolfile 2.1
-Requires: cuda
-%prep
-
-%build
-
-%install
-## INCLUDE cuda-flags
-# defines nvcc_cuda_flags and nvcc_stdcxx
-
-mkdir -p %{i}/etc/scram.d
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/cuda-stubs.xml
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/cuda.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/cuda-cublas.xml
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/cuda-cufft.xml
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/cuda-curand.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/cuda-cusolver.xml
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/cuda-cusparse.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/cuda-npp.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/cuda-nvgraph.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/cuda-nvml.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/cuda-nvjpeg.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/cuda-nvrtc.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/cupti.xml
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/nvperf.xml
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/nvidia-drivers.xml
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-if [ $(%{cuda_gcc_support}) = true ] ; then
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/cuda-gcc-support.xml
-
-
-EOF_TOOLFILE
-fi
-
-## IMPORT scram-tools-post
diff --git a/cupla-toolfile.spec b/cupla-toolfile.spec
deleted file mode 100644
index 738bb7a8c51..00000000000
--- a/cupla-toolfile.spec
+++ /dev/null
@@ -1,49 +0,0 @@
-### RPM external cupla-toolfile 1.0
-Requires: cupla
-
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/cupla.xml
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/cupla-serial.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/cupla-tbb.xml
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/cupla-cuda.xml
-
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/dip-toolfile.spec b/dip-toolfile.spec
deleted file mode 100644
index 90ee8db7e26..00000000000
--- a/dip-toolfile.spec
+++ /dev/null
@@ -1,43 +0,0 @@
-### RPM external dip-toolfile 1.0
-Requires: dip
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/dip_interface.xml
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/log4cplus.xml
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/dip-platform-dependent.xml
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/dip.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/dire-toolfile.spec b/dire-toolfile.spec
deleted file mode 100644
index 0b734285a21..00000000000
--- a/dire-toolfile.spec
+++ /dev/null
@@ -1,25 +0,0 @@
-### RPM external dire-toolfile 1.0
-Requires: dire
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/dire.xml
-
-
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/dpm-toolfile.spec b/dpm-toolfile.spec
deleted file mode 100644
index 2ddff2d4a11..00000000000
--- a/dpm-toolfile.spec
+++ /dev/null
@@ -1,23 +0,0 @@
-### RPM external dpm-toolfile 1.0
-Requires: dpm
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/dpm.xml
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/fastjet-contrib-toolfile.spec b/fastjet-contrib-toolfile.spec
deleted file mode 100644
index d694a2b74e8..00000000000
--- a/fastjet-contrib-toolfile.spec
+++ /dev/null
@@ -1,41 +0,0 @@
-### RPM external fastjet-contrib-toolfile 1.0
-Requires: fastjet-contrib
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/fastjet-contrib.xml
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/fastjet-contrib-archive.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/fastjet-toolfile.spec b/fastjet-toolfile.spec
deleted file mode 100644
index 2755dc541be..00000000000
--- a/fastjet-toolfile.spec
+++ /dev/null
@@ -1,37 +0,0 @@
-### RPM external fastjet-toolfile 2.0
-%define base_package %(echo %{n} | sed 's|-toolfile||')
-%define base_package_uc %(echo %{base_package} | tr '[a-z-]' '[A-Z_]')
-%{expand:%(for v in %{package_vectorization}; do echo Requires: %{base_package}_$v; done)}
-Requires: %{base_package}
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/%{base_package}.xml
-
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-for v in $(echo %{package_vectorization} | tr '[a-z-]' '[A-Z_]') ; do
- r=`eval echo \\$%{base_package_uc}_${v}_ROOT`
- echo " " >> %i/etc/scram.d/%{base_package}.xml
-done
-cat << \EOF_TOOLFILE >>%i/etc/scram.d/%{base_package}.xml
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/form-toolfile.spec b/form-toolfile.spec
deleted file mode 100644
index 4d0108bd08b..00000000000
--- a/form-toolfile.spec
+++ /dev/null
@@ -1,21 +0,0 @@
-### RPM external form-toolfile 1.0
-Requires: form
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/form.xml
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
-
diff --git a/fwlite-tool-conf.spec b/fwlite-tool-conf.spec
index 14c579b6435..af3ebe18b76 100644
--- a/fwlite-tool-conf.spec
+++ b/fwlite-tool-conf.spec
@@ -1,59 +1,59 @@
-### RPM cms fwlite-tool-conf 11.0
+### RPM cms fwlite-tool-conf 20.0
## NOCOMPILER
# with cmsBuild, change the above version only when a new
# tool is added
## INITENV SET CMSSW_TOOL_CONF_ROOT $FWLITE_TOOL_CONF_ROOT
-Requires: eigen-toolfile
-Requires: fmt-toolfile
-Requires: tbb-toolfile
-Requires: boost-toolfile
-Requires: bz2lib-toolfile
-Requires: clhep-toolfile
-Requires: db6-toolfile
-Requires: dcap-toolfile
-Requires: expat-toolfile
+Requires: eigen
+Requires: fmt
+Requires: tbb
+Requires: boost
+Requires: bz2lib
+Requires: clhep
+Requires: db6
+Requires: dcap
+Requires: expat
Requires: fakesystem
-Requires: fftw3-toolfile
-Requires: fwlitedata-toolfile
-Requires: gcc-toolfile
-Requires: gdbm-toolfile
-Requires: gmake-toolfile
-Requires: gsl-toolfile
-Requires: hepmc-toolfile
-Requires: libjpeg-turbo-toolfile
-Requires: libpng-toolfile
-Requires: libtiff-toolfile
-Requires: libungif-toolfile
-Requires: pcre-toolfile
-Requires: python-toolfile
-Requires: python3-toolfile
-Requires: root-toolfile
-Requires: sigcpp-toolfile
-Requires: sqlite-toolfile
+Requires: fftw3
+Requires: fwlitedata
+Requires: gcc
+Requires: gdbm
+Requires: gmake
+Requires: gsl
+Requires: hepmc
+Requires: libjpeg-turbo
+Requires: libpng
+Requires: libtiff
+Requires: libungif
+Requires: pcre
+Requires: python
+Requires: python3
+Requires: root
+Requires: sigcpp
+Requires: sqlite
Requires: systemtools
-Requires: libuuid-toolfile
-Requires: xerces-c-toolfile
-Requires: xrootd-toolfile
-Requires: xz-toolfile
-Requires: zlib-toolfile
-Requires: libxml2-toolfile
-Requires: llvm-gcc-toolfile
-Requires: vdt-toolfile
-Requires: tinyxml2-toolfile
-Requires: md5-toolfile
-Requires: davix-toolfile
-Requires: py3-numpy-toolfile
-Requires: OpenBLAS-toolfile
-Requires: py3-pybind11-toolfile
+Requires: libuuid
+Requires: xerces-c
+Requires: xrootd
+Requires: xz
+Requires: zlib
+Requires: libxml2
+Requires: llvm
+Requires: vdt
+Requires: tinyxml2
+Requires: md5
+Requires: davix
+Requires: py3-numpy
+Requires: OpenBLAS
+Requires: py3-pybind11
Requires: fwlite_python_tools
-Requires: zstd-toolfile
+Requires: zstd
# Only for Darwin platform.
%ifarch darwin
-Requires: freetype-toolfile
+Requires: freetype
%endif
%define skipreqtools jcompiler db6 expat fftw3 sqlite
-## IMPORT scramv1-tool-conf
+## INCLUDE scram-tool-conf
diff --git a/fwlitedata-toolfile.spec b/fwlitedata-toolfile.spec
deleted file mode 100644
index 7d2d1580390..00000000000
--- a/fwlitedata-toolfile.spec
+++ /dev/null
@@ -1,27 +0,0 @@
-### RPM cms fwlitedata-toolfile 1.0
-Requires: fwlitedata
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/fwlitedata.xml
-
-
-
-
-
-
-EOF_TOOLFILE
-for tool in `echo %requiredtools | tr ' ' '\n' | grep 'data-'` ; do
- uctool=`echo $tool | tr '-' '_' | tr '[a-z]' '[A-Z]'`
- toolbase=`eval echo \\$${uctool}_ROOT`
- echo "$uctool = $toolbase"
- if [ "X$toolbase" = X -o ! -d $toolbase/etc ] ; then continue ; fi
- echo "" >> %i/etc/scram.d/fwlitedata.xml
-done
-echo "" >> %i/etc/scram.d/fwlitedata.xml
-
-## IMPORT scram-tools-post
diff --git a/gcc-checker-plugin-toolfile.spec b/gcc-checker-plugin-toolfile.spec
deleted file mode 100644
index b33747dcf9e..00000000000
--- a/gcc-checker-plugin-toolfile.spec
+++ /dev/null
@@ -1,42 +0,0 @@
-### RPM cms gcc-checker-plugin-toolfile 1.0
-Requires: gcc gcc-checker-plugin
-
-%prep
-%build
-%install
-mkdir -p %{i}/etc/scram.d
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/gcc-checker-plugin.xml
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/gcc-analyzer-cxxcompiler.xml
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/gcc-analyzer-ccompiler.xml
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-export GCC_ROOT
-
-## IMPORT scram-tools-post
diff --git a/gcc-toolfile.spec b/gcc-toolfile.spec
deleted file mode 100644
index c707f66aa26..00000000000
--- a/gcc-toolfile.spec
+++ /dev/null
@@ -1,226 +0,0 @@
-### RPM cms gcc-toolfile 16.0
-## INCLUDE compilation_flags
-# gcc has a separate spec file for the generating a
-# toolfile because gcc.spec could be not build because of the
-# "--use-system-compiler" option.
-
-Source: none
-%{expand:%(i=90; for v in %{package_vectorization}; do let i=$i+1 ; echo Source${i}: vectorization/$v; done)}
-
-%prep
-%build
-%install
-mkdir -p %{i}/etc/scram.d
-
-# Determine the GCC_ROOT if "use system compiler" is used.
-if [ "X$GCC_ROOT" = X ]
-then
- export GCC_PATH=$(which gcc) || exit 1
- export GCC_ROOT=$(echo $GCC_PATH | sed -e 's|/bin/gcc||')
- export GCC_VERSION=$(gcc -dumpversion) || exit 1
- export G77_ROOT=$GCC_ROOT
-else
- export GCC_PATH
- export GCC_ROOT
- export GCC_VERSION
- export G77_ROOT=$GCC_ROOT
-fi
-
-%ifos linux
-export ARCH_FFLAGS="-cpp"
-%endif
-SCRAM_CXX11_ABI=1
-echo '#include ' | g++ -x c++ -E -dM - | grep ' _GLIBCXX_USE_CXX11_ABI *1' || SCRAM_CXX11_ABI=0
-export SCRAM_CXX11_ABI
-export COMPILER_VERSION=$(gcc -dumpversion)
-export COMPILER_VERSION_MAJOR=$(echo $COMPILER_VERSION | cut -d'.' -f1)
-export COMPILER_VERSION_MINOR=$(echo $COMPILER_VERSION | cut -d'.' -f2)
-
-# Generic template for the toolfiles.
-# *** USE @VARIABLE@ plus associated environment variable to customize. ***
-# DO NOT DUPLICATE the toolfile template.
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/gcc-cxxcompiler.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-%ifarch x86_64
-for v in %{package_vectorization} ; do
- uv=$(echo $v | tr [a-z-] [A-Z_] | tr '.' '_')
- echo " " >> %i/etc/scram.d/gcc-cxxcompiler.xml
-done
-%endif
-cat << \EOF_TOOLFILE >>%i/etc/scram.d/gcc-cxxcompiler.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/gcc-ccompiler.xml
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# Notice that on OSX we have a LIBDIR defined for f77compiler because gcc C++
-# compiler (which comes from the system) does not know about where to find
-# libgfortran.
-cat << \EOF_TOOLFILE >%i/etc/scram.d/gcc-f77compiler.xml
-
-
-
-
-
-
- @ARCH_FORTRAN_LIBDIR@
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# GCC tool file for explicitly linking against libstdc++fs
-cat << \EOF_TOOLFILE >%i/etc/scram.d/stdcxx-fs.xml
-
-
-
-EOF_TOOLFILE
-
-# GCC tool file for explicitly linking against libatomic
-cat << \EOF_TOOLFILE >%i/etc/scram.d/gcc-atomic.xml
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# GCC tool file for explicity linking gcc plugin library
-cat << \EOF_TOOLFILE >%i/etc/scram.d/gcc-plugin.xml
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/ofast-flag.xml
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-export GCC_PLUGIN_DIR=$(gcc -print-file-name=plugin)
-
-# NON-empty defaults
-# First of all handle OS specific options.
-%ifos linux
- export OS_SHAREDFLAGS="-shared -Wl,-E"
- export OS_LDFLAGS="-Wl,-E -Wl,--hash-style=gnu"
- export OS_RUNTIME_LDPATH_NAME="LD_LIBRARY_PATH"
- export OS_CXXFLAGS="-Werror=overflow"
-%endif
-%ifos darwin
- export OS_SHAREDFLAGS="-shared -dynamic -single_module"
- export OS_LDFLAGS="-Wl,-commons -Wl,use_dylibs"
- export OS_RUNTIME_LDPATH_NAME="DYLD_LIBRARY_PATH"
-%endif
-
-# Then handle OS + architecture specific options (maybe we should enable more
-# aggressive optimizations for amd64 as well??)
-%ifos darwin
- export ARCH_CXXFLAGS="-arch x86_64"
- export ARCH_SHAREDFLAGS="-arch x86_64"
- export ARCH_LIB64DIR="lib"
- export ARCH_LD_UNIT="-r"
-%else
- # For some reason on mac, some of the header do not compile if this is
- # defined. Ignore for now.
- export ARCH_LIB64DIR="lib64"
- export ARCH_LD_UNIT="-r -z muldefs"
-%endif
-
-# Then handle compiler specific options. E.g. enable
-# optimizations as they become available in gcc.
-COMPILER_CXXFLAGS=
-
-COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS -std=c++1z -ftree-vectorize"
-COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS -Wstrict-overflow"
-COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS -Werror=array-bounds -Werror=format-contains-nul -Werror=type-limits"
-COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS -fvisibility-inlines-hidden"
-COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS -fno-math-errno --param vect-max-version-for-alias-checks=50"
-COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS -Xassembler --compress-debug-sections"
-
-%ifarch x86_64
- COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS $(%{cmsdist_directory}/vectorization/cmsdist_packages.py)"
-%endif
-%ifarch aarch64
- COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS -fsigned-char -fsigned-bitfields"
-%endif
-%ifarch ppc64le
- COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS -fsigned-char -fsigned-bitfields %{ppc64le_build_flags}"
-%endif
-
-export COMPILER_CXXFLAGS
-
-# General substitutions
-perl -p -i -e 's|\@([^@]*)\@|$ENV{$1}|g' %{i}/etc/scram.d/*.xml
-
-%post
-%{relocateConfig}etc/scram.d/*.xml
-echo "GCC_TOOLFILE_ROOT='$CMS_INSTALL_PREFIX/%{pkgrel}'; export GCC_TOOLFILE_ROOT" > $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.sh
-echo "setenv GCC_TOOLFILE_ROOT '$CMS_INSTALL_PREFIX/%{pkgrel}'" > $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.csh
diff --git a/geant4-toolfile.spec b/geant4-toolfile.spec
deleted file mode 100644
index 18c452c531a..00000000000
--- a/geant4-toolfile.spec
+++ /dev/null
@@ -1,90 +0,0 @@
-### RPM external geant4-toolfile 1.0
-Requires: geant4
-
-%prep
-%build
-%install
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/geant4.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/geant4core.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/geant4static.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/geant4vis.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/geant4data-toolfile.spec b/geant4data-toolfile.spec
deleted file mode 100644
index 8847adb6554..00000000000
--- a/geant4data-toolfile.spec
+++ /dev/null
@@ -1,27 +0,0 @@
-### RPM external geant4data-toolfile 1.0
-Requires: geant4data
-
-%prep
-%build
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/geant4data.xml
-
-
-
-
-EOF_TOOLFILE
-for tool in `echo %requiredtools | tr ' ' '\n' | grep 'geant4-'` ; do
- uctool=`echo $tool | tr '-' '_' | tr '[a-z]' '[A-Z]'`
- toolbase=`eval echo \\$${uctool}_ROOT`
- toolenv=`eval echo \\$${uctool}_RUNTIME`
- echo "$uctool = $toolbase, $toolenv"
- if [ "X$toolbase" = X -o "X$toolenv" = X -o ! -d $toolbase/data ] ; then continue ; fi
- tooldata=`ls -d $toolbase/data/* | tail -1`
- if [ "X$tooldata" = X ] ; then continue ; fi
- echo " " >> %i/etc/scram.d/geant4data.xml
-done
-echo "" >> %i/etc/scram.d/geant4data.xml
-
-## IMPORT scram-tools-post
diff --git a/geant4data.spec b/geant4data.spec
index f5e179abed9..874e24d8d47 100644
--- a/geant4data.spec
+++ b/geant4data.spec
@@ -1,4 +1,4 @@
-### RPM external geant4data 2.0
+### RPM external geant4data 10.0
## NOCOMPILER
Requires: geant4-G4NDL
@@ -15,9 +15,32 @@ Requires: geant4-G4INCL
%prep
%build
%install
+
+mkdir -p %i/etc/scram.d
+cat << \EOF_TOOLFILE >%i/etc/scram.d/geant4data.xml
+
+
+
+
+EOF_TOOLFILE
+
+for tool in `echo %requiredtools | tr ' ' '\n' | grep 'geant4-'` ; do
+ uctool=`echo $tool | tr '-' '_' | tr '[a-z]' '[A-Z]'`
+ toolbase=`eval echo \\$${uctool}_ROOT`
+ toolenv=`eval echo \\$${uctool}_RUNTIME`
+ echo "$uctool = $toolbase, $toolenv"
+ if [ "X$toolbase" = X -o "X$toolenv" = X -o ! -d $toolbase/data ] ; then continue ; fi
+ tooldata=`ls -d $toolbase/data/* | tail -1`
+ if [ "X$tooldata" = X ] ; then continue ; fi
+ echo " " >> %i/etc/scram.d/geant4data.xml
+done
+echo "" >> %i/etc/scram.d/geant4data.xml
+
%post
if [ "X$CMS_INSTALL_PREFIX" = "X" ] ; then CMS_INSTALL_PREFIX=$RPM_INSTALL_PREFIX; export CMS_INSTALL_PREFIX; fi
+%{relocateConfig}etc/scram.d/*.xml
echo "GEANT4DATA_ROOT='$CMS_INSTALL_PREFIX/%{pkgrel}'" > $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.sh
echo "set GEANT4DATA_ROOT='$CMS_INSTALL_PREFIX/%{pkgrel}'" > $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.csh
echo "GEANT4DATA_VERSION='%v'" >> $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.sh
echo "set GEANT4DATA_VERSION='%v'" >> $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.csh
+
diff --git a/gengetopt-toolfile.spec b/gengetopt-toolfile.spec
deleted file mode 100644
index 6a73d78d24c..00000000000
--- a/gengetopt-toolfile.spec
+++ /dev/null
@@ -1,21 +0,0 @@
-### RPM external gengetopt-toolfile 1.0
-Requires: gengetopt
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/gengetopt.xml
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
-
diff --git a/google-benchmark-toolfile.spec b/google-benchmark-toolfile.spec
deleted file mode 100644
index 568e406f075..00000000000
--- a/google-benchmark-toolfile.spec
+++ /dev/null
@@ -1,31 +0,0 @@
-### RPM external google-benchmark-toolfile 1.0
-Requires: google-benchmark
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/google-benchmark.xml
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/google-benchmark-main.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/gperftools-toolfile.spec b/gperftools-toolfile.spec
deleted file mode 100644
index a7ebc5c2a34..00000000000
--- a/gperftools-toolfile.spec
+++ /dev/null
@@ -1,43 +0,0 @@
-### RPM external gperftools-toolfile 2.0
-
-Requires: gperftools
-
-%prep
-
-%build
-
-%install
-
-mkdir -p %{i}/etc/scram.d
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/tcmalloc_minimal.xml
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/tcmalloc.xml
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/gperf.xml
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/hepmc-toolfile.spec b/hepmc-toolfile.spec
deleted file mode 100644
index 030937bc284..00000000000
--- a/hepmc-toolfile.spec
+++ /dev/null
@@ -1,35 +0,0 @@
-### RPM external hepmc-toolfile 1.0
-Requires: hepmc
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/hepmc.xml
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/hepmc_headers.xml
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
-
diff --git a/icc-gcc-toolfile.spec b/icc-gcc-toolfile.spec
deleted file mode 100644
index 4026fa2b47e..00000000000
--- a/icc-gcc-toolfile.spec
+++ /dev/null
@@ -1,119 +0,0 @@
-### RPM cms icc-gcc-toolfile 3.0
-
-Requires: gcc-toolfile
-Requires: icc-scram
-%define iccbin_dir bin/intel64
-%define icclib_dir compiler/lib/intel64
-%define f77bin_dir bin/intel64
-%define f77lib_dir compiler/lib/intel64
-%if "%(echo %cmsos | grep osx >/dev/null && echo true)" == "true"
-Requires: gfortran-macosx
-%endif
-Source: none
-
-%prep
-%build
-%install
-mkdir -p %i/etc/scram.d
-
-# Determine the GCC_ROOT if "use system compiler is used. We still need this
-# because we need to pick up libstdc++ from the gcc installation since clang
-# does not ship its own and because clang does not provide a fortran compiler.
-if [ "X$GCC_ROOT" = X ]
-then
- GCC_PATH=`which gcc` || exit 1
- GCC_VERSION=`gcc -dumpversion` || exit 1
- GCC_ROOT=`echo $GCC_PATH | sed -e 's|/bin/gcc||'`
-fi
-export ICC_ROOT=$ICC_SCRAM_ROOT
-export ICC_VERSION=ICC_SCRAM_VERSION
-export GCC_ROOT
-
-mkdir -p %i/etc/scram.d
-# Generic template for the toolfiles.
-# *** USE @VARIABLE@ plus associated environment variable to customize. ***
-# DO NOT DUPLICATE the toolfile template.
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/intel-license.xml
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/icc-cxxcompiler.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/icc-ccompiler.xml
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/icc-f77compiler.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# NON-empty defaults
-# First of all handle OS specific options.
-OS_RUNTIME_LDPATH_NAME="LD_LIBRARY_PATH"
-case %cmsplatf in
- osx* ) OS_RUNTIME_LDPATH_NAME="DYLD_LIBRARY_PATH" ;;
-esac
-export OS_RUNTIME_LDPATH_NAME
-
-# General substitutions
-export AT="@"
-perl -p -i -e 's|\@([^@]*)\@|$ENV{$1}|g' %i/etc/scram.d/*.xml
-%post
-%{relocateConfig}etc/scram.d/*.xml
-echo "ICC_GCC_TOOLFILE_ROOT='$CMS_INSTALL_PREFIX/%{pkgrel}'; export ICC_GCC_TOOLFILE_ROOT" > $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.sh
-echo "setenv ICC_GCC_TOOLFILE_ROOT '$CMS_INSTALL_PREFIX/%{pkgrel}'" > $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.csh
diff --git a/jimmy-toolfile.spec b/jimmy-toolfile.spec
deleted file mode 100644
index d0f5e0f11dd..00000000000
--- a/jimmy-toolfile.spec
+++ /dev/null
@@ -1,35 +0,0 @@
-### RPM external jimmy-toolfile 1.0
-Requires: jimmy
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/jimmy.xml
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/jimmy_headers.xml
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
-
diff --git a/llvm-gcc-toolfile.spec b/llvm-gcc-toolfile.spec
deleted file mode 100644
index 71cd8ebbd62..00000000000
--- a/llvm-gcc-toolfile.spec
+++ /dev/null
@@ -1,162 +0,0 @@
-### RPM cms llvm-gcc-toolfile 14.0
-
-Requires: llvm
-BuildRequires: python
-%if "%(echo %cmsos | grep osx >/dev/null && echo true)" == "true"
-Requires: gfortran-macosx
-%endif
-Source: none
-
-%prep
-%build
-%install
-mkdir -p %i/etc/scram.d
-
-# Determine the GCC_ROOT if "use system compiler is used. We still need this
-# because we need to pick up libstdc++ from the gcc installation since clang
-# does not ship its own and because clang does not provide a fortran compiler.
-if [ "X$GCC_ROOT" = X ]
-then
- GCC_PATH=`which gcc` || exit 1
- GCC_VERSION=`gcc -dumpversion` || exit 1
- GCC_ROOT=`echo $GCC_PATH | sed -e 's|/bin/gcc||'`
- G77_ROOT=$GFORTRAN_MACOSX_ROOT
-else
- G77_ROOT=$GCC_ROOT
-fi
-export LLVM_ROOT
-export LLVM_VERSION
-export GCC_ROOT
-export G77_ROOT
-
-mkdir -p %i/etc/scram.d
-# Generic template for the toolfiles.
-# *** USE @VARIABLE@ plus associated environment variable to customize. ***
-# DO NOT DUPLICATE the toolfile template.
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/llvm-cxxcompiler.xml
-
-
-
-
-
-
- # drop flags not supported by llvm
- # -Wno-non-template-friend removed since it's not supported, yet, by llvm.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/iwyu-cxxcompiler.xml
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/llvm-ccompiler.xml
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/llvm-f77compiler.xml
-
-
-
-
-
-
-EOF_TOOLFILE
-
-#Clang analyzer compilers
-cat << \EOF_TOOLFILE >%i/etc/scram.d/llvm-analyzer-cxxcompiler.xml
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/llvm-analyzer-ccompiler.xml
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# This is a toolfile to use llvm / clang as a library, not as a compiler.
-cat << \EOF_TOOLFILE >%i/etc/scram.d/llvm.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/pyclang.xml
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# NON-empty defaults
-# First of all handle OS specific options.
-OS_RUNTIME_LDPATH_NAME="LD_LIBRARY_PATH"
-case %cmsplatf in
- osx* ) OS_RUNTIME_LDPATH_NAME="DYLD_LIBRARY_PATH" ;;
-esac
-export OS_RUNTIME_LDPATH_NAME
-
-# General substitutions
-perl -p -i -e 's|\@([^@]*)\@|$ENV{$1}|g' %i/etc/scram.d/*.xml
-%post
-%{relocateConfig}etc/scram.d/*.xml
-echo "LLVM_GCC_TOOLFILE_ROOT='$CMS_INSTALL_PREFIX/%{pkgrel}'; export GCC_TOOLFILE_ROOT" > $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.sh
-echo "setenv LLVM_GCC_TOOLFILE_ROOT '$CMS_INSTALL_PREFIX/%{pkgrel}'" > $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.csh
diff --git a/mkfit-toolfile.spec b/mkfit-toolfile.spec
deleted file mode 100644
index c683942c729..00000000000
--- a/mkfit-toolfile.spec
+++ /dev/null
@@ -1,34 +0,0 @@
-### RPM external mkfit-toolfile 3.0
-%define base_package %(echo %{n} | sed 's|-toolfile||')
-%define base_package_uc %(echo %{base_package} | tr '[a-z-]' '[A-Z_]')
-%{expand:%(for v in %{package_vectorization}; do echo Requires: %{base_package}_$v; done)}
-Requires: %{base_package}
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/%{base_package}.xml
-
-
-
-
-
-
-
-EOF_TOOLFILE
-for v in $(echo %{package_vectorization} | tr '[a-z-]' '[A-Z_]') ; do
- r=`eval echo \\$%{base_package_uc}_${v}_ROOT`
- echo " " >> %i/etc/scram.d/%{base_package}.xml
-done
-cat << \EOF_TOOLFILE >>%i/etc/scram.d/%{base_package}.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/p5-compress-zlib-toolfile.spec b/p5-compress-zlib-toolfile.spec
deleted file mode 100644
index 4628e965f67..00000000000
--- a/p5-compress-zlib-toolfile.spec
+++ /dev/null
@@ -1,21 +0,0 @@
-### RPM external p5-compress-zlib-toolfile 1.0
-Requires: p5-compress-zlib
-
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/p5-compress-zlib.xml
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/p5-extutils-makemaker-toolfile.spec b/p5-extutils-makemaker-toolfile.spec
deleted file mode 100644
index 3cd3bd270e8..00000000000
--- a/p5-extutils-makemaker-toolfile.spec
+++ /dev/null
@@ -1,21 +0,0 @@
-### RPM external p5-extutils-makemaker-toolfile 1.0
-Requires: p5-extutils-makemaker
-
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/p5-extutils-makemaker.xml
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/photos-toolfile.spec b/photos-toolfile.spec
deleted file mode 100644
index 9288be711ad..00000000000
--- a/photos-toolfile.spec
+++ /dev/null
@@ -1,34 +0,0 @@
-### RPM external photos-toolfile 1.0
-Requires: photos
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/photos.xml
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/photos_headers.xml
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
-
diff --git a/py3-numpy-toolfile.spec b/py3-numpy-toolfile.spec
deleted file mode 100644
index fa44213c57f..00000000000
--- a/py3-numpy-toolfile.spec
+++ /dev/null
@@ -1,33 +0,0 @@
-### RPM external py3-numpy-toolfile 1.0
-Requires: py3-numpy
-
-%prep
-
-%build
-
-%install
-
-mkdir -p %{i}/etc/scram.d
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/py3-numpy.xml
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/numpy-c-api.xml
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/pythia6-toolfile.spec b/pythia6-toolfile.spec
deleted file mode 100644
index 310be896294..00000000000
--- a/pythia6-toolfile.spec
+++ /dev/null
@@ -1,48 +0,0 @@
-### RPM external pythia6-toolfile 2.1
-Requires: pythia6
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/pythia6.xml
-
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/pythia6_headers.xml
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/pydata.xml
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
-
diff --git a/python_tools.spec b/python_tools.spec
index 5fc0bf3a27e..f8f68c71d5e 100644
--- a/python_tools.spec
+++ b/python_tools.spec
@@ -123,10 +123,10 @@ Requires: py3-python-ldap
Requires: py3-plac
Requires: py3-matplotlib
-Requires: py3-numpy-toolfile
+Requires: py3-numpy
Requires: py3-sqlalchemy
Requires: py3-pygithub
-Requires: py3-dxr-toolfile
+Requires: py3-dxr
Requires: py3-PyYAML
Requires: py3-pylint
Requires: py3-pip
@@ -134,7 +134,7 @@ Requires: py3-pip
Requires: py3-cx-Oracle
%endif
Requires: py3-cython
-Requires: py3-pybind11-toolfile
+Requires: py3-pybind11
Requires: py3-histbook
Requires: py3-flake8
Requires: py3-autopep8
@@ -217,9 +217,4 @@ Requires: py3-correctionlib
%build
%install
-mkdir -p %{i}/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/python_tools.xml
-
-
-EOF_TOOLFILE
diff --git a/qd-toolfile.spec b/qd-toolfile.spec
deleted file mode 100644
index 6335729b032..00000000000
--- a/qd-toolfile.spec
+++ /dev/null
@@ -1,31 +0,0 @@
-### RPM external qd-toolfile 1.0
-Requires: qd
-
-%prep
-
-%build
-
-%install
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/qd.xml
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/qd_f_main.xml
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
-
-
diff --git a/qgraf-toolfile.spec b/qgraf-toolfile.spec
deleted file mode 100644
index d61c110481f..00000000000
--- a/qgraf-toolfile.spec
+++ /dev/null
@@ -1,21 +0,0 @@
-### RPM external qgraf-toolfile 1.0
-Requires: qgraf
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/qgraf.xml
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
-
diff --git a/root-toolfile.spec b/root-toolfile.spec
deleted file mode 100644
index 6e2067cb369..00000000000
--- a/root-toolfile.spec
+++ /dev/null
@@ -1,526 +0,0 @@
-### RPM lcg root-toolfile 2.1
-Requires: root
-Requires: gcc
-%prep
-
-%build
-
-%install
-
-export GCC_ROOT
-export GCC_VERSION
-export GCC_REALVERSION=$(gcc -dumpversion)
-
-TARGET_TRIPLET=$(gcc -dumpmachine)
-export TARGET_TRIPLET
-
-# TODO: All additional include paths must be added at the beginning of ROOT_INCLUDE_PATH
-
-mkdir -p %i/etc/scram.d
-# root_interface toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/root_interface.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE > %{i}/etc/scram.d/root_cxxdefaults.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootcling toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootcling.xml
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootrint toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootrint.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootsmatrix toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootsmatrix.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootrio toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootrio.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootthread toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootthread.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootxmlio toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootxmlio.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootmathcore toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmathcore.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootcore toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootcore.xml
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# roothistmatrix toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/roothistmatrix.xml
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootdataframe toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootdataframe.xml
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootvecops toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootvecops.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootntuple toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootntuple.xml
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootspectrum toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootspectrum.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootphysics toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootphysics.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-# root toolfile, alias for rootphysics. Using rootphysics is preferred.
-cat << \EOF_TOOLFILE >%i/etc/scram.d/root.xml
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootgpad toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgpad.xml
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootgraphics toolfile, identical to old "root" toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgraphics.xml
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# rooteg toolfile, identical to old "root" toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rooteg.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootpy toolfile, identical to old "root" toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootpy.xml
-
-
-
-
-EOF_TOOLFILE
-
-# rootinteractive toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive.xml
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootmath toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmath.xml
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootminuit toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootminuit.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootminuit2 toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootminuit2.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootrflx toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootrflx.xml
-
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# roothtml toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/roothtml.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootmlp toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmlp.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-# roottmva toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/roottmva.xml
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootpymva toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootpymva.xml
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootxml toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootxml.xml
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootfoam toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootfoam.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootgeom toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgeom.xml
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootgeompainter toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgeompainter.xml
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootrgl toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootrgl.xml
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# rooteve toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rooteve.xml
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# rootguihtml toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootguihtml.xml
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# roofitcore toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/roofitcore.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# roofit toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/roofit.xml
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# roostats toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/roostats.xml
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-# histfactory toolfile
-cat << \EOF_TOOLFILE >%i/etc/scram.d/histfactory.xml
-
-
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-#Root Ged
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootged.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-#Root GLEW
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootglew.xml
-
-
-
-
-EOF_TOOLFILE
-
-#Root Gui
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgui.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootimt.xml
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/roothistpainter.xml
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-#Root X11
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rootx11.xml
-
-
-%ifos darwin
-
-%else
-
-%endif
-
-
-EOF_TOOLFILE
-
-case %cmsos in
- *_ia32)
- GENREFLEX_GCCXMLOPT="-m32"
- ;;
- *_amd64)
- GENREFLEX_GCCXMLOPT="-m64"
- ;;
-esac
-export GENREFLEX_GCCXMLOPT
-
-## IMPORT scram-tools-post
diff --git a/scramv1-tool-conf.file b/scram-tool-conf.file
similarity index 59%
rename from scramv1-tool-conf.file
rename to scram-tool-conf.file
index 9c6366bf290..faed1ab4c6c 100644
--- a/scramv1-tool-conf.file
+++ b/scram-tool-conf.file
@@ -1,31 +1,20 @@
-### FILE scramv1-tool-conf
+### FILE scram-tool-conf
## NOCOMPILER
## BUILDREQUIRE-TOOLFILE
-Requires: gmake-toolfile
+Requires: gmake
BuildRequires: SCRAMV1
+Source99: scram-tools
+## INCLUDE compilation_flags
+## INCLUDE cuda-flags
Source: none
-%define online %(case %cmsplatf in (*onl_*_*) echo true;; (*) echo false;; esac)
-%define CheckScramTools \
- uctool=`echo $tool | tr '[a-z-]' '[A-Z_]'` \
- toolbase=`eval echo \\\\$${uctool}_ROOT` \
- [ -d $toolbase/etc/scram.d ] || continue
-
-%define CopyScramTools \
- echo ">> Copying tool files from: $tool" \
- for xml in $(find $toolbase/etc/scram.d -type f) ; do \
- bxml=$(basename $xml | tr '[A-Z]' '[a-z]') \
- [ -f %i/tools/selected/$bxml ] && continue \
- [ -f %i/tools/available/$bxml ] && continue \
- cp $xml %i/tools/selected/${bxml} \
- echo " Copied $bxml" \
- done
+
+%if "%{?vec_tools:set}" != "set"
+%define vec_tools %{nil}
+%endif
%prep
%build
-# This is a generic template to collect SCRAMToolBox toolfiles of all the tools
-# and generate CMSconfiguration, tools-STANDALONE.conf and requirements file
-#
# requiredtools Tools for which we need to collect the SCRAMToolBox toolfiles
# (This is automatically set by install.sh script)
# skipreqtools Do not add these tools in selected directory
@@ -34,62 +23,58 @@ Source: none
rm -rf %i
mkdir -p %i/tools/selected %i/tools/available
-%if "%{?systemtools:set}" != "set"
-%define systemtools %{nil}
-%endif
-
%if "%{?skipreqtools:set}" != "set"
%define skipreqtools %{nil}
%endif
-DoneTools=" "
-SkipTools=
+%if "%{?package_vectorization}" != ""
+export PKG_VECTORIZATION=`echo %package_vectorization`
+%endif
+export CMSDIST_DIR=%cmsdist_directory
+
+%ifarch x86_64
+export COMPILER_CXXFLAGS="$(%{cmsdist_directory}/vectorization/cmsdist_packages.py)"
+%endif
+%ifarch ppc64le
+export COMPILER_CXXFLAGS="%{ppc64le_build_flags}"
+%endif
+export ORACLE_ENV_ROOT=""
+export CUDA_FLAGS="%{nvcc_cuda_flags}"
+export CUDA_HOST_CXXFLAGS="%{nvcc_stdcxx}"
+if [ $(echo ' %requiredtools ' | grep ' python3 ' |wc -l) -gt 0 ] ; then export PYTHON3_LIB_SITE_PACKAGES ; fi
+if [ $(echo ' %requiredtools ' | grep ' python ' |wc -l) -gt 0 ] ; then export PYTHON_LIB_SITE_PACKAGES ; fi
+
for tool in %requiredtools; do
- wot=`echo $tool | sed 's|-tool-conf$||'`
- [ "X$tool" == "X$wot" ] && continue
+ echo ">> Copying tool files from: $tool"
uctool=`echo $tool | tr '[a-z-]' '[A-Z_]'`
toolbase=`eval echo \\$${uctool}_ROOT`
- [ -d $toolbase/tools/selected ] || continue
- [ -d $toolbase/tools/available ] || continue
- DoneTools="$DoneTools $tool "
- echo ">> Copying tool files from: $tool"
- find $toolbase/tools/selected -type f -exec cp {} %i/tools/selected \;
- find $toolbase/tools/available -type f -exec cp {} %i/tools/available \;
-done
-for tool in %requiredtools %buildrequiredtools %systemtools ${PKGTOOLS_SYSTEM_TOOLS} ; do
- wot=`echo $tool | sed 's|-toolfile$||'`
- [ "X$tool" == "X$wot" ] && SkipTools="${SkipTools}${tool} " && continue
- %{CheckScramTools}
- DoneTools="$DoneTools $wot "
- %{CopyScramTools}
-done
-for tool in $SkipTools ; do
- [ "X`echo $DoneTools | tr ' ' '\n' | grep ^$tool$`" == "X" ] || continue
- %{CheckScramTools}
- %{CopyScramTools}
+ toolver=`eval echo \\$${uctool}_VERSION`
+ %{_sourcedir}/scram-tools/bin/get_tools "$toolbase" "$toolver" %i "${tool}"
done
-# Fixes logic in above loop in case of online release:
-# the descriptions of explicitly defined systemtools should
-# take precedence over those from cms-rebuilt rpms
-%if "%online" == "true"
-for tool in %systemtools ${PKGTOOLS_SYSTEM_TOOLS} ; do
- lc_tool=$(echo $tool | tr '[A-Z]' '[a-z]')
- rm -f %i/tools/selected/${lc_tool} %i/tools/selected/${lc_tool}.xml
- cp -rf %{onlinesystemtoolsroot}/etc/scram.d/${tool}.xml %i/tools/selected/${lc_tool}.xml
+for vec in %{package_vectorization}; do \
+ ucvec=`echo $vec | tr '[a-z-]' '[A-Z_]'`
+ for tool in %{vec_tools}; do \
+ uctool=`echo $tool | tr '[a-z-]' '[A-Z_]'`
+ toolbase=`eval echo \\$${uctool}_${ucvec}_ROOT`
+ toolver=`eval echo \\$${uctool}_${ucvec}_VERSION`
+ %{_sourcedir}/scram-tools/bin/get_vectorized_tools "$toolbase" "$toolver" %i "${tool}" "${vec}"
+ done
+ if [ -f %i/tools/selected/gcc-cxxcompiler.xml ] ; then
+ f=$(%{cmsdist_directory}/vectorization/cmsdist_packages.py $vec)
+ sed -i -e "s## \n#" %i/tools/selected/gcc-cxxcompiler.xml
+ fi
done
-# For now copy all systemtools files. If needed, this can be done more selectively.
-%endif
for stool in $(echo %skipreqtools | tr '[A-Z]' '[a-z]') ; do
[ -f %i/tools/selected/${stool}.xml ] || continue
mv %i/tools/selected/${stool}.xml %i/tools/available
done
-
+
if [ -e $SCRAMV1_ROOT/bin/chktool ] ; then
- find %i/tools -name '*.xml' -type f | (xargs $SCRAMV1_ROOT/bin/chktool > %i/errors.log 2>&1 || true)
- ToolErrors=`cat %i/errors.log | wc -l | awk '{print $1}'`
- if [ "X$ToolErrors" != "X0" ] ; then
+ touch %i/errors.log
+ find %i/tools -name '*.xml' -type f | (xargs $SCRAMV1_ROOT/bin/chktool >> %i/errors.log 2>&1 || true)
+ if [ $(grep 'ERROR:' %i/errors.log | wc -l) -gt 0 ] ; then
cat %i/errors.log
exit 1
fi
@@ -123,7 +108,7 @@ echo '' >> %{i}/tools/selected/python-paths.xml
ALL_PY_BIN=""
ALL_PY_BIN_PKGS=""
-for pkg in $(echo %{allpkgreqs} | tr ' ' '\n' | grep -v '\-toolfile/' | grep '/py[23]-') ; do
+for pkg in $(echo %{allpkgreqs} | tr ' ' '\n' | grep '/py[23]-') ; do
pk_name=$(echo $pkg | cut -d/ -f2 | tr '[A-Z]' '[a-z]')
if [ -f %{i}/tools/selected/${pk_name}.xml ] ; then continue ; fi
pk_ver=$(echo $pkg | cut -d/ -f3)
@@ -142,6 +127,7 @@ for pkg in $(echo %{allpkgreqs} | tr ' ' '\n' | grep -v '\-toolfile/' | grep '/
echo "" >> %{i}/tools/selected/${pk_name}.xml
done
DUP_BIN=$(echo "${ALL_PY_BIN}" | tr ' ' '\n' | sort | uniq -c | sed 's|^\s*||' | grep -v '^1 ' | sed 's|^.* ||')
+
set +x
if [ "${DUP_BIN}" != "" ] ; then
for p in ${DUP_BIN} ; do
@@ -151,7 +137,26 @@ if [ "${DUP_BIN}" != "" ] ; then
exit 1
fi
set -x
+
+#vectorized packages
+%if "%{?vectorized_packages}" != ""
+for vect_package in %vectorized_packages; do
+ echo $vect_package
+ package_uc=$(echo $vect_package | tr '[a-z-]' '[A-Z_]')
+ r=""
+ #echo $package_uc
+ for v in $(echo %{package_vectorization} | tr '[a-z-]' '[A-Z_]'); do
+ r=$r" \n"
+ #echo $v
+ done
+ r=$r''
+ perl -p -i -e "s||${r}|g" %i/tools/selected/$(echo $vect_package | tr '[A-Z]' '[a-z]').xml
+done
+%endif
+
%post
+
%{relocateCmsFiles} $(find $RPM_INSTALL_PREFIX/%{pkgrel}/tools -type f)
%{relocateCmsFiles} $(find $RPM_INSTALL_PREFIX/%{pkgrel}/lib -type f)
-
diff --git a/scram-tools-post.file b/scram-tools-post.file
deleted file mode 100644
index 89eaf55d573..00000000000
--- a/scram-tools-post.file
+++ /dev/null
@@ -1,24 +0,0 @@
-### FILE scram-tools-post
-## NOCOMPILER
-## NO_AUTO_DEPENDENCY
-%define BaseTool %(echo %n | sed 's|-toolfile||' | tr '[a-z-]' '[A-Z_]')
-
-export TOOL_ROOT=$%{BaseTool}_ROOT
-export TOOL_VERSION=$%{BaseTool}_VERSION
-env
-perl -p -i -e 's|\@([^@]*)\@|$ENV{$1}|g' %i/etc/scram.d/*.xml
-
-# On OSX we need to use DYLD_LIBRARY_PATH, rather than LD_LIBRARY_PATH.
-# in order to avoid multiple stanzas in the toolfiles for each different
-# architecture (or even worse, multiple toolfiles per architecture)
-# we simply do some post-processing.
-case %cmsos in
- osx*)
- perl -p -i -e 's|LD_LIBRARY_PATH|DYLD_LIBRARY_PATH|g' %i/etc/scram.d/*.xml ;;
-esac
-
-%post
-if [ "X$CMS_INSTALL_PREFIX" = "X" ] ; then CMS_INSTALL_PREFIX=$RPM_INSTALL_PREFIX; export CMS_INSTALL_PREFIX; fi
-%{relocateConfig}etc/scram.d/*.xml
-echo "%{BaseTool}_TOOLFILE_ROOT='$CMS_INSTALL_PREFIX/%{pkgrel}'" > $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.sh
-echo "set %{BaseTool}_TOOLFILE_ROOT='$CMS_INSTALL_PREFIX/%{pkgrel}'" > $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.csh
diff --git a/scram-tools.file/bin/get_tools b/scram-tools.file/bin/get_tools
new file mode 100755
index 00000000000..db60c0ba22c
--- /dev/null
+++ b/scram-tools.file/bin/get_tools
@@ -0,0 +1,26 @@
+#!/bin/bash -ex
+#Usage: get_tool
+
+export TOOL_ROOT=$1
+export TOOL_VERSION=$2
+export TOOLFILES_INSTALL_DIR=$3
+export SCRAM_TOOLS_BIN_DIR=$(dirname $(realpath ${0}))
+export SCRAM_TOOL_SOURCE_DIR=$(realpath ${SCRAM_TOOLS_BIN_DIR}/../tools)/$4
+
+#exit if no tool directory found. Not all tools have scram toolfiles
+[ -d $SCRAM_TOOL_SOURCE_DIR ] || exit 0
+
+#setup tools specific env
+tool_script=${SCRAM_TOOL_SOURCE_DIR}/env.sh
+if [ -f $tool_script ]; then source $tool_script; fi
+
+#Copy all tools and replace the env placeholders @VARIABLES@
+[ -d ${TOOLFILES_INSTALL_DIR}/tools/selected ] || mkdir -p ${TOOLFILES_INSTALL_DIR}/tools/selected
+for xml in $(find $SCRAM_TOOL_SOURCE_DIR -type f -name "*.xml") ; do
+ bxml=$(basename $xml)
+ [ -f ${TOOLFILES_INSTALL_DIR}/tools/selected/$bxml ] && continue
+ [ -f ${TOOLFILES_INSTALL_DIR}/tools/available/$bxml ] && continue
+ cp $xml ${TOOLFILES_INSTALL_DIR}/tools/selected/${bxml}
+ perl -p -i -e 's|\@([^@]*)\@|$ENV{$1}|g' ${TOOLFILES_INSTALL_DIR}/tools/selected/${bxml}
+ echo " Copied $bxml"
+done
diff --git a/scram-tools.file/bin/get_vectorized_tools b/scram-tools.file/bin/get_vectorized_tools
new file mode 100755
index 00000000000..f2d769cd2ff
--- /dev/null
+++ b/scram-tools.file/bin/get_vectorized_tools
@@ -0,0 +1,22 @@
+#!/bin/bash -ex
+#Usage: get_tool
+
+export TOOL_ROOT=$1
+export TOOL_VERSION=$2
+export TOOLFILES_INSTALL_DIR=$3
+export SCRAM_TOOLS_BIN_DIR=$(dirname $(realpath ${0}))
+export SCRAM_TOOL_SOURCE_DIR=$(realpath ${SCRAM_TOOLS_BIN_DIR}/../tools)/$4
+export TOOL_VECTORIZATION=$5
+
+#exit if no tool directory found. Not all tools have scram toolfiles
+[ -d $SCRAM_TOOL_SOURCE_DIR ] || exit 0
+
+xml="$SCRAM_TOOL_SOURCE_DIR/vectorized.tmpl"
+if [ -f $xml ] ; then
+ bxml="${4}_${5}.xml"
+ [ -f ${TOOLFILES_INSTALL_DIR}/tools/selected/$bxml ] && continue
+ [ -f ${TOOLFILES_INSTALL_DIR}/tools/available/$bxml ] && continue
+ cp ${xml} ${TOOLFILES_INSTALL_DIR}/tools/selected/${bxml}
+ export TOOL_VECTORIZATION_KEY=$(echo $5 | tr '[a-z-]' '[A-Z_]')
+ perl -p -i -e 's|\@([^@]*)\@|$ENV{$1}|g' ${TOOLFILES_INSTALL_DIR}/tools/selected/${bxml}
+fi
diff --git a/scram-tools.file/bin/os_libdir.sh b/scram-tools.file/bin/os_libdir.sh
new file mode 100644
index 00000000000..7c8a692a9d1
--- /dev/null
+++ b/scram-tools.file/bin/os_libdir.sh
@@ -0,0 +1,6 @@
+if [ $(uname -s) = "Darwin" ] ; then
+ export OS_RUNTIME_LDPATH_NAME="DYLD_LIBRARY_PATH"
+else
+ export OS_RUNTIME_LDPATH_NAME="LD_LIBRARY_PATH"
+fi
+
diff --git a/scram-tools.file/bin/python_env.sh b/scram-tools.file/bin/python_env.sh
new file mode 100644
index 00000000000..d8949c1a2a4
--- /dev/null
+++ b/scram-tools.file/bin/python_env.sh
@@ -0,0 +1,2 @@
+export PYTHON3V=$(python3 -V 2>&1 | awk '{print $2}' | cut -f1,2 -d.)
+export PYTHONV=$(python -V 2>&1 | awk '{print $2}' | cut -f1,2 -d.)
diff --git a/CSCTrackFinderEmulation-toolfile.spec b/scram-tools.file/tools/CSCTrackFinderEmulation/csctrackfinderemulation.xml
similarity index 70%
rename from CSCTrackFinderEmulation-toolfile.spec
rename to scram-tools.file/tools/CSCTrackFinderEmulation/csctrackfinderemulation.xml
index 095fea719ea..00c4fb1f4bf 100644
--- a/CSCTrackFinderEmulation-toolfile.spec
+++ b/scram-tools.file/tools/CSCTrackFinderEmulation/csctrackfinderemulation.xml
@@ -1,13 +1,3 @@
-### RPM cms CSCTrackFinderEmulation-toolfile 2.0
-Requires: CSCTrackFinderEmulation
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/CSCTrackFinderEmulation.xml
@@ -18,6 +8,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/CSCTrackFinderEmulation.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/OpenBLAS/openblas.xml b/scram-tools.file/tools/OpenBLAS/openblas.xml
new file mode 100644
index 00000000000..72404a63d05
--- /dev/null
+++ b/scram-tools.file/tools/OpenBLAS/openblas.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/OpenBLAS/vectorized.tmpl b/scram-tools.file/tools/OpenBLAS/vectorized.tmpl
new file mode 100644
index 00000000000..71fffa41bb4
--- /dev/null
+++ b/scram-tools.file/tools/OpenBLAS/vectorized.tmpl
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/alpaka/alpaka-cuda.xml b/scram-tools.file/tools/alpaka/alpaka-cuda.xml
new file mode 100644
index 00000000000..27e7a0082ad
--- /dev/null
+++ b/scram-tools.file/tools/alpaka/alpaka-cuda.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/alpaka/alpaka-serial.xml b/scram-tools.file/tools/alpaka/alpaka-serial.xml
new file mode 100644
index 00000000000..f20f97eea5d
--- /dev/null
+++ b/scram-tools.file/tools/alpaka/alpaka-serial.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/scram-tools.file/tools/alpaka/alpaka-tbb.xml b/scram-tools.file/tools/alpaka/alpaka-tbb.xml
new file mode 100644
index 00000000000..e3f317a1175
--- /dev/null
+++ b/scram-tools.file/tools/alpaka/alpaka-tbb.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/alpaka/alpaka.xml b/scram-tools.file/tools/alpaka/alpaka.xml
new file mode 100644
index 00000000000..bbed8d7e9f5
--- /dev/null
+++ b/scram-tools.file/tools/alpaka/alpaka.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/alpgen-toolfile.spec b/scram-tools.file/tools/alpgen/alpgen.xml
similarity index 50%
rename from alpgen-toolfile.spec
rename to scram-tools.file/tools/alpgen/alpgen.xml
index 8e42a888e1d..a5797aea86b 100644
--- a/alpgen-toolfile.spec
+++ b/scram-tools.file/tools/alpgen/alpgen.xml
@@ -1,19 +1,6 @@
-### RPM external alpgen-toolfile 1.0
-Requires: alpgen
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/alpgen.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/blackhat-toolfile.spec b/scram-tools.file/tools/blackhat/blackhat.xml
similarity index 77%
rename from blackhat-toolfile.spec
rename to scram-tools.file/tools/blackhat/blackhat.xml
index 36b912b68f8..e952822f600 100644
--- a/blackhat-toolfile.spec
+++ b/scram-tools.file/tools/blackhat/blackhat.xml
@@ -1,13 +1,3 @@
-### RPM external blackhat-toolfile 1.0
-Requires: blackhat
-
-%prep
-
-%build
-
-%install
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/blackhat.xml
@@ -32,6 +22,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/blackhat.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/boost/boost.xml b/scram-tools.file/tools/boost/boost.xml
new file mode 100644
index 00000000000..f28750b643a
--- /dev/null
+++ b/scram-tools.file/tools/boost/boost.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/boost/boost_chrono.xml b/scram-tools.file/tools/boost/boost_chrono.xml
new file mode 100644
index 00000000000..b2c8fff3a5a
--- /dev/null
+++ b/scram-tools.file/tools/boost/boost_chrono.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/boost/boost_filesystem.xml b/scram-tools.file/tools/boost/boost_filesystem.xml
new file mode 100644
index 00000000000..b80d2a2ffc5
--- /dev/null
+++ b/scram-tools.file/tools/boost/boost_filesystem.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/boost/boost_header.xml b/scram-tools.file/tools/boost/boost_header.xml
new file mode 100644
index 00000000000..bbe47323ed6
--- /dev/null
+++ b/scram-tools.file/tools/boost/boost_header.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/boost/boost_iostreams.xml b/scram-tools.file/tools/boost/boost_iostreams.xml
new file mode 100644
index 00000000000..650825d746f
--- /dev/null
+++ b/scram-tools.file/tools/boost/boost_iostreams.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/boost/boost_mpi.xml b/scram-tools.file/tools/boost/boost_mpi.xml
new file mode 100644
index 00000000000..79225a6a434
--- /dev/null
+++ b/scram-tools.file/tools/boost/boost_mpi.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/boost/boost_program_options.xml b/scram-tools.file/tools/boost/boost_program_options.xml
new file mode 100644
index 00000000000..2c5e09a115b
--- /dev/null
+++ b/scram-tools.file/tools/boost/boost_program_options.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/boost/boost_python.xml b/scram-tools.file/tools/boost/boost_python.xml
new file mode 100644
index 00000000000..8818831b899
--- /dev/null
+++ b/scram-tools.file/tools/boost/boost_python.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/boost/boost_regex.xml b/scram-tools.file/tools/boost/boost_regex.xml
new file mode 100644
index 00000000000..deec97328d8
--- /dev/null
+++ b/scram-tools.file/tools/boost/boost_regex.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/boost/boost_serialization.xml b/scram-tools.file/tools/boost/boost_serialization.xml
new file mode 100644
index 00000000000..9bd65707606
--- /dev/null
+++ b/scram-tools.file/tools/boost/boost_serialization.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/boost/boost_system.xml b/scram-tools.file/tools/boost/boost_system.xml
new file mode 100644
index 00000000000..4d77e8381d6
--- /dev/null
+++ b/scram-tools.file/tools/boost/boost_system.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/boost/boost_test.xml b/scram-tools.file/tools/boost/boost_test.xml
new file mode 100644
index 00000000000..537b32d0ff6
--- /dev/null
+++ b/scram-tools.file/tools/boost/boost_test.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/boost/env.sh b/scram-tools.file/tools/boost/env.sh
new file mode 100644
index 00000000000..93eab7c72bd
--- /dev/null
+++ b/scram-tools.file/tools/boost/env.sh
@@ -0,0 +1,21 @@
+so=so
+[ "$(uname -s)" = "Darwin" ] && so=dylib
+getLibName()
+{
+ libname=`find ${TOOL_ROOT}/lib -name "libboost_$1.$so" -follow -exec basename {} \;`
+ echo $libname | sed -e 's|[.][^-]*$||;s|^lib||'
+}
+PYLIB=`ls ${TOOL_ROOT}/lib | grep boost_python | head -1`;PYLIB=${PYLIB%\.${so}};PYLIB=${PYLIB#lib}
+
+export BOOST_THREAD_LIB=`getLibName thread`
+export BOOST_CHRONO_LIB=`getLibName chrono`
+export BOOST_FILESYSTEM_LIB=`getLibName filesystem`
+export BOOST_DATE_TIME_LIB=`getLibName date_time`
+export BOOST_SYSTEM_LIB=`getLibName system`
+export BOOST_PROGRAM_OPTIONS_LIB=`getLibName program_options`
+export BOOST_PYTHON_LIB=$PYLIB
+export BOOST_REGEX_LIB=`getLibName regex`
+export BOOST_SERIALIZATION_LIB=`getLibName serialization`
+export BOOST_IOSTREAMS_LIB=`getLibName iostreams`
+export BOOST_MPI_LIB=`getLibName mpi`
+
diff --git a/bz2lib-toolfile.spec b/scram-tools.file/tools/bz2lib/bz2lib.xml
similarity index 69%
rename from bz2lib-toolfile.spec
rename to scram-tools.file/tools/bz2lib/bz2lib.xml
index 3e4bf47ca49..c06b1eefebb 100644
--- a/bz2lib-toolfile.spec
+++ b/scram-tools.file/tools/bz2lib/bz2lib.xml
@@ -1,13 +1,3 @@
-### RPM external bz2lib-toolfile 1.0
-Requires: bz2lib
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/bz2lib.xml
@@ -19,6 +9,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/bz2lib.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/cascade/cascade.xml b/scram-tools.file/tools/cascade/cascade.xml
new file mode 100644
index 00000000000..99cacc8e42c
--- /dev/null
+++ b/scram-tools.file/tools/cascade/cascade.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/cascade/cascade_headers.xml b/scram-tools.file/tools/cascade/cascade_headers.xml
new file mode 100644
index 00000000000..1a8a2c44133
--- /dev/null
+++ b/scram-tools.file/tools/cascade/cascade_headers.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/catch2-toolfile.spec b/scram-tools.file/tools/catch2/catch2.xml
similarity index 51%
rename from catch2-toolfile.spec
rename to scram-tools.file/tools/catch2/catch2.xml
index 9ac89ae66c7..becd3072d9d 100644
--- a/catch2-toolfile.spec
+++ b/scram-tools.file/tools/catch2/catch2.xml
@@ -1,19 +1,6 @@
-### RPM external catch2-toolfile 1.0
-Requires: catch2
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/catch2.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/ccache/ccache-ccompiler.xml b/scram-tools.file/tools/ccache/ccache-ccompiler.xml
new file mode 100644
index 00000000000..b75a748b888
--- /dev/null
+++ b/scram-tools.file/tools/ccache/ccache-ccompiler.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/ccache/ccache-cxxcompiler.xml b/scram-tools.file/tools/ccache/ccache-cxxcompiler.xml
new file mode 100644
index 00000000000..aa1664cdb51
--- /dev/null
+++ b/scram-tools.file/tools/ccache/ccache-cxxcompiler.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/ccache/ccache-f77compiler.xml b/scram-tools.file/tools/ccache/ccache-f77compiler.xml
new file mode 100644
index 00000000000..8267d0dbebd
--- /dev/null
+++ b/scram-tools.file/tools/ccache/ccache-f77compiler.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/cgal-toolfile.spec b/scram-tools.file/tools/cgal/cgal.xml
similarity index 51%
rename from cgal-toolfile.spec
rename to scram-tools.file/tools/cgal/cgal.xml
index adfe4b66ec0..46f3f35317e 100644
--- a/cgal-toolfile.spec
+++ b/scram-tools.file/tools/cgal/cgal.xml
@@ -1,15 +1,3 @@
-### RPM external cgal-toolfile 1.0
-Requires: cgal
-%prep
-
-%build
-
-%install
-
-mkdir -p %{i}/etc/scram.d
-
-# CGAL Core
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/cgal.xml
@@ -26,17 +14,3 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/cgal.xml
-EOF_TOOLFILE
-
-# CGAL ImageIO (brings libSM from X11)
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/cgalimageio.xml
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/cgal/cgalimageio.xml b/scram-tools.file/tools/cgal/cgalimageio.xml
new file mode 100644
index 00000000000..1d052b891d1
--- /dev/null
+++ b/scram-tools.file/tools/cgal/cgalimageio.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/charybdis-toolfile.spec b/scram-tools.file/tools/charybdis/charybdis.xml
similarity index 73%
rename from charybdis-toolfile.spec
rename to scram-tools.file/tools/charybdis/charybdis.xml
index c28b68360f1..8a2b2182754 100644
--- a/charybdis-toolfile.spec
+++ b/scram-tools.file/tools/charybdis/charybdis.xml
@@ -1,13 +1,3 @@
-### RPM external charybdis-toolfile 1.0
-Requires: charybdis
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/charybdis.xml
@@ -22,7 +12,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/charybdis.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
-
diff --git a/classlib-toolfile.spec b/scram-tools.file/tools/classlib/classlib.xml
similarity index 75%
rename from classlib-toolfile.spec
rename to scram-tools.file/tools/classlib/classlib.xml
index 07a1a23e129..0b6e59a748e 100644
--- a/classlib-toolfile.spec
+++ b/scram-tools.file/tools/classlib/classlib.xml
@@ -1,11 +1,3 @@
-### RPM external classlib-toolfile 2.0
-Requires: classlib
-
-%prep
-%build
-%install
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE > %i/etc/scram.d/classlib.xml
@@ -20,6 +12,3 @@ cat << \EOF_TOOLFILE > %i/etc/scram.d/classlib.xml
-EOF_TOOLFILE
-## IMPORT scram-tools-post
-
diff --git a/scram-tools.file/tools/clhep/clhep.xml b/scram-tools.file/tools/clhep/clhep.xml
new file mode 100644
index 00000000000..ecb119a4fd2
--- /dev/null
+++ b/scram-tools.file/tools/clhep/clhep.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/clhep-toolfile.spec b/scram-tools.file/tools/clhep/clhepheader.xml
similarity index 53%
rename from clhep-toolfile.spec
rename to scram-tools.file/tools/clhep/clhepheader.xml
index e65161631ab..f15a8d211f0 100644
--- a/clhep-toolfile.spec
+++ b/scram-tools.file/tools/clhep/clhepheader.xml
@@ -1,25 +1,3 @@
-### RPM external clhep-toolfile 2.0
-Requires: clhep
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/clhep.xml
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/clhepheader.xml
@@ -33,6 +11,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/clhepheader.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/cmssw-toolfile.spec b/scram-tools.file/tools/cmssw/cmssw.xml
similarity index 75%
rename from cmssw-toolfile.spec
rename to scram-tools.file/tools/cmssw/cmssw.xml
index 97590a5af33..a9763596695 100644
--- a/cmssw-toolfile.spec
+++ b/scram-tools.file/tools/cmssw/cmssw.xml
@@ -1,13 +1,3 @@
-### RPM cms cmssw-toolfile 3.0
-Requires: cmssw
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/cmssw.xml
@@ -25,13 +15,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/cmssw.xml
-EOF_TOOLFILE
-
-export OS_RUNTIME_LDPATH_NAME="LD_LIBRARY_PATH"
-case %cmsplatf in
- osx* )
- export OS_RUNTIME_LDPATH_NAME="DYLD_FALLBACK_LIBRARY_PATH"
- ;;
-esac
-
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/cmssw/env.sh b/scram-tools.file/tools/cmssw/env.sh
new file mode 100644
index 00000000000..8b34c4656f1
--- /dev/null
+++ b/scram-tools.file/tools/cmssw/env.sh
@@ -0,0 +1 @@
+source ${SCRAM_TOOLS_BIN_DIR}/os_libdir.sh
diff --git a/scram-tools.file/tools/cmsswdata/env.sh b/scram-tools.file/tools/cmsswdata/env.sh
new file mode 100644
index 00000000000..10bf4788084
--- /dev/null
+++ b/scram-tools.file/tools/cmsswdata/env.sh
@@ -0,0 +1 @@
+cp $TOOL_ROOT/etc/scram.d/cmsswdata.xml ${TOOLFILES_INSTALL_DIR}/tools/selected
diff --git a/coral-toolfile.spec b/scram-tools.file/tools/coral/coral.xml
similarity index 74%
rename from coral-toolfile.spec
rename to scram-tools.file/tools/coral/coral.xml
index cc68b60b533..4bd5f88edc3 100644
--- a/coral-toolfile.spec
+++ b/scram-tools.file/tools/coral/coral.xml
@@ -1,13 +1,3 @@
-### RPM external coral-toolfile 2.0
-Requires: coral
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/coral.xml
@@ -19,6 +9,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/coral.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/cppunit-toolfile.spec b/scram-tools.file/tools/cppunit/cppunit.xml
similarity index 67%
rename from cppunit-toolfile.spec
rename to scram-tools.file/tools/cppunit/cppunit.xml
index 65e272bbbfa..29952423172 100644
--- a/cppunit-toolfile.spec
+++ b/scram-tools.file/tools/cppunit/cppunit.xml
@@ -1,13 +1,3 @@
-### RPM external cppunit-toolfile 1.0
-Requires: cppunit
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/cppunit.xml
@@ -19,6 +9,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/cppunit.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/cuda/cuda-cublas.xml b/scram-tools.file/tools/cuda/cuda-cublas.xml
new file mode 100644
index 00000000000..29a40e6aa3e
--- /dev/null
+++ b/scram-tools.file/tools/cuda/cuda-cublas.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/cuda/cuda-cufft.xml b/scram-tools.file/tools/cuda/cuda-cufft.xml
new file mode 100644
index 00000000000..d7a6283502b
--- /dev/null
+++ b/scram-tools.file/tools/cuda/cuda-cufft.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/cuda/cuda-curand.xml b/scram-tools.file/tools/cuda/cuda-curand.xml
new file mode 100644
index 00000000000..75f7da136cc
--- /dev/null
+++ b/scram-tools.file/tools/cuda/cuda-curand.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/cuda/cuda-cusolver.xml b/scram-tools.file/tools/cuda/cuda-cusolver.xml
new file mode 100644
index 00000000000..19c925db950
--- /dev/null
+++ b/scram-tools.file/tools/cuda/cuda-cusolver.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/cuda/cuda-cusparse.xml b/scram-tools.file/tools/cuda/cuda-cusparse.xml
new file mode 100644
index 00000000000..75ba329e182
--- /dev/null
+++ b/scram-tools.file/tools/cuda/cuda-cusparse.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/cuda/cuda-gcc-support.xml b/scram-tools.file/tools/cuda/cuda-gcc-support.xml
new file mode 100644
index 00000000000..e20ae4d1ff2
--- /dev/null
+++ b/scram-tools.file/tools/cuda/cuda-gcc-support.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/scram-tools.file/tools/cuda/cuda-npp.xml b/scram-tools.file/tools/cuda/cuda-npp.xml
new file mode 100644
index 00000000000..48931428b0f
--- /dev/null
+++ b/scram-tools.file/tools/cuda/cuda-npp.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/cuda/cuda-nvgraph.xml b/scram-tools.file/tools/cuda/cuda-nvgraph.xml
new file mode 100644
index 00000000000..e7fc6e3628a
--- /dev/null
+++ b/scram-tools.file/tools/cuda/cuda-nvgraph.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/cuda/cuda-nvjpeg.xml b/scram-tools.file/tools/cuda/cuda-nvjpeg.xml
new file mode 100644
index 00000000000..2cc33064bb2
--- /dev/null
+++ b/scram-tools.file/tools/cuda/cuda-nvjpeg.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/cuda/cuda-nvml.xml b/scram-tools.file/tools/cuda/cuda-nvml.xml
new file mode 100644
index 00000000000..08be40a7f7d
--- /dev/null
+++ b/scram-tools.file/tools/cuda/cuda-nvml.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/cuda/cuda-nvrtc.xml b/scram-tools.file/tools/cuda/cuda-nvrtc.xml
new file mode 100644
index 00000000000..70f6ad2d980
--- /dev/null
+++ b/scram-tools.file/tools/cuda/cuda-nvrtc.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/cuda/cuda-stubs.xml b/scram-tools.file/tools/cuda/cuda-stubs.xml
new file mode 100644
index 00000000000..68679ee396e
--- /dev/null
+++ b/scram-tools.file/tools/cuda/cuda-stubs.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/cuda/cuda.xml b/scram-tools.file/tools/cuda/cuda.xml
new file mode 100644
index 00000000000..4d8d86716b1
--- /dev/null
+++ b/scram-tools.file/tools/cuda/cuda.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/cuda/cupti.xml b/scram-tools.file/tools/cuda/cupti.xml
new file mode 100644
index 00000000000..4ccc7a3b882
--- /dev/null
+++ b/scram-tools.file/tools/cuda/cupti.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/cuda/nvidia-drivers.xml b/scram-tools.file/tools/cuda/nvidia-drivers.xml
new file mode 100644
index 00000000000..0899ffa9358
--- /dev/null
+++ b/scram-tools.file/tools/cuda/nvidia-drivers.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/cuda/nvperf.xml b/scram-tools.file/tools/cuda/nvperf.xml
new file mode 100644
index 00000000000..3b2f0b5b658
--- /dev/null
+++ b/scram-tools.file/tools/cuda/nvperf.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/cudnn-toolfile.spec b/scram-tools.file/tools/cudnn/cudnn.xml
similarity index 66%
rename from cudnn-toolfile.spec
rename to scram-tools.file/tools/cudnn/cudnn.xml
index 2aed88d3eb4..c4254f77deb 100644
--- a/cudnn-toolfile.spec
+++ b/scram-tools.file/tools/cudnn/cudnn.xml
@@ -1,12 +1,3 @@
-### RPM external cudnn-toolfile 1.0
-Requires: cudnn
-%prep
-
-%build
-
-%install
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/cudnn.xml
@@ -17,6 +8,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/cudnn.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/cupla/cupla-cuda.xml b/scram-tools.file/tools/cupla/cupla-cuda.xml
new file mode 100644
index 00000000000..e07b5c5ccd6
--- /dev/null
+++ b/scram-tools.file/tools/cupla/cupla-cuda.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/cupla/cupla-serial.xml b/scram-tools.file/tools/cupla/cupla-serial.xml
new file mode 100644
index 00000000000..d3540302b20
--- /dev/null
+++ b/scram-tools.file/tools/cupla/cupla-serial.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/cupla/cupla-tbb.xml b/scram-tools.file/tools/cupla/cupla-tbb.xml
new file mode 100644
index 00000000000..8a18e8392c2
--- /dev/null
+++ b/scram-tools.file/tools/cupla/cupla-tbb.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/cupla/cupla.xml b/scram-tools.file/tools/cupla/cupla.xml
new file mode 100644
index 00000000000..9c996b069a9
--- /dev/null
+++ b/scram-tools.file/tools/cupla/cupla.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/curl-toolfile.spec b/scram-tools.file/tools/curl/curl.xml
similarity index 70%
rename from curl-toolfile.spec
rename to scram-tools.file/tools/curl/curl.xml
index 586cda5e043..f192e22e93a 100644
--- a/curl-toolfile.spec
+++ b/scram-tools.file/tools/curl/curl.xml
@@ -1,13 +1,3 @@
-### RPM external curl-toolfile 1.0
-Requires: curl
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/curl.xml
@@ -19,6 +9,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/curl.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/dablooms-toolfile.spec b/scram-tools.file/tools/dablooms/dablooms.xml
similarity index 59%
rename from dablooms-toolfile.spec
rename to scram-tools.file/tools/dablooms/dablooms.xml
index 411c21b374a..a0b8a879c97 100644
--- a/dablooms-toolfile.spec
+++ b/scram-tools.file/tools/dablooms/dablooms.xml
@@ -1,14 +1,3 @@
-### RPM external dablooms-toolfile 1.0
-Requires: dablooms
-
-%prep
-
-%build
-
-%install
-
-mkdir -p %{i}/etc/scram.d
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/dablooms.xml
@@ -17,6 +6,3 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/dablooms.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/das_client-toolfile.spec b/scram-tools.file/tools/das_client/das_client.xml
similarity index 54%
rename from das_client-toolfile.spec
rename to scram-tools.file/tools/das_client/das_client.xml
index 4f26ed1390c..afb44dfe7ae 100644
--- a/das_client-toolfile.spec
+++ b/scram-tools.file/tools/das_client/das_client.xml
@@ -1,11 +1,3 @@
-### RPM cms das_client-toolfile 1.0
-Requires: das_client
-%prep
-%build
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/das_client.xml
@@ -13,6 +5,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/das_client.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/davix-toolfile.spec b/scram-tools.file/tools/davix/davix.xml
similarity index 72%
rename from davix-toolfile.spec
rename to scram-tools.file/tools/davix/davix.xml
index fe5deb93f78..7d819019411 100644
--- a/davix-toolfile.spec
+++ b/scram-tools.file/tools/davix/davix.xml
@@ -1,11 +1,3 @@
-### RPM external davix-toolfile 1.1
-Requires: davix
-
-%prep
-%build
-%install
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE > %i/etc/scram.d/davix.xml
@@ -18,5 +10,3 @@ cat << \EOF_TOOLFILE > %i/etc/scram.d/davix.xml
-EOF_TOOLFILE
-## IMPORT scram-tools-post
diff --git a/db6-toolfile.spec b/scram-tools.file/tools/db6/db6.xml
similarity index 66%
rename from db6-toolfile.spec
rename to scram-tools.file/tools/db6/db6.xml
index 4414fd8277a..39664b1c525 100644
--- a/db6-toolfile.spec
+++ b/scram-tools.file/tools/db6/db6.xml
@@ -1,13 +1,3 @@
-### RPM external db6-toolfile 1.0
-Requires: db6
-%prep
-
-%build
-
-%install
-
-mkdir -p %{i}/etc/scram.d
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/db6.xml
@@ -18,6 +8,3 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/db6.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/dcap-toolfile.spec b/scram-tools.file/tools/dcap/dcap.xml
similarity index 66%
rename from dcap-toolfile.spec
rename to scram-tools.file/tools/dcap/dcap.xml
index eff3da7af8d..b5471953273 100644
--- a/dcap-toolfile.spec
+++ b/scram-tools.file/tools/dcap/dcap.xml
@@ -1,13 +1,3 @@
-### RPM external dcap-toolfile 1.0
-Requires: dcap
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/dcap.xml
@@ -18,6 +8,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/dcap.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/dd4hep-toolfile.spec b/scram-tools.file/tools/dd4hep/dd4hep-core.xml
similarity index 55%
rename from dd4hep-toolfile.spec
rename to scram-tools.file/tools/dd4hep/dd4hep-core.xml
index f31575578c6..8cd521b1f37 100644
--- a/dd4hep-toolfile.spec
+++ b/scram-tools.file/tools/dd4hep/dd4hep-core.xml
@@ -1,15 +1,3 @@
-### RPM external dd4hep-toolfile 1.0
-
-Requires: dd4hep
-
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/dd4hep-core.xml
@@ -29,22 +17,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/dd4hep-core.xml
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/dd4hep.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/dd4hep-geant4.xml
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/dd4hep/dd4hep-geant4.xml b/scram-tools.file/tools/dd4hep/dd4hep-geant4.xml
new file mode 100644
index 00000000000..bfded4bb034
--- /dev/null
+++ b/scram-tools.file/tools/dd4hep/dd4hep-geant4.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/dd4hep/dd4hep.xml b/scram-tools.file/tools/dd4hep/dd4hep.xml
new file mode 100644
index 00000000000..cee8c92549e
--- /dev/null
+++ b/scram-tools.file/tools/dd4hep/dd4hep.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/dip/dip-platform-dependent.xml b/scram-tools.file/tools/dip/dip-platform-dependent.xml
new file mode 100644
index 00000000000..2f18a1c26c5
--- /dev/null
+++ b/scram-tools.file/tools/dip/dip-platform-dependent.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/scram-tools.file/tools/dip/dip.xml b/scram-tools.file/tools/dip/dip.xml
new file mode 100644
index 00000000000..ee4d7b8302d
--- /dev/null
+++ b/scram-tools.file/tools/dip/dip.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/dip/dip_interface.xml b/scram-tools.file/tools/dip/dip_interface.xml
new file mode 100644
index 00000000000..911ffebea7f
--- /dev/null
+++ b/scram-tools.file/tools/dip/dip_interface.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/dip/log4cplus.xml b/scram-tools.file/tools/dip/log4cplus.xml
new file mode 100644
index 00000000000..034d07550e3
--- /dev/null
+++ b/scram-tools.file/tools/dip/log4cplus.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/dmtcp-toolfile.spec b/scram-tools.file/tools/dmtcp/dmtcp.xml
similarity index 65%
rename from dmtcp-toolfile.spec
rename to scram-tools.file/tools/dmtcp/dmtcp.xml
index 8b771e9783e..eaf7f4a92ce 100644
--- a/dmtcp-toolfile.spec
+++ b/scram-tools.file/tools/dmtcp/dmtcp.xml
@@ -1,13 +1,3 @@
-### RPM external dmtcp-toolfile 1.0
-Requires: dmtcp
-%prep
-
-%build
-
-%install
-
-mkdir -p %{i}/etc/scram.d
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/dmtcp.xml
@@ -17,6 +7,3 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/dmtcp.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/doxygen-toolfile.spec b/scram-tools.file/tools/doxygen/doxygen.xml
similarity index 57%
rename from doxygen-toolfile.spec
rename to scram-tools.file/tools/doxygen/doxygen.xml
index d824fcbf1dd..2d0bb187994 100644
--- a/doxygen-toolfile.spec
+++ b/scram-tools.file/tools/doxygen/doxygen.xml
@@ -1,11 +1,3 @@
-### RPM external doxygen-toolfile 1.0
-Requires: doxygen
-
-%prep
-%build
-%install
-mkdir -p %{i}/etc/scram.d
-cat << \EOF_TOOLFILE > %{i}/etc/scram.d/doxygen.xml
@@ -13,5 +5,3 @@ cat << \EOF_TOOLFILE > %{i}/etc/scram.d/doxygen.xml
-EOF_TOOLFILE
-## IMPORT scram-tools-post
diff --git a/eigen-toolfile.spec b/scram-tools.file/tools/eigen/eigen.xml
similarity index 66%
rename from eigen-toolfile.spec
rename to scram-tools.file/tools/eigen/eigen.xml
index d1860d9b296..d36da21f5e2 100644
--- a/eigen-toolfile.spec
+++ b/scram-tools.file/tools/eigen/eigen.xml
@@ -1,13 +1,3 @@
-### RPM external eigen-toolfile 2.0
-Requires: eigen
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/eigen.xml
@@ -17,6 +7,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/eigen.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/evtgen-toolfile.spec b/scram-tools.file/tools/evtgen/evtgen.xml
similarity index 70%
rename from evtgen-toolfile.spec
rename to scram-tools.file/tools/evtgen/evtgen.xml
index dbee210d705..53d4d5dd761 100644
--- a/evtgen-toolfile.spec
+++ b/scram-tools.file/tools/evtgen/evtgen.xml
@@ -1,14 +1,3 @@
-### RPM external evtgen-toolfile 1.0
-Requires: evtgen
-
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/evtgen.xml
@@ -23,6 +12,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/evtgen.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/expat-toolfile.spec b/scram-tools.file/tools/expat/expat.xml
similarity index 72%
rename from expat-toolfile.spec
rename to scram-tools.file/tools/expat/expat.xml
index c03b0a5afc4..dbd7fb098fb 100644
--- a/expat-toolfile.spec
+++ b/scram-tools.file/tools/expat/expat.xml
@@ -1,13 +1,3 @@
-### RPM external expat-toolfile 1.0
-Requires: expat
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/expat.xml
@@ -20,6 +10,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/expat.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/fastjet-contrib/fastjet-contrib-archive.xml b/scram-tools.file/tools/fastjet-contrib/fastjet-contrib-archive.xml
new file mode 100644
index 00000000000..757078d780c
--- /dev/null
+++ b/scram-tools.file/tools/fastjet-contrib/fastjet-contrib-archive.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/fastjet-contrib/fastjet-contrib.xml b/scram-tools.file/tools/fastjet-contrib/fastjet-contrib.xml
new file mode 100644
index 00000000000..5aedaf372ee
--- /dev/null
+++ b/scram-tools.file/tools/fastjet-contrib/fastjet-contrib.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/fastjet/fastjet.xml b/scram-tools.file/tools/fastjet/fastjet.xml
new file mode 100644
index 00000000000..1d563bf4f91
--- /dev/null
+++ b/scram-tools.file/tools/fastjet/fastjet.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/fastjet/vectorized.tmpl b/scram-tools.file/tools/fastjet/vectorized.tmpl
new file mode 100644
index 00000000000..0b57fc2d691
--- /dev/null
+++ b/scram-tools.file/tools/fastjet/vectorized.tmpl
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/fftjet-toolfile.spec b/scram-tools.file/tools/fftjet/fftjet.xml
similarity index 66%
rename from fftjet-toolfile.spec
rename to scram-tools.file/tools/fftjet/fftjet.xml
index ff7c92a7579..8e50eccc3c5 100644
--- a/fftjet-toolfile.spec
+++ b/scram-tools.file/tools/fftjet/fftjet.xml
@@ -1,13 +1,3 @@
-### RPM external fftjet-toolfile 1.0
-Requires: fftjet
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/fftjet.xml
@@ -18,7 +8,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/fftjet.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
-
diff --git a/fftw3-toolfile.spec b/scram-tools.file/tools/fftw3/fftw3.xml
similarity index 66%
rename from fftw3-toolfile.spec
rename to scram-tools.file/tools/fftw3/fftw3.xml
index 53c4ce6ff23..2636b97631a 100644
--- a/fftw3-toolfile.spec
+++ b/scram-tools.file/tools/fftw3/fftw3.xml
@@ -1,13 +1,3 @@
-### RPM external fftw3-toolfile 1.0
-Requires: fftw3
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/fftw3.xml
@@ -18,6 +8,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/fftw3.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/flatbuffers-toolfile.spec b/scram-tools.file/tools/flatbuffers/flatbuffers.xml
similarity index 65%
rename from flatbuffers-toolfile.spec
rename to scram-tools.file/tools/flatbuffers/flatbuffers.xml
index caf563f3d0f..fdc35e00024 100644
--- a/flatbuffers-toolfile.spec
+++ b/scram-tools.file/tools/flatbuffers/flatbuffers.xml
@@ -1,13 +1,3 @@
-### RPM external flatbuffers-toolfile 1.0
-Requires: flatbuffers
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/flatbuffers.xml
@@ -17,6 +7,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/flatbuffers.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/fmt-toolfile.spec b/scram-tools.file/tools/fmt/fmt.xml
similarity index 67%
rename from fmt-toolfile.spec
rename to scram-tools.file/tools/fmt/fmt.xml
index c7a58e79dda..65b2a9a5f03 100644
--- a/fmt-toolfile.spec
+++ b/scram-tools.file/tools/fmt/fmt.xml
@@ -1,13 +1,3 @@
-### RPM external fmt-toolfile 1.0
-Requires: fmt
-%prep
-
-%build
-
-%install
-
-mkdir -p %{i}/etc/scram.d
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/fmt.xml
@@ -18,6 +8,3 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/fmt.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/freetype-toolfile.spec b/scram-tools.file/tools/freetype/freetype.xml
similarity index 67%
rename from freetype-toolfile.spec
rename to scram-tools.file/tools/freetype/freetype.xml
index 12db867d89f..a14f68daa47 100644
--- a/freetype-toolfile.spec
+++ b/scram-tools.file/tools/freetype/freetype.xml
@@ -1,13 +1,3 @@
-### RPM external freetype-toolfile 1.0
-Requires: freetype
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/freetype.xml
@@ -18,6 +8,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/freetype.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/frontier_client-toolfile.spec b/scram-tools.file/tools/frontier_client/frontier_client.xml
similarity index 71%
rename from frontier_client-toolfile.spec
rename to scram-tools.file/tools/frontier_client/frontier_client.xml
index dc8175159c0..073a751cd6b 100644
--- a/frontier_client-toolfile.spec
+++ b/scram-tools.file/tools/frontier_client/frontier_client.xml
@@ -1,13 +1,3 @@
-### RPM external frontier_client-toolfile 1.0
-Requires: frontier_client
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/frontier_client.xml
@@ -22,6 +12,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/frontier_client.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/gbl-toolfile.spec b/scram-tools.file/tools/gbl/gbl.xml
similarity index 66%
rename from gbl-toolfile.spec
rename to scram-tools.file/tools/gbl/gbl.xml
index 5f3f70e6dc2..b18db39496c 100644
--- a/gbl-toolfile.spec
+++ b/scram-tools.file/tools/gbl/gbl.xml
@@ -1,13 +1,3 @@
-### RPM external gbl-toolfile 1.0
-Requires: gbl
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/gbl.xml
@@ -18,7 +8,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/gbl.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
-
diff --git a/scram-tools.file/tools/gcc/env.sh b/scram-tools.file/tools/gcc/env.sh
new file mode 100644
index 00000000000..43fc40bddf7
--- /dev/null
+++ b/scram-tools.file/tools/gcc/env.sh
@@ -0,0 +1,66 @@
+#!/bin/bash -e
+
+if [ "X$GCC_ROOT" = X ]
+then
+ GCC_ROOT=$(which gcc | sed -e 's|/bin/gcc||')
+ GCC_VERSION=$(gcc -dumpversion) || exit 1
+fi
+export TOOL_ROOT=$GCC_ROOT
+export TOOL_VERSION=$GCC_VERSION
+export GCC_PLUGIN_DIR=$(gcc -print-file-name=plugin)
+SCRAM_CXX11_ABI=1
+echo '#include ' | g++ -x c++ -E -dM - | grep ' _GLIBCXX_USE_CXX11_ABI *1' || SCRAM_CXX11_ABI=0
+export SCRAM_CXX11_ABI
+
+# First of all handle OS specific options.
+OS_LIB64DIR="lib64"
+if [ $(uname -s) = "Darwin" ] ; then
+ OS_SHAREDFLAGS="-shared -dynamic -single_module -arch x86_64"
+ OS_LDFLAGS="-Wl,-commons -Wl,use_dylibs"
+ OS_CXXFLAGS="-arch x86_64"
+ OS_LIB64DIR="lib"
+ OS_LD_UNIT="-r"
+else
+ OS_SHAREDFLAGS="-shared -Wl,-E"
+ OS_LDFLAGS="-Wl,-E -Wl,--hash-style=gnu"
+ OS_CXXFLAGS="-Werror=overflow"
+ OS_FFLAGS="-cpp"
+ OS_LD_UNIT="-r -z muldefs"
+fi
+export OS_LIB64DIR
+source ${SCRAM_TOOLS_BIN_DIR}/os_libdir.sh
+
+# Then handle compiler specific options. E.g. enable
+# optimizations as they become available in gcc.
+
+GCC_CXXFLAGS=""
+GCC_CXXFLAGS="$GCC_CXXFLAGS -std=c++1z -ftree-vectorize"
+GCC_CXXFLAGS="$GCC_CXXFLAGS -Wstrict-overflow"
+GCC_CXXFLAGS="$GCC_CXXFLAGS -Werror=array-bounds -Werror=format-contains-nul -Werror=type-limits"
+GCC_CXXFLAGS="$GCC_CXXFLAGS -fvisibility-inlines-hidden"
+GCC_CXXFLAGS="$GCC_CXXFLAGS -fno-math-errno --param vect-max-version-for-alias-checks=50"
+GCC_CXXFLAGS="$GCC_CXXFLAGS -Xassembler --compress-debug-sections"
+
+case $(uname -m) in
+ aarch64 ) GCC_CXXFLAGS="$GCC_CXXFLAGS -fsigned-char -fsigned-bitfields" ;;
+ ppc64le ) GCC_CXXFLAGS="$GCC_CXXFLAGS -fsigned-char -fsigned-bitfields" ;;
+esac
+
+#C-COMPILER
+export GCC_CFLAGS="${OS_CFLAGS} ${ARCH_CFLAGS} ${GCC_CFLAGS} ${COMPILER_CFLAGS}"
+export GCC_CSHAREDOBJECTFLAGS="${OS_CSHAREDOBJECTFLAGS} ${ARCH_CSHAREDOBJECTFLAGS} ${GCC_CSHAREDOBJECTFLAGS} ${COMPILER_CSHAREDOBJECTFLAGS}"
+
+#CXX-COMPILER
+export GCC_CPPDEFINES="${OS_CPPDEFINES} ${ARCH_CPPDEFINES} ${GCC_CPPDEFINES} ${COMPILER_CPPDEFINES}"
+export GCC_CXXFLAGS="${OS_CXXFLAGS} ${ARCH_CXXFLAGS} ${GCC_CXXFLAGS} ${COMPILER_CXXFLAGS}"
+export GCC_CXXSHAREDOBJECTFLAGS="${OS_CXXSHAREDOBJECTFLAGS} ${ARCH_CXXSHAREDOBJECTFLAGS} ${GCC_CXXSHAREDOBJECTFLAGS} ${COMPILER_CXXSHAREDOBJECTFLAGS}"
+export GCC_LDFLAGS="${OS_LDFLAGS} ${ARCH_LDFLAGS} ${GCC_LDFLAGS} ${COMPILER_LDFLAGS}"
+export GCC_LD_UNIT="${OS_LD_UNIT} ${ARCH_LD_UNIT} ${GCC_LD_UNIT} ${COMPILER_LD_UNIT}"
+export GCC_SHAREDFLAGS="${OS_SHAREDFLAGS} ${ARCH_SHAREDFLAGS} ${GCC_SHAREDFLAGS} ${COMPILER_SHAREDFLAGS}"
+export COMPILER_NAME_SUFFIX
+
+#F77-COMPILER
+export GCC_FFLAGS="${OS_FFLAGS} ${ARCH_FFLAGS} ${GCC_FFLAGS} ${COMPILER_FFLAGS}"
+export GCC_FOPTIMISEDFLAGS="${OS_FOPTIMISEDFLAGS} ${ARCH_FOPTIMISEDFLAGS} ${GCC_FOPTIMISEDFLAGS} ${COMPILER_FOPTIMISEDFLAGS}"
+export GCC_FSHAREDOBJECTFLAGS="${OS_FSHAREDOBJECTFLAGS} ${ARCH_FSHAREDOBJECTFLAGS} ${GCC_FSHAREDOBJECTFLAGS} ${COMPILER_FSHAREDOBJECTFLAGS}"
+
diff --git a/scram-tools.file/tools/gcc/gcc-atomic.xml b/scram-tools.file/tools/gcc/gcc-atomic.xml
new file mode 100644
index 00000000000..de99438b8b5
--- /dev/null
+++ b/scram-tools.file/tools/gcc/gcc-atomic.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/gcc/gcc-ccompiler.xml b/scram-tools.file/tools/gcc/gcc-ccompiler.xml
new file mode 100644
index 00000000000..7f52af37a55
--- /dev/null
+++ b/scram-tools.file/tools/gcc/gcc-ccompiler.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/gcc/gcc-cxxcompiler.xml b/scram-tools.file/tools/gcc/gcc-cxxcompiler.xml
new file mode 100644
index 00000000000..d51ffbe705e
--- /dev/null
+++ b/scram-tools.file/tools/gcc/gcc-cxxcompiler.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/gcc/gcc-f77compiler.xml b/scram-tools.file/tools/gcc/gcc-f77compiler.xml
new file mode 100644
index 00000000000..5852618e76a
--- /dev/null
+++ b/scram-tools.file/tools/gcc/gcc-f77compiler.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/gcc/gcc-plugin.xml b/scram-tools.file/tools/gcc/gcc-plugin.xml
new file mode 100644
index 00000000000..14d455634d8
--- /dev/null
+++ b/scram-tools.file/tools/gcc/gcc-plugin.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/gcc/ofast-flag.xml b/scram-tools.file/tools/gcc/ofast-flag.xml
new file mode 100644
index 00000000000..c8ec9ec50db
--- /dev/null
+++ b/scram-tools.file/tools/gcc/ofast-flag.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/gcc/stdcxx-fs.xml b/scram-tools.file/tools/gcc/stdcxx-fs.xml
new file mode 100644
index 00000000000..dc6e02106ea
--- /dev/null
+++ b/scram-tools.file/tools/gcc/stdcxx-fs.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/gdb-toolfile.spec b/scram-tools.file/tools/gdb/gdb.xml
similarity index 50%
rename from gdb-toolfile.spec
rename to scram-tools.file/tools/gdb/gdb.xml
index 8b1b0caf732..3d9cd0b183f 100644
--- a/gdb-toolfile.spec
+++ b/scram-tools.file/tools/gdb/gdb.xml
@@ -1,19 +1,6 @@
-### RPM external gdb-toolfile 1.0
-Requires: gdb
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/gdb.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/gdbm-toolfile.spec b/scram-tools.file/tools/gdbm/gdbm.xml
similarity index 66%
rename from gdbm-toolfile.spec
rename to scram-tools.file/tools/gdbm/gdbm.xml
index 0bb80db22a5..9293804f00f 100644
--- a/gdbm-toolfile.spec
+++ b/scram-tools.file/tools/gdbm/gdbm.xml
@@ -1,13 +1,3 @@
-### RPM external gdbm-toolfile 1.0
-Requires: gdbm
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/gdbm.xml
@@ -18,6 +8,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/gdbm.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/gdrcopy-toolfile.spec b/scram-tools.file/tools/gdrcopy/gdrcopy.xml
similarity index 60%
rename from gdrcopy-toolfile.spec
rename to scram-tools.file/tools/gdrcopy/gdrcopy.xml
index 3827c452d11..697e6256ef5 100644
--- a/gdrcopy-toolfile.spec
+++ b/scram-tools.file/tools/gdrcopy/gdrcopy.xml
@@ -1,13 +1,3 @@
-### RPM external gdrcopy-toolfile 1.0
-Requires: gdrcopy
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/gdrcopy.xml
@@ -16,6 +6,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/gdrcopy.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/geant4-parfullcms-toolfile.spec b/scram-tools.file/tools/geant4-parfullcms/geant4-parfullcms.xml
similarity index 63%
rename from geant4-parfullcms-toolfile.spec
rename to scram-tools.file/tools/geant4-parfullcms/geant4-parfullcms.xml
index 25a900a2ff4..40c6c1fa219 100644
--- a/geant4-parfullcms-toolfile.spec
+++ b/scram-tools.file/tools/geant4-parfullcms/geant4-parfullcms.xml
@@ -1,11 +1,3 @@
-### RPM external geant4-parfullcms-toolfile 1.0
-Requires: geant4-parfullcms
-
-%prep
-%build
-%install
-mkdir -p %{i}/etc/scram.d
-cat << \EOF_TOOLFILE > %{i}/etc/scram.d/geant4-parfullcms.xml
@@ -14,5 +6,3 @@ cat << \EOF_TOOLFILE > %{i}/etc/scram.d/geant4-parfullcms.xml
-EOF_TOOLFILE
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/geant4/geant4.xml b/scram-tools.file/tools/geant4/geant4.xml
new file mode 100644
index 00000000000..4daca7f4ba1
--- /dev/null
+++ b/scram-tools.file/tools/geant4/geant4.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/geant4/geant4core.xml b/scram-tools.file/tools/geant4/geant4core.xml
new file mode 100644
index 00000000000..b5df64a33cf
--- /dev/null
+++ b/scram-tools.file/tools/geant4/geant4core.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/geant4/geant4static.xml b/scram-tools.file/tools/geant4/geant4static.xml
new file mode 100644
index 00000000000..172463bc65b
--- /dev/null
+++ b/scram-tools.file/tools/geant4/geant4static.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/geant4/geant4vis.xml b/scram-tools.file/tools/geant4/geant4vis.xml
new file mode 100644
index 00000000000..4f121e972be
--- /dev/null
+++ b/scram-tools.file/tools/geant4/geant4vis.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/geant4data/env.sh b/scram-tools.file/tools/geant4data/env.sh
new file mode 100644
index 00000000000..c11101050e8
--- /dev/null
+++ b/scram-tools.file/tools/geant4data/env.sh
@@ -0,0 +1 @@
+cp $TOOL_ROOT/etc/scram.d/geant4data.xml ${TOOLFILES_INSTALL_DIR}/tools/selected
diff --git a/giflib-toolfile.spec b/scram-tools.file/tools/giflib/giflib.xml
similarity index 72%
rename from giflib-toolfile.spec
rename to scram-tools.file/tools/giflib/giflib.xml
index fffeb2f104c..4f237f37475 100644
--- a/giflib-toolfile.spec
+++ b/scram-tools.file/tools/giflib/giflib.xml
@@ -1,11 +1,3 @@
-### RPM external giflib-toolfile 1.0
-Requires: giflib
-
-%prep
-%build
-%install
-mkdir -p %{i}/etc/scram.d
-cat << \EOF_TOOLFILE > %{i}/etc/scram.d/giflib.xml
@@ -18,5 +10,3 @@ cat << \EOF_TOOLFILE > %{i}/etc/scram.d/giflib.xml
-EOF_TOOLFILE
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/git/env.sh b/scram-tools.file/tools/git/env.sh
new file mode 100644
index 00000000000..20d25f89d1e
--- /dev/null
+++ b/scram-tools.file/tools/git/env.sh
@@ -0,0 +1,5 @@
+case $(arch) in
+ osx*) PERL5LIB_PATH=/lib/perl5/site_perl ;;
+ * ) PERL5LIB_PATH=/share/perl5 ;;
+esac
+export PERL5LIB_PATH
diff --git a/git-toolfile.spec b/scram-tools.file/tools/git/git.xml
similarity index 65%
rename from git-toolfile.spec
rename to scram-tools.file/tools/git/git.xml
index 026e0c9d755..49c4ce20751 100644
--- a/git-toolfile.spec
+++ b/scram-tools.file/tools/git/git.xml
@@ -1,24 +1,3 @@
-### RPM external git-toolfile 1.0
-Requires: git
-%prep
-
-%build
-
-%install
-
-case "%{cmsplatf}" in
- *)
- PERL5LIB_PATH=/share/perl5
- ;;
- osx*)
- PERL5LIB_PATH=/lib/perl5/site_perl
- ;;
-esac
-
-export PERL5LIB_PATH
-
-mkdir -p %{i}/etc/scram.d
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/git.xml
@@ -31,6 +10,3 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/git.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/glimpse-toolfile.spec b/scram-tools.file/tools/glimpse/glimpse.xml
similarity index 50%
rename from glimpse-toolfile.spec
rename to scram-tools.file/tools/glimpse/glimpse.xml
index 38b38bd0360..8b2ace10243 100644
--- a/glimpse-toolfile.spec
+++ b/scram-tools.file/tools/glimpse/glimpse.xml
@@ -1,19 +1,6 @@
-### RPM external glimpse-toolfile 1.0
-Requires: glimpse
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/glimpse.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/gmake-toolfile.spec b/scram-tools.file/tools/gmake/gmake.xml
similarity index 50%
rename from gmake-toolfile.spec
rename to scram-tools.file/tools/gmake/gmake.xml
index 6be9586a4f5..dd818db0857 100644
--- a/gmake-toolfile.spec
+++ b/scram-tools.file/tools/gmake/gmake.xml
@@ -1,19 +1,6 @@
-### RPM external gmake-toolfile 1.0
-Requires: gmake
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/gmake.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/gmp-static-toolfile.spec b/scram-tools.file/tools/gmp-static/gmp.xml
similarity index 60%
rename from gmp-static-toolfile.spec
rename to scram-tools.file/tools/gmp-static/gmp.xml
index 8443836a5a9..6efd9c9353d 100644
--- a/gmp-static-toolfile.spec
+++ b/scram-tools.file/tools/gmp-static/gmp.xml
@@ -1,13 +1,3 @@
-### RPM external gmp-static-toolfile 1.0
-Requires: gmp-static
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/gmp.xml
@@ -17,6 +7,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/gmp.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/gnuplot-toolfile.spec b/scram-tools.file/tools/gnuplot/gnuplot.xml
similarity index 57%
rename from gnuplot-toolfile.spec
rename to scram-tools.file/tools/gnuplot/gnuplot.xml
index 16843ea760f..a59d7d9fb35 100644
--- a/gnuplot-toolfile.spec
+++ b/scram-tools.file/tools/gnuplot/gnuplot.xml
@@ -1,11 +1,3 @@
-### RPM external gnuplot-toolfile 1.0
-Requires: gnuplot
-
-%prep
-%build
-%install
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE > %i/etc/scram.d/gnuplot.xml
@@ -13,5 +5,3 @@ cat << \EOF_TOOLFILE > %i/etc/scram.d/gnuplot.xml
-EOF_TOOLFILE
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/google-benchmark/google-benchmark-main.xml b/scram-tools.file/tools/google-benchmark/google-benchmark-main.xml
new file mode 100644
index 00000000000..e5add6abf19
--- /dev/null
+++ b/scram-tools.file/tools/google-benchmark/google-benchmark-main.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/google-benchmark/google-benchmark.xml b/scram-tools.file/tools/google-benchmark/google-benchmark.xml
new file mode 100644
index 00000000000..42c4eb1757a
--- /dev/null
+++ b/scram-tools.file/tools/google-benchmark/google-benchmark.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/gosam-toolfile.spec b/scram-tools.file/tools/gosam/gosam.xml
similarity index 56%
rename from gosam-toolfile.spec
rename to scram-tools.file/tools/gosam/gosam.xml
index 98f900bad9c..bfbe2a0dfe2 100644
--- a/gosam-toolfile.spec
+++ b/scram-tools.file/tools/gosam/gosam.xml
@@ -1,13 +1,3 @@
-### RPM external gosam-toolfile 2.0
-Requires: gosam
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/gosam.xml
@@ -15,6 +5,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/gosam.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/gosamcontrib-toolfile.spec b/scram-tools.file/tools/gosamcontrib/gosamcontrib.xml
similarity index 70%
rename from gosamcontrib-toolfile.spec
rename to scram-tools.file/tools/gosamcontrib/gosamcontrib.xml
index 4a2d60feb09..f2fdfb2afc1 100644
--- a/gosamcontrib-toolfile.spec
+++ b/scram-tools.file/tools/gosamcontrib/gosamcontrib.xml
@@ -1,13 +1,3 @@
-### RPM external gosamcontrib-toolfile 1.0
-Requires: gosamcontrib
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/gosamcontrib.xml
@@ -18,7 +8,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/gosamcontrib.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
-
diff --git a/scram-tools.file/tools/gperftools/gperf.xml b/scram-tools.file/tools/gperftools/gperf.xml
new file mode 100644
index 00000000000..a262970ef05
--- /dev/null
+++ b/scram-tools.file/tools/gperftools/gperf.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/gperftools/tcmalloc.xml b/scram-tools.file/tools/gperftools/tcmalloc.xml
new file mode 100644
index 00000000000..d0315823890
--- /dev/null
+++ b/scram-tools.file/tools/gperftools/tcmalloc.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/gperftools/tcmalloc_minimal.xml b/scram-tools.file/tools/gperftools/tcmalloc_minimal.xml
new file mode 100644
index 00000000000..b5665725694
--- /dev/null
+++ b/scram-tools.file/tools/gperftools/tcmalloc_minimal.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/graphviz-toolfile.spec b/scram-tools.file/tools/graphviz/graphviz.xml
similarity index 64%
rename from graphviz-toolfile.spec
rename to scram-tools.file/tools/graphviz/graphviz.xml
index 562f80cc47a..d3fcbb4d327 100644
--- a/graphviz-toolfile.spec
+++ b/scram-tools.file/tools/graphviz/graphviz.xml
@@ -1,13 +1,3 @@
-### RPM external graphviz-toolfile 1.0
-Requires: graphviz
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/graphviz.xml
@@ -19,6 +9,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/graphviz.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/grpc-toolfile.spec b/scram-tools.file/tools/grpc/grpc.xml
similarity index 71%
rename from grpc-toolfile.spec
rename to scram-tools.file/tools/grpc/grpc.xml
index 68c28e5431f..ea98242e734 100644
--- a/grpc-toolfile.spec
+++ b/scram-tools.file/tools/grpc/grpc.xml
@@ -1,14 +1,3 @@
-### RPM external grpc-toolfile 1.0
-Requires: grpc
-
-%prep
-
-%build
-
-%install
-mkdir -p %i/etc/scram.d
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/grpc.xml
@@ -24,6 +13,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/grpc.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/gsl-toolfile.spec b/scram-tools.file/tools/gsl/gsl.xml
similarity index 71%
rename from gsl-toolfile.spec
rename to scram-tools.file/tools/gsl/gsl.xml
index 4b4ee10a713..a8e512acfd8 100644
--- a/gsl-toolfile.spec
+++ b/scram-tools.file/tools/gsl/gsl.xml
@@ -1,13 +1,3 @@
-### RPM external gsl-toolfile 2.0
-Requires: gsl
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/gsl.xml
@@ -20,6 +10,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/gsl.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/hdf5-toolfile.spec b/scram-tools.file/tools/hdf5/hdf5.xml
similarity index 66%
rename from hdf5-toolfile.spec
rename to scram-tools.file/tools/hdf5/hdf5.xml
index 03f4aceba8a..eb6c72eddf8 100644
--- a/hdf5-toolfile.spec
+++ b/scram-tools.file/tools/hdf5/hdf5.xml
@@ -1,13 +1,3 @@
-### RPM external hdf5-toolfile 1.0
-Requires: hdf5
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/hdf5.xml
@@ -19,6 +9,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/hdf5.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/hector-toolfile.spec b/scram-tools.file/tools/hector/hector.xml
similarity index 70%
rename from hector-toolfile.spec
rename to scram-tools.file/tools/hector/hector.xml
index 2a95e2b9c1d..bfe507cd081 100644
--- a/hector-toolfile.spec
+++ b/scram-tools.file/tools/hector/hector.xml
@@ -1,13 +1,3 @@
-### RPM external hector-toolfile 1.0
-Requires: hector
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/hector.xml
@@ -19,6 +9,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/hector.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/hepmc/hepmc.xml b/scram-tools.file/tools/hepmc/hepmc.xml
new file mode 100644
index 00000000000..358586aaa46
--- /dev/null
+++ b/scram-tools.file/tools/hepmc/hepmc.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/hepmc/hepmc_headers.xml b/scram-tools.file/tools/hepmc/hepmc_headers.xml
new file mode 100644
index 00000000000..184c418590a
--- /dev/null
+++ b/scram-tools.file/tools/hepmc/hepmc_headers.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/heppdt-toolfile.spec b/scram-tools.file/tools/heppdt/heppdt.xml
similarity index 70%
rename from heppdt-toolfile.spec
rename to scram-tools.file/tools/heppdt/heppdt.xml
index ddc7b2bbb71..1f403dfab6e 100644
--- a/heppdt-toolfile.spec
+++ b/scram-tools.file/tools/heppdt/heppdt.xml
@@ -1,13 +1,3 @@
-### RPM external heppdt-toolfile 1.0
-Requires: heppdt
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/heppdt.xml
@@ -20,6 +10,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/heppdt.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/herwig-toolfile.spec b/scram-tools.file/tools/herwig/herwig.xml
similarity index 71%
rename from herwig-toolfile.spec
rename to scram-tools.file/tools/herwig/herwig.xml
index 3171a96595c..62f1aa0ba75 100644
--- a/herwig-toolfile.spec
+++ b/scram-tools.file/tools/herwig/herwig.xml
@@ -1,13 +1,3 @@
-### RPM external herwig-toolfile 1.0
-Requires: herwig
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/herwig.xml
@@ -22,7 +12,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/herwig.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
-
diff --git a/herwig7-toolfile.spec b/scram-tools.file/tools/herwig7/herwig7.xml
similarity index 73%
rename from herwig7-toolfile.spec
rename to scram-tools.file/tools/herwig7/herwig7.xml
index b711492dcb4..623e6d51971 100644
--- a/herwig7-toolfile.spec
+++ b/scram-tools.file/tools/herwig7/herwig7.xml
@@ -1,13 +1,3 @@
-### RPM external herwig7-toolfile 1.0
-Requires: herwig7
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/herwig7.xml
@@ -23,11 +13,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/herwig7.xml
-%ifnarch ppc64le
-
-%endif
+
+
+
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
-
diff --git a/highfive-toolfile.spec b/scram-tools.file/tools/highfive/highfive.xml
similarity index 64%
rename from highfive-toolfile.spec
rename to scram-tools.file/tools/highfive/highfive.xml
index 2d3340ee832..4b07b542b7c 100644
--- a/highfive-toolfile.spec
+++ b/scram-tools.file/tools/highfive/highfive.xml
@@ -1,13 +1,3 @@
-### RPM external highfive-toolfile 1.0
-Requires: highfive
-%prep
-
-%build
-
-%install
-
-mkdir -p %{i}/etc/scram.d
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/highfive.xml
@@ -18,6 +8,3 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/highfive.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/hls-toolfile.spec b/scram-tools.file/tools/hls/hls.xml
similarity index 67%
rename from hls-toolfile.spec
rename to scram-tools.file/tools/hls/hls.xml
index a86bac77b56..14ecf85239c 100644
--- a/hls-toolfile.spec
+++ b/scram-tools.file/tools/hls/hls.xml
@@ -1,13 +1,3 @@
-### RPM external hls-toolfile 1.0
-Requires: hls
-%prep
-
-%build
-
-%install
-
-mkdir -p %{i}/etc/scram.d
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/hls.xml
@@ -18,6 +8,3 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/hls.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/hwloc-toolfile.spec b/scram-tools.file/tools/hwloc/hwloc.xml
similarity index 65%
rename from hwloc-toolfile.spec
rename to scram-tools.file/tools/hwloc/hwloc.xml
index deccafbd8fa..7ab3c5fb634 100644
--- a/hwloc-toolfile.spec
+++ b/scram-tools.file/tools/hwloc/hwloc.xml
@@ -1,13 +1,3 @@
-### RPM external hwloc-toolfile 1.0
-Requires: hwloc
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/hwloc.xml
@@ -17,6 +7,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/hwloc.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/hydjet-toolfile.spec b/scram-tools.file/tools/hydjet/hydjet.xml
similarity index 60%
rename from hydjet-toolfile.spec
rename to scram-tools.file/tools/hydjet/hydjet.xml
index 02bb671c727..9c8e1b7e603 100644
--- a/hydjet-toolfile.spec
+++ b/scram-tools.file/tools/hydjet/hydjet.xml
@@ -1,13 +1,3 @@
-### RPM external hydjet-toolfile 1.0
-Requires: hydjet
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/hydjet.xml
@@ -18,6 +8,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/hydjet.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/icc/env.sh b/scram-tools.file/tools/icc/env.sh
new file mode 100644
index 00000000000..d105f0c12e8
--- /dev/null
+++ b/scram-tools.file/tools/icc/env.sh
@@ -0,0 +1,2 @@
+source ${SCRAM_TOOLS_BIN_DIR}/os_libdir.sh
+export AT="@"
diff --git a/scram-tools.file/tools/icc/icc-ccompiler.xml b/scram-tools.file/tools/icc/icc-ccompiler.xml
new file mode 100644
index 00000000000..84035cd0aee
--- /dev/null
+++ b/scram-tools.file/tools/icc/icc-ccompiler.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/icc/icc-cxxcompiler.xml b/scram-tools.file/tools/icc/icc-cxxcompiler.xml
new file mode 100644
index 00000000000..bef46a60686
--- /dev/null
+++ b/scram-tools.file/tools/icc/icc-cxxcompiler.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/icc/icc-f77compiler.xml b/scram-tools.file/tools/icc/icc-f77compiler.xml
new file mode 100644
index 00000000000..ea58918b172
--- /dev/null
+++ b/scram-tools.file/tools/icc/icc-f77compiler.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/icc/intel-license.xml b/scram-tools.file/tools/icc/intel-license.xml
new file mode 100644
index 00000000000..e396f6cb2e9
--- /dev/null
+++ b/scram-tools.file/tools/icc/intel-license.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/igprof-toolfile.spec b/scram-tools.file/tools/igprof/igprof.xml
similarity index 63%
rename from igprof-toolfile.spec
rename to scram-tools.file/tools/igprof/igprof.xml
index 34a1fcfd05d..ed2082885e1 100644
--- a/igprof-toolfile.spec
+++ b/scram-tools.file/tools/igprof/igprof.xml
@@ -1,10 +1,3 @@
-### RPM external igprof-toolfile 1.0
-Requires: igprof
-%prep
-%build
-%install
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE > %i/etc/scram.d/igprof.xml
@@ -13,5 +6,3 @@ cat << \EOF_TOOLFILE > %i/etc/scram.d/igprof.xml
-EOF_TOOLFILE
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/intel-vtune/intel-vtune.xml b/scram-tools.file/tools/intel-vtune/intel-vtune.xml
new file mode 100644
index 00000000000..326011e8615
--- /dev/null
+++ b/scram-tools.file/tools/intel-vtune/intel-vtune.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/ittnotify-toolfile.spec b/scram-tools.file/tools/ittnotify/ittnotify.xml
similarity index 64%
rename from ittnotify-toolfile.spec
rename to scram-tools.file/tools/ittnotify/ittnotify.xml
index ec2666f950e..004148eb403 100644
--- a/ittnotify-toolfile.spec
+++ b/scram-tools.file/tools/ittnotify/ittnotify.xml
@@ -1,13 +1,3 @@
-### RPM external ittnotify-toolfile 1.0
-Requires: ittnotify
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/ittnotify.xml
@@ -17,6 +7,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/ittnotify.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/jemalloc-debug-toolfile.spec b/scram-tools.file/tools/jemalloc-debug/jemalloc-debug.xml
similarity index 65%
rename from jemalloc-debug-toolfile.spec
rename to scram-tools.file/tools/jemalloc-debug/jemalloc-debug.xml
index 7e430058c70..b77a6c0c388 100644
--- a/jemalloc-debug-toolfile.spec
+++ b/scram-tools.file/tools/jemalloc-debug/jemalloc-debug.xml
@@ -1,14 +1,3 @@
-### RPM external jemalloc-debug-toolfile 2.0
-Requires: jemalloc-debug
-
-%prep
-
-%build
-
-%install
-
-mkdir -p %{i}/etc/scram.d
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/jemalloc-debug.xml
@@ -19,6 +8,3 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/jemalloc-debug.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/jemalloc-toolfile.spec b/scram-tools.file/tools/jemalloc/jemalloc.xml
similarity index 67%
rename from jemalloc-toolfile.spec
rename to scram-tools.file/tools/jemalloc/jemalloc.xml
index a876b3e890f..a410463c2b5 100644
--- a/jemalloc-toolfile.spec
+++ b/scram-tools.file/tools/jemalloc/jemalloc.xml
@@ -1,14 +1,3 @@
-### RPM external jemalloc-toolfile 3.0
-Requires: jemalloc
-
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/jemalloc.xml
@@ -19,6 +8,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/jemalloc.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/jimmy/jimmy.xml b/scram-tools.file/tools/jimmy/jimmy.xml
new file mode 100644
index 00000000000..1fc0280c940
--- /dev/null
+++ b/scram-tools.file/tools/jimmy/jimmy.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/jimmy/jimmy_headers.xml b/scram-tools.file/tools/jimmy/jimmy_headers.xml
new file mode 100644
index 00000000000..a68d77429b8
--- /dev/null
+++ b/scram-tools.file/tools/jimmy/jimmy_headers.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/json-toolfile.spec b/scram-tools.file/tools/json/json.xml
similarity index 51%
rename from json-toolfile.spec
rename to scram-tools.file/tools/json/json.xml
index 6be48099182..7f731092c00 100644
--- a/json-toolfile.spec
+++ b/scram-tools.file/tools/json/json.xml
@@ -1,19 +1,6 @@
-### RPM external json-toolfile 1.0
-Requires: json
-
-%prep
-
-%build
-
-%install
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE > %i/etc/scram.d/json.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/ktjet-toolfile.spec b/scram-tools.file/tools/ktjet/ktjet.xml
similarity index 71%
rename from ktjet-toolfile.spec
rename to scram-tools.file/tools/ktjet/ktjet.xml
index a01e7e556d9..c0de5b56f92 100644
--- a/ktjet-toolfile.spec
+++ b/scram-tools.file/tools/ktjet/ktjet.xml
@@ -1,13 +1,3 @@
-### RPM external ktjet-toolfile 1.0
-Requires: ktjet
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/ktjet.xml
@@ -20,6 +10,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/ktjet.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/lcov-toolfile.spec b/scram-tools.file/tools/lcov/lcov.xml
similarity index 57%
rename from lcov-toolfile.spec
rename to scram-tools.file/tools/lcov/lcov.xml
index edcbdb2d364..112bdc191b8 100644
--- a/lcov-toolfile.spec
+++ b/scram-tools.file/tools/lcov/lcov.xml
@@ -1,13 +1,3 @@
-### RPM external lcov-toolfile 1.0
-Requires: lcov
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/lcov.xml
@@ -15,6 +5,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/lcov.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/lhapdf-toolfile.spec b/scram-tools.file/tools/lhapdf/lhapdf.xml
similarity index 70%
rename from lhapdf-toolfile.spec
rename to scram-tools.file/tools/lhapdf/lhapdf.xml
index 7be8af23239..a617a9e0c53 100644
--- a/lhapdf-toolfile.spec
+++ b/scram-tools.file/tools/lhapdf/lhapdf.xml
@@ -1,13 +1,3 @@
-### RPM external lhapdf-toolfile 1.0
-Requires: lhapdf
-%prep
-
-%build
-
-%install
-export PYTHON_LIB_SITE_PACKAGES
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/lhapdf.xml
@@ -21,6 +11,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/lhapdf.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/libffi-toolfile.spec b/scram-tools.file/tools/libffi/libffi.xml
similarity index 59%
rename from libffi-toolfile.spec
rename to scram-tools.file/tools/libffi/libffi.xml
index f498f85416c..d3ddb8ce56a 100644
--- a/libffi-toolfile.spec
+++ b/scram-tools.file/tools/libffi/libffi.xml
@@ -1,13 +1,3 @@
-### RPM external libffi-toolfile 1.0
-Requires: libffi
-%prep
-
-%build
-
-%install
-
-mkdir -p %{i}/etc/scram.d
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/libffi.xml
@@ -16,6 +6,3 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/libffi.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/libjpeg-turbo-toolfile.spec b/scram-tools.file/tools/libjpeg-turbo/libjpeg-turbo.xml
similarity index 72%
rename from libjpeg-turbo-toolfile.spec
rename to scram-tools.file/tools/libjpeg-turbo/libjpeg-turbo.xml
index 3a1b4c70f0e..54f84109e05 100644
--- a/libjpeg-turbo-toolfile.spec
+++ b/scram-tools.file/tools/libjpeg-turbo/libjpeg-turbo.xml
@@ -1,13 +1,3 @@
-### RPM external libjpeg-turbo-toolfile 2.0
-Requires: libjpeg-turbo
-%prep
-
-%build
-
-%install
-
-mkdir -p %{i}/etc/scram.d
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/libjpeg-turbo.xml
@@ -21,6 +11,3 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/libjpeg-turbo.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/libpciaccess-toolfile.spec b/scram-tools.file/tools/libpciaccess/libpciaccess.xml
similarity index 61%
rename from libpciaccess-toolfile.spec
rename to scram-tools.file/tools/libpciaccess/libpciaccess.xml
index 30c387fd407..90732221701 100644
--- a/libpciaccess-toolfile.spec
+++ b/scram-tools.file/tools/libpciaccess/libpciaccess.xml
@@ -1,14 +1,3 @@
-### RPM external libpciaccess-toolfile 1.0
-Requires: libpciaccess
-
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/libpciaccess.xml
@@ -17,6 +6,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/libpciaccess.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/libpng-toolfile.spec b/scram-tools.file/tools/libpng/libpng.xml
similarity index 69%
rename from libpng-toolfile.spec
rename to scram-tools.file/tools/libpng/libpng.xml
index caa3b18fc90..def9a83af6e 100644
--- a/libpng-toolfile.spec
+++ b/scram-tools.file/tools/libpng/libpng.xml
@@ -1,13 +1,3 @@
-### RPM external libpng-toolfile 1.0
-Requires: libpng
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/libpng.xml
@@ -20,6 +10,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/libpng.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/libtiff-toolfile.spec b/scram-tools.file/tools/libtiff/libtiff.xml
similarity index 71%
rename from libtiff-toolfile.spec
rename to scram-tools.file/tools/libtiff/libtiff.xml
index ea495c7d376..8cfd0846a36 100644
--- a/libtiff-toolfile.spec
+++ b/scram-tools.file/tools/libtiff/libtiff.xml
@@ -1,13 +1,3 @@
-### RPM external libtiff-toolfile 1.0
-Requires: libtiff
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/libtiff.xml
@@ -21,6 +11,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/libtiff.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/libungif-toolfile.spec b/scram-tools.file/tools/libungif/libungif.xml
similarity index 70%
rename from libungif-toolfile.spec
rename to scram-tools.file/tools/libungif/libungif.xml
index 83b34bfd65e..739a5df843c 100644
--- a/libungif-toolfile.spec
+++ b/scram-tools.file/tools/libungif/libungif.xml
@@ -1,13 +1,3 @@
-### RPM external libungif-toolfile 1.0
-Requires: libungif
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/libungif.xml
@@ -20,6 +10,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/libungif.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/libunwind-toolfile.spec b/scram-tools.file/tools/libunwind/libunwind.xml
similarity index 66%
rename from libunwind-toolfile.spec
rename to scram-tools.file/tools/libunwind/libunwind.xml
index 20140f11de2..0aac03e2eab 100644
--- a/libunwind-toolfile.spec
+++ b/scram-tools.file/tools/libunwind/libunwind.xml
@@ -1,13 +1,3 @@
-### RPM external libunwind-toolfile 1.0
-Requires: libunwind
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/libunwind.xml
@@ -18,6 +8,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/libunwind.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/libuuid-toolfile.spec b/scram-tools.file/tools/libuuid/libuuid.xml
similarity index 67%
rename from libuuid-toolfile.spec
rename to scram-tools.file/tools/libuuid/libuuid.xml
index 87bf4cf6cd0..723fda5dbf5 100644
--- a/libuuid-toolfile.spec
+++ b/scram-tools.file/tools/libuuid/libuuid.xml
@@ -1,13 +1,3 @@
-### RPM external libuuid-toolfile 1.0
-Requires: libuuid
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/libuuid.xml
@@ -19,6 +9,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/libuuid.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/libxml2-toolfile.spec b/scram-tools.file/tools/libxml2/libxml2.xml
similarity index 71%
rename from libxml2-toolfile.spec
rename to scram-tools.file/tools/libxml2/libxml2.xml
index c9da8ed849a..be369b6ca99 100644
--- a/libxml2-toolfile.spec
+++ b/scram-tools.file/tools/libxml2/libxml2.xml
@@ -1,13 +1,3 @@
-### RPM external libxml2-toolfile 1.0
-Requires: libxml2
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/libxml2.xml
@@ -20,6 +10,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/libxml2.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/libxslt-toolfile.spec b/scram-tools.file/tools/libxslt/libxslt.xml
similarity index 63%
rename from libxslt-toolfile.spec
rename to scram-tools.file/tools/libxslt/libxslt.xml
index 0064b8089d2..6dac419154f 100644
--- a/libxslt-toolfile.spec
+++ b/scram-tools.file/tools/libxslt/libxslt.xml
@@ -1,13 +1,3 @@
-### RPM external libxslt-toolfile 1.0
-Requires: libxslt
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/libxslt.xml
@@ -17,6 +7,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/libxslt.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/llvm/env.sh b/scram-tools.file/tools/llvm/env.sh
new file mode 100644
index 00000000000..d2a26ecc9ef
--- /dev/null
+++ b/scram-tools.file/tools/llvm/env.sh
@@ -0,0 +1,2 @@
+export GCC_ROOT=$(which gcc | sed -e 's|/bin/gcc||')
+source ${SCRAM_TOOLS_BIN_DIR}/os_libdir.sh
diff --git a/scram-tools.file/tools/llvm/iwyu-cxxcompiler.xml b/scram-tools.file/tools/llvm/iwyu-cxxcompiler.xml
new file mode 100644
index 00000000000..17711bb7f87
--- /dev/null
+++ b/scram-tools.file/tools/llvm/iwyu-cxxcompiler.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/llvm/llvm-analyzer-ccompiler.xml b/scram-tools.file/tools/llvm/llvm-analyzer-ccompiler.xml
new file mode 100644
index 00000000000..6433f8f4317
--- /dev/null
+++ b/scram-tools.file/tools/llvm/llvm-analyzer-ccompiler.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/llvm/llvm-analyzer-cxxcompiler.xml b/scram-tools.file/tools/llvm/llvm-analyzer-cxxcompiler.xml
new file mode 100644
index 00000000000..65bbf3ea7f4
--- /dev/null
+++ b/scram-tools.file/tools/llvm/llvm-analyzer-cxxcompiler.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/llvm/llvm-ccompiler.xml b/scram-tools.file/tools/llvm/llvm-ccompiler.xml
new file mode 100644
index 00000000000..0ac59e88363
--- /dev/null
+++ b/scram-tools.file/tools/llvm/llvm-ccompiler.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/llvm/llvm-cxxcompiler.xml b/scram-tools.file/tools/llvm/llvm-cxxcompiler.xml
new file mode 100644
index 00000000000..9130dae09af
--- /dev/null
+++ b/scram-tools.file/tools/llvm/llvm-cxxcompiler.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+ # drop flags not supported by llvm
+ # -Wno-non-template-friend removed since it's not supported, yet, by llvm.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/llvm/llvm-f77compiler.xml b/scram-tools.file/tools/llvm/llvm-f77compiler.xml
new file mode 100644
index 00000000000..ad079d2d5a1
--- /dev/null
+++ b/scram-tools.file/tools/llvm/llvm-f77compiler.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/llvm/llvm.xml b/scram-tools.file/tools/llvm/llvm.xml
new file mode 100644
index 00000000000..7c6ed176d50
--- /dev/null
+++ b/scram-tools.file/tools/llvm/llvm.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/llvm/pyclang.xml b/scram-tools.file/tools/llvm/pyclang.xml
new file mode 100644
index 00000000000..bf47ac69ab2
--- /dev/null
+++ b/scram-tools.file/tools/llvm/pyclang.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/lwtnn-toolfile.spec b/scram-tools.file/tools/lwtnn/lwtnn.xml
similarity index 74%
rename from lwtnn-toolfile.spec
rename to scram-tools.file/tools/lwtnn/lwtnn.xml
index b35152346d5..0f455197ed5 100644
--- a/lwtnn-toolfile.spec
+++ b/scram-tools.file/tools/lwtnn/lwtnn.xml
@@ -1,13 +1,3 @@
-### RPM external lwtnn-toolfile 1.0
-Requires: lwtnn
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/lwtnn.xml
@@ -22,6 +12,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/lwtnn.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/lz4-toolfile.spec b/scram-tools.file/tools/lz4/lz4.xml
similarity index 73%
rename from lz4-toolfile.spec
rename to scram-tools.file/tools/lz4/lz4.xml
index 767ccf685c6..0ec0056e5af 100644
--- a/lz4-toolfile.spec
+++ b/scram-tools.file/tools/lz4/lz4.xml
@@ -1,11 +1,3 @@
-### RPM external lz4-toolfile 1.0
-Requires: lz4
-
-%prep
-%build
-%install
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE > %i/etc/scram.d/lz4.xml
@@ -18,5 +10,3 @@ cat << \EOF_TOOLFILE > %i/etc/scram.d/lz4.xml
-EOF_TOOLFILE
-## IMPORT scram-tools-post
diff --git a/madgraph5amcatnlo-toolfile.spec b/scram-tools.file/tools/madgraph5amcatnlo/madgraph5amcatnlo.xml
similarity index 62%
rename from madgraph5amcatnlo-toolfile.spec
rename to scram-tools.file/tools/madgraph5amcatnlo/madgraph5amcatnlo.xml
index 8ee37eb747c..fd7e83cd458 100644
--- a/madgraph5amcatnlo-toolfile.spec
+++ b/scram-tools.file/tools/madgraph5amcatnlo/madgraph5amcatnlo.xml
@@ -1,13 +1,3 @@
-### RPM external madgraph5amcatnlo-toolfile 1.0
-Requires: madgraph5amcatnlo
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/madgraph5amcatnlo.xml
@@ -17,6 +7,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/madgraph5amcatnlo.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/mctester-toolfile.spec b/scram-tools.file/tools/mctester/mctester.xml
similarity index 71%
rename from mctester-toolfile.spec
rename to scram-tools.file/tools/mctester/mctester.xml
index 0fe9c4025e5..9e035339358 100644
--- a/mctester-toolfile.spec
+++ b/scram-tools.file/tools/mctester/mctester.xml
@@ -1,13 +1,3 @@
-### RPM external mctester-toolfile 1.0
-Requires: mctester
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/mctester.xml
@@ -22,7 +12,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/mctester.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
-
diff --git a/md5-toolfile.spec b/scram-tools.file/tools/md5/md5.xml
similarity index 64%
rename from md5-toolfile.spec
rename to scram-tools.file/tools/md5/md5.xml
index 85d76b208ca..cceea486e2b 100644
--- a/md5-toolfile.spec
+++ b/scram-tools.file/tools/md5/md5.xml
@@ -1,11 +1,3 @@
-### RPM external md5-toolfile 1.0
-Requires: md5
-
-%prep
-%build
-%install
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/md5.xml
@@ -15,6 +7,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/md5.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/meschach-toolfile.spec b/scram-tools.file/tools/meschach/meschach.xml
similarity index 68%
rename from meschach-toolfile.spec
rename to scram-tools.file/tools/meschach/meschach.xml
index 71f82c43837..a90f7aa056c 100644
--- a/meschach-toolfile.spec
+++ b/scram-tools.file/tools/meschach/meschach.xml
@@ -1,13 +1,3 @@
-### RPM external meschach-toolfile 1.0
-Requires: meschach
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/meschach.xml
@@ -19,6 +9,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/meschach.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/millepede-toolfile.spec b/scram-tools.file/tools/millepede/millepede.xml
similarity index 60%
rename from millepede-toolfile.spec
rename to scram-tools.file/tools/millepede/millepede.xml
index 1910308f5f4..01e34cea191 100644
--- a/millepede-toolfile.spec
+++ b/scram-tools.file/tools/millepede/millepede.xml
@@ -1,14 +1,3 @@
-### RPM external millepede-toolfile 1.0
-Requires: millepede
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-# millepede tool file
-cat << \EOF_TOOLFILE >%i/etc/scram.d/millepede.xml
@@ -19,7 +8,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/millepede.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
-
diff --git a/scram-tools.file/tools/mkfit/mkfit.xml b/scram-tools.file/tools/mkfit/mkfit.xml
new file mode 100644
index 00000000000..42f3e3fd5b4
--- /dev/null
+++ b/scram-tools.file/tools/mkfit/mkfit.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/mkfit/vectorized.tmpl b/scram-tools.file/tools/mkfit/vectorized.tmpl
new file mode 100644
index 00000000000..d37e2ff6d9e
--- /dev/null
+++ b/scram-tools.file/tools/mkfit/vectorized.tmpl
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/mpfr-static-toolfile.spec b/scram-tools.file/tools/mpfr-static/mpfr.xml
similarity index 58%
rename from mpfr-static-toolfile.spec
rename to scram-tools.file/tools/mpfr-static/mpfr.xml
index 45f999ee614..c54e7658af8 100644
--- a/mpfr-static-toolfile.spec
+++ b/scram-tools.file/tools/mpfr-static/mpfr.xml
@@ -1,13 +1,3 @@
-### RPM external mpfr-static-toolfile 1.0
-Requires: mpfr-static
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/mpfr.xml
@@ -16,6 +6,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/mpfr.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/mxnet-predict-toolfile.spec b/scram-tools.file/tools/mxnet-predict/mxnet-predict.xml
similarity index 63%
rename from mxnet-predict-toolfile.spec
rename to scram-tools.file/tools/mxnet-predict/mxnet-predict.xml
index 448e66fbbe9..d8a1962e2a5 100644
--- a/mxnet-predict-toolfile.spec
+++ b/scram-tools.file/tools/mxnet-predict/mxnet-predict.xml
@@ -1,13 +1,3 @@
-### RPM external mxnet-predict-toolfile 1.5.0
-Requires: mxnet-predict
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/mxnet-predict.xml
@@ -18,6 +8,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/mxnet-predict.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/numactl-toolfile.spec b/scram-tools.file/tools/numactl/numactl.xml
similarity index 68%
rename from numactl-toolfile.spec
rename to scram-tools.file/tools/numactl/numactl.xml
index 0a00f0803da..106d6e43872 100644
--- a/numactl-toolfile.spec
+++ b/scram-tools.file/tools/numactl/numactl.xml
@@ -1,13 +1,3 @@
-### RPM external numactl-toolfile 1.0
-Requires: numactl
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/numactl.xml
@@ -18,6 +8,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/numactl.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/onnxruntime-toolfile.spec b/scram-tools.file/tools/onnxruntime/onnxruntime.xml
similarity index 57%
rename from onnxruntime-toolfile.spec
rename to scram-tools.file/tools/onnxruntime/onnxruntime.xml
index 70683a0b05e..8bc7139ee3e 100644
--- a/onnxruntime-toolfile.spec
+++ b/scram-tools.file/tools/onnxruntime/onnxruntime.xml
@@ -1,13 +1,3 @@
-### RPM external onnxruntime-toolfile 1.0
-Requires: onnxruntime
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/onnxruntime.xml
@@ -16,12 +6,9 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/onnxruntime.xml
-%if "%{cmsos}" != "slc7_aarch64"
-
-
-%endif
+
+
+
+
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/opencl-cpp-toolfile.spec b/scram-tools.file/tools/opencl-cpp/opencl-cpp.xml
similarity index 56%
rename from opencl-cpp-toolfile.spec
rename to scram-tools.file/tools/opencl-cpp/opencl-cpp.xml
index 79f37ebc4b5..0d54963202e 100644
--- a/opencl-cpp-toolfile.spec
+++ b/scram-tools.file/tools/opencl-cpp/opencl-cpp.xml
@@ -1,17 +1,3 @@
-### RPM external opencl-cpp-toolfile 1.0
-
-Requires: opencl-cpp
-
-%prep
-# NOP
-
-%build
-# NOP
-
-%install
-
-mkdir -p %{i}/etc/scram.d
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/opencl-cpp.xml
@@ -20,6 +6,3 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/opencl-cpp.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/opencl-toolfile.spec b/scram-tools.file/tools/opencl/opencl.xml
similarity index 61%
rename from opencl-toolfile.spec
rename to scram-tools.file/tools/opencl/opencl.xml
index ba42d530962..3dc06ef3a84 100644
--- a/opencl-toolfile.spec
+++ b/scram-tools.file/tools/opencl/opencl.xml
@@ -1,17 +1,3 @@
-### RPM external opencl-toolfile 1.0
-
-Requires: opencl
-
-%prep
-# NOP
-
-%build
-# NOP
-
-%install
-
-mkdir -p %{i}/etc/scram.d
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/opencl.xml
@@ -21,6 +7,3 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/opencl.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/opencv-toolfile.spec b/scram-tools.file/tools/opencv/opencv.xml
similarity index 71%
rename from opencv-toolfile.spec
rename to scram-tools.file/tools/opencv/opencv.xml
index 367c8fe96ab..07760af4bce 100644
--- a/opencv-toolfile.spec
+++ b/scram-tools.file/tools/opencv/opencv.xml
@@ -1,13 +1,3 @@
-### RPM external opencv-toolfile 1.0
-Requires: opencv
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/opencv.xml
@@ -22,6 +12,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/opencv.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/openldap-toolfile.spec b/scram-tools.file/tools/openldap/openldap.xml
similarity index 52%
rename from openldap-toolfile.spec
rename to scram-tools.file/tools/openldap/openldap.xml
index 1bdeb55afc5..c7857eb967a 100644
--- a/openldap-toolfile.spec
+++ b/scram-tools.file/tools/openldap/openldap.xml
@@ -1,13 +1,3 @@
-### RPM external openldap-toolfile 1.0
-Requires: openldap
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/openldap.xml
@@ -15,6 +5,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/openldap.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/openloops-toolfile.spec b/scram-tools.file/tools/openloops/openloops.xml
similarity index 57%
rename from openloops-toolfile.spec
rename to scram-tools.file/tools/openloops/openloops.xml
index 805545ece77..46a9e2ba16f 100644
--- a/openloops-toolfile.spec
+++ b/scram-tools.file/tools/openloops/openloops.xml
@@ -1,13 +1,3 @@
-### RPM external openloops-toolfile 1.0
-Requires: openloops
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/openloops.xml
@@ -15,6 +5,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/openloops.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/openmpi-toolfile.spec b/scram-tools.file/tools/openmpi/openmpi.xml
similarity index 69%
rename from openmpi-toolfile.spec
rename to scram-tools.file/tools/openmpi/openmpi.xml
index a5eb073f48f..a93f0a46935 100644
--- a/openmpi-toolfile.spec
+++ b/scram-tools.file/tools/openmpi/openmpi.xml
@@ -1,14 +1,3 @@
-### RPM external openmpi-toolfile 1.0
-Requires: openmpi
-
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/openmpi.xml
@@ -20,6 +9,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/openmpi.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/oracle-fake-toolfile.spec b/scram-tools.file/tools/oracle-fake/oracle.xml
similarity index 58%
rename from oracle-fake-toolfile.spec
rename to scram-tools.file/tools/oracle-fake/oracle.xml
index 077d7ffc4ed..7aaa8850a08 100644
--- a/oracle-fake-toolfile.spec
+++ b/scram-tools.file/tools/oracle-fake/oracle.xml
@@ -1,14 +1,3 @@
-### RPM external oracle-fake-toolfile 2.0
-Requires: oracle-fake
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/oracle.xml
@OS_LIBS@
@@ -23,14 +12,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/oracle.xml
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/oracleocci.xml
-
-
-
-
-EOF_TOOLFILE
-
-export ORACLE_ENV_ROOT
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/oracle-fake/oracleocci.xml b/scram-tools.file/tools/oracle-fake/oracleocci.xml
new file mode 100644
index 00000000000..d71e5be62d9
--- /dev/null
+++ b/scram-tools.file/tools/oracle-fake/oracleocci.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/oracle-toolfile.spec b/scram-tools.file/tools/oracle/oracle.xml
similarity index 63%
rename from oracle-toolfile.spec
rename to scram-tools.file/tools/oracle/oracle.xml
index da5a9182f6d..50f18be4da9 100644
--- a/oracle-toolfile.spec
+++ b/scram-tools.file/tools/oracle/oracle.xml
@@ -1,14 +1,3 @@
-### RPM external oracle-toolfile 2.0
-Requires: oracle
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/oracle.xml
@OS_LIBS@
@@ -25,14 +14,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/oracle.xml
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/oracleocci.xml
-
-
-
-
-EOF_TOOLFILE
-
-export ORACLE_ENV_ROOT
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/oracle/oracleocci.xml b/scram-tools.file/tools/oracle/oracleocci.xml
new file mode 100644
index 00000000000..d71e5be62d9
--- /dev/null
+++ b/scram-tools.file/tools/oracle/oracleocci.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/pacparser-toolfile.spec b/scram-tools.file/tools/pacparser/pacparser.xml
similarity index 71%
rename from pacparser-toolfile.spec
rename to scram-tools.file/tools/pacparser/pacparser.xml
index 00b00a893f7..99332ea7096 100644
--- a/pacparser-toolfile.spec
+++ b/scram-tools.file/tools/pacparser/pacparser.xml
@@ -1,13 +1,3 @@
-### RPM external pacparser-toolfile 1.0
-Requires: pacparser
-%prep
-
-%build
-
-%install
-
-mkdir -p %{i}/etc/scram.d
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/pacparser.xml
@@ -20,6 +10,3 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/pacparser.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/pcm_util/pcm_util-toolfile.xml b/scram-tools.file/tools/pcm_util/pcm_util-toolfile.xml
new file mode 100644
index 00000000000..cc756174592
--- /dev/null
+++ b/scram-tools.file/tools/pcm_util/pcm_util-toolfile.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pcre-toolfile.spec b/scram-tools.file/tools/pcre/pcre.xml
similarity index 70%
rename from pcre-toolfile.spec
rename to scram-tools.file/tools/pcre/pcre.xml
index 27743d415d9..0691bbd1111 100644
--- a/pcre-toolfile.spec
+++ b/scram-tools.file/tools/pcre/pcre.xml
@@ -1,13 +1,3 @@
-### RPM external pcre-toolfile 1.0
-Requires: pcre
-%prep
-
-%build
-
-%install
-
-mkdir -p %{i}/etc/scram.d
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/pcre.xml
@@ -21,6 +11,3 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/pcre.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/pcre2/pcre2.xml b/scram-tools.file/tools/pcre2/pcre2.xml
new file mode 100644
index 00000000000..7f3acdaf270
--- /dev/null
+++ b/scram-tools.file/tools/pcre2/pcre2.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/photos/photos.xml b/scram-tools.file/tools/photos/photos.xml
new file mode 100644
index 00000000000..636110eca27
--- /dev/null
+++ b/scram-tools.file/tools/photos/photos.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/photos/photos_headers.xml b/scram-tools.file/tools/photos/photos_headers.xml
new file mode 100644
index 00000000000..3adba9ffaf9
--- /dev/null
+++ b/scram-tools.file/tools/photos/photos_headers.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/photospp-toolfile.spec b/scram-tools.file/tools/photospp/photospp.xml
similarity index 65%
rename from photospp-toolfile.spec
rename to scram-tools.file/tools/photospp/photospp.xml
index 46c1f0c599c..e158cf8a61c 100644
--- a/photospp-toolfile.spec
+++ b/scram-tools.file/tools/photospp/photospp.xml
@@ -1,13 +1,3 @@
-### RPM external photospp-toolfile 4.0
-Requires: photospp
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/photospp.xml
@@ -19,6 +9,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/photospp.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/professor2-toolfile.spec b/scram-tools.file/tools/professor2/professor2.xml
similarity index 62%
rename from professor2-toolfile.spec
rename to scram-tools.file/tools/professor2/professor2.xml
index 047be7ff11c..e0bea32c0ce 100644
--- a/professor2-toolfile.spec
+++ b/scram-tools.file/tools/professor2/professor2.xml
@@ -1,13 +1,3 @@
-### RPM external professor2-toolfile 2.0
-Requires: professor2
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/professor2.xml
@@ -19,6 +9,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/professor2.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/protobuf-toolfile.spec b/scram-tools.file/tools/protobuf/protobuf.xml
similarity index 72%
rename from protobuf-toolfile.spec
rename to scram-tools.file/tools/protobuf/protobuf.xml
index e2388470868..832b0469eca 100644
--- a/protobuf-toolfile.spec
+++ b/scram-tools.file/tools/protobuf/protobuf.xml
@@ -1,13 +1,3 @@
-### RPM external protobuf-toolfile 1.0
-Requires: protobuf
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/protobuf.xml
@@ -20,6 +10,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/protobuf.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/py3-dxr-toolfile.spec b/scram-tools.file/tools/py3-dxr/py3-dxr.xml
similarity index 56%
rename from py3-dxr-toolfile.spec
rename to scram-tools.file/tools/py3-dxr/py3-dxr.xml
index 41f3ba13207..c68bab290b2 100644
--- a/py3-dxr-toolfile.spec
+++ b/scram-tools.file/tools/py3-dxr/py3-dxr.xml
@@ -1,14 +1,3 @@
-### RPM external py3-dxr-toolfile 1.0
-Requires: py3-dxr
-
-%prep
-
-%build
-
-%install
-
-mkdir -p %{i}/etc/scram.d
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/py3-dxr.xml
@@ -16,6 +5,3 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/py3-dxr.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/py3-numpy/numpy-c-api.xml b/scram-tools.file/tools/py3-numpy/numpy-c-api.xml
new file mode 100644
index 00000000000..49c02dbc0cd
--- /dev/null
+++ b/scram-tools.file/tools/py3-numpy/numpy-c-api.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/py3-numpy/py3-numpy.xml b/scram-tools.file/tools/py3-numpy/py3-numpy.xml
new file mode 100644
index 00000000000..392849704be
--- /dev/null
+++ b/scram-tools.file/tools/py3-numpy/py3-numpy.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/py3-pybind11-toolfile.spec b/scram-tools.file/tools/py3-pybind11/py3-pybind11.xml
similarity index 50%
rename from py3-pybind11-toolfile.spec
rename to scram-tools.file/tools/py3-pybind11/py3-pybind11.xml
index bd737497c48..1a9e2b7097e 100644
--- a/py3-pybind11-toolfile.spec
+++ b/scram-tools.file/tools/py3-pybind11/py3-pybind11.xml
@@ -1,22 +1,6 @@
-### RPM external py3-pybind11-toolfile 1.0
-Requires: py3-pybind11
-
-%prep
-
-%build
-
-%install
-
-mkdir -p %{i}/etc/scram.d
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/py3-pybind11.xml
-EOF_TOOLFILE
-
-export PYTHON3_LIB_SITE_PACKAGES
-
-## IMPORT scram-tools-post
diff --git a/pyquen-toolfile.spec b/scram-tools.file/tools/pyquen/pyquen.xml
similarity index 58%
rename from pyquen-toolfile.spec
rename to scram-tools.file/tools/pyquen/pyquen.xml
index 7965ad73d14..b7a84454988 100644
--- a/pyquen-toolfile.spec
+++ b/scram-tools.file/tools/pyquen/pyquen.xml
@@ -1,13 +1,3 @@
-### RPM external pyquen-toolfile 1.0
-Requires: pyquen
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/pyquen.xml
@@ -17,6 +7,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/pyquen.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/pythia6/pydata.xml b/scram-tools.file/tools/pythia6/pydata.xml
new file mode 100644
index 00000000000..f0801817b93
--- /dev/null
+++ b/scram-tools.file/tools/pythia6/pydata.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/pythia6/pythia6.xml b/scram-tools.file/tools/pythia6/pythia6.xml
new file mode 100644
index 00000000000..cf6a63640a7
--- /dev/null
+++ b/scram-tools.file/tools/pythia6/pythia6.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/pythia6/pythia6_headers.xml b/scram-tools.file/tools/pythia6/pythia6_headers.xml
new file mode 100644
index 00000000000..0086b8ce700
--- /dev/null
+++ b/scram-tools.file/tools/pythia6/pythia6_headers.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/pythia8-toolfile.spec b/scram-tools.file/tools/pythia8/pythia8.xml
similarity index 74%
rename from pythia8-toolfile.spec
rename to scram-tools.file/tools/pythia8/pythia8.xml
index 68a729032d5..57d1cf40482 100644
--- a/pythia8-toolfile.spec
+++ b/scram-tools.file/tools/pythia8/pythia8.xml
@@ -1,13 +1,3 @@
-### RPM external pythia8-toolfile 1.0
-Requires: pythia8
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/pythia8.xml
@@ -23,6 +13,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/pythia8.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/python/env.sh b/scram-tools.file/tools/python/env.sh
new file mode 100644
index 00000000000..9bc684215b5
--- /dev/null
+++ b/scram-tools.file/tools/python/env.sh
@@ -0,0 +1 @@
+export PYTHONV=$(python -V 2>&1 | awk '{print $2}' | cut -f1,2 -d.)
diff --git a/python-toolfile.spec b/scram-tools.file/tools/python/python.xml
similarity index 65%
rename from python-toolfile.spec
rename to scram-tools.file/tools/python/python.xml
index b0b6df64b18..83bbfc4b9be 100644
--- a/python-toolfile.spec
+++ b/scram-tools.file/tools/python/python.xml
@@ -1,20 +1,10 @@
-### RPM external python-toolfile 1.0
-Requires: python
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/python.xml
-
-
+
+
@@ -22,8 +12,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/python.xml
-EOF_TOOLFILE
-
-export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
-
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/python3/env.sh b/scram-tools.file/tools/python3/env.sh
new file mode 100644
index 00000000000..1cc6b79db79
--- /dev/null
+++ b/scram-tools.file/tools/python3/env.sh
@@ -0,0 +1 @@
+export PYTHON3V=$(python3 -V 2>&1 | awk '{print $2}' | cut -f1,2 -d.)
diff --git a/python3-toolfile.spec b/scram-tools.file/tools/python3/python3.xml
similarity index 55%
rename from python3-toolfile.spec
rename to scram-tools.file/tools/python3/python3.xml
index 8e926d7f722..b9b602a9732 100644
--- a/python3-toolfile.spec
+++ b/scram-tools.file/tools/python3/python3.xml
@@ -1,26 +1,11 @@
-### RPM external python3-toolfile 1.0
-Requires: python3
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/python3.xml
-
-
+
+
-EOF_TOOLFILE
-
-export PYTHON3V=$(echo $PYTHON3_VERSION | cut -f1,2 -d.)
-
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/python_tools/python_tools.xml b/scram-tools.file/tools/python_tools/python_tools.xml
new file mode 100644
index 00000000000..17e0e3661ae
--- /dev/null
+++ b/scram-tools.file/tools/python_tools/python_tools.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/scram-tools.file/tools/qd/qd.xml b/scram-tools.file/tools/qd/qd.xml
new file mode 100644
index 00000000000..26eb38520ec
--- /dev/null
+++ b/scram-tools.file/tools/qd/qd.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/qd/qd_f_main.xml b/scram-tools.file/tools/qd/qd_f_main.xml
new file mode 100644
index 00000000000..fe6856678d0
--- /dev/null
+++ b/scram-tools.file/tools/qd/qd_f_main.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/rivet-toolfile.spec b/scram-tools.file/tools/rivet/rivet.xml
similarity index 52%
rename from rivet-toolfile.spec
rename to scram-tools.file/tools/rivet/rivet.xml
index 9ae7797fce3..b1723d487f8 100644
--- a/rivet-toolfile.spec
+++ b/scram-tools.file/tools/rivet/rivet.xml
@@ -1,28 +1,9 @@
-### RPM external rivet-toolfile 1.0
-%define base_package %(echo %{n} | sed 's|-toolfile||')
-%define base_package_uc %(echo %{base_package} | tr '[a-z-]' '[A-Z_]')
-%{expand:%(for v in %{package_vectorization}; do echo Requires: %{base_package}_$v; done)}
-Requires: %{base_package}
-
-%prep
-
-%build
-
-%install
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/rivet.xml
-EOF_TOOLFILE
-for v in $(echo %{package_vectorization} | tr '[a-z-]' '[A-Z_]') ; do
- r=`eval echo \\$%{base_package_uc}_${v}_ROOT`
- echo " " >> %i/etc/scram.d/rivet.xml
-done
-cat << \EOF_TOOLFILE >>%i/etc/scram.d/rivet.xml
@@ -36,8 +17,3 @@ cat << \EOF_TOOLFILE >>%i/etc/scram.d/rivet.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
-
-
diff --git a/scram-tools.file/tools/rivet/vectorized.tmpl b/scram-tools.file/tools/rivet/vectorized.tmpl
new file mode 100644
index 00000000000..84ec8d3f409
--- /dev/null
+++ b/scram-tools.file/tools/rivet/vectorized.tmpl
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/env.sh b/scram-tools.file/tools/root/env.sh
new file mode 100644
index 00000000000..f3c368c778f
--- /dev/null
+++ b/scram-tools.file/tools/root/env.sh
@@ -0,0 +1,3 @@
+ROOT_GX11_LIB=GX11
+[ $(uname -s) = "Darwin" ] && ROOT_GX11_LIB=GCocoa
+export ROOT_GX11_LIB
diff --git a/scram-tools.file/tools/root/histfactory.xml b/scram-tools.file/tools/root/histfactory.xml
new file mode 100644
index 00000000000..77f818843f6
--- /dev/null
+++ b/scram-tools.file/tools/root/histfactory.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/roofit.xml b/scram-tools.file/tools/root/roofit.xml
new file mode 100644
index 00000000000..1e664cd0b6b
--- /dev/null
+++ b/scram-tools.file/tools/root/roofit.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/roofitcore.xml b/scram-tools.file/tools/root/roofitcore.xml
new file mode 100644
index 00000000000..c7d82b251ca
--- /dev/null
+++ b/scram-tools.file/tools/root/roofitcore.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/roostats.xml b/scram-tools.file/tools/root/roostats.xml
new file mode 100644
index 00000000000..1486f72af4c
--- /dev/null
+++ b/scram-tools.file/tools/root/roostats.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/root.xml b/scram-tools.file/tools/root/root.xml
new file mode 100644
index 00000000000..c3bf11c4fe7
--- /dev/null
+++ b/scram-tools.file/tools/root/root.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/root_interface.xml b/scram-tools.file/tools/root/root_interface.xml
new file mode 100644
index 00000000000..caa29aa1e41
--- /dev/null
+++ b/scram-tools.file/tools/root/root_interface.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootcling.xml b/scram-tools.file/tools/root/rootcling.xml
new file mode 100644
index 00000000000..fdbc4701b5c
--- /dev/null
+++ b/scram-tools.file/tools/root/rootcling.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootcore.xml b/scram-tools.file/tools/root/rootcore.xml
new file mode 100644
index 00000000000..bd12a2db137
--- /dev/null
+++ b/scram-tools.file/tools/root/rootcore.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootdataframe.xml b/scram-tools.file/tools/root/rootdataframe.xml
new file mode 100644
index 00000000000..cc5d61bf6be
--- /dev/null
+++ b/scram-tools.file/tools/root/rootdataframe.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rooteg.xml b/scram-tools.file/tools/root/rooteg.xml
new file mode 100644
index 00000000000..2c3402af838
--- /dev/null
+++ b/scram-tools.file/tools/root/rooteg.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rooteve.xml b/scram-tools.file/tools/root/rooteve.xml
new file mode 100644
index 00000000000..c3e35ca4477
--- /dev/null
+++ b/scram-tools.file/tools/root/rooteve.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootfoam.xml b/scram-tools.file/tools/root/rootfoam.xml
new file mode 100644
index 00000000000..23fc581d104
--- /dev/null
+++ b/scram-tools.file/tools/root/rootfoam.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootged.xml b/scram-tools.file/tools/root/rootged.xml
new file mode 100644
index 00000000000..0d87bf72d83
--- /dev/null
+++ b/scram-tools.file/tools/root/rootged.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootgeom.xml b/scram-tools.file/tools/root/rootgeom.xml
new file mode 100644
index 00000000000..6071de7282f
--- /dev/null
+++ b/scram-tools.file/tools/root/rootgeom.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootgeompainter.xml b/scram-tools.file/tools/root/rootgeompainter.xml
new file mode 100644
index 00000000000..61069bdaf73
--- /dev/null
+++ b/scram-tools.file/tools/root/rootgeompainter.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootglew.xml b/scram-tools.file/tools/root/rootglew.xml
new file mode 100644
index 00000000000..ae034b01cad
--- /dev/null
+++ b/scram-tools.file/tools/root/rootglew.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootgpad.xml b/scram-tools.file/tools/root/rootgpad.xml
new file mode 100644
index 00000000000..ff00a33d634
--- /dev/null
+++ b/scram-tools.file/tools/root/rootgpad.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootgraphics.xml b/scram-tools.file/tools/root/rootgraphics.xml
new file mode 100644
index 00000000000..e57ac000541
--- /dev/null
+++ b/scram-tools.file/tools/root/rootgraphics.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootgui.xml b/scram-tools.file/tools/root/rootgui.xml
new file mode 100644
index 00000000000..5207e8b9c52
--- /dev/null
+++ b/scram-tools.file/tools/root/rootgui.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootguihtml.xml b/scram-tools.file/tools/root/rootguihtml.xml
new file mode 100644
index 00000000000..c7ce8c01480
--- /dev/null
+++ b/scram-tools.file/tools/root/rootguihtml.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/roothistmatrix.xml b/scram-tools.file/tools/root/roothistmatrix.xml
new file mode 100644
index 00000000000..4a4efb56925
--- /dev/null
+++ b/scram-tools.file/tools/root/roothistmatrix.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/roothistpainter.xml b/scram-tools.file/tools/root/roothistpainter.xml
new file mode 100644
index 00000000000..5dcdf01efc2
--- /dev/null
+++ b/scram-tools.file/tools/root/roothistpainter.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/roothtml.xml b/scram-tools.file/tools/root/roothtml.xml
new file mode 100644
index 00000000000..c41322ad036
--- /dev/null
+++ b/scram-tools.file/tools/root/roothtml.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootimt.xml b/scram-tools.file/tools/root/rootimt.xml
new file mode 100644
index 00000000000..ef884989e92
--- /dev/null
+++ b/scram-tools.file/tools/root/rootimt.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootinteractive.xml b/scram-tools.file/tools/root/rootinteractive.xml
new file mode 100644
index 00000000000..ee532012f71
--- /dev/null
+++ b/scram-tools.file/tools/root/rootinteractive.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootmath.xml b/scram-tools.file/tools/root/rootmath.xml
new file mode 100644
index 00000000000..e8cdfef39bd
--- /dev/null
+++ b/scram-tools.file/tools/root/rootmath.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootmathcore.xml b/scram-tools.file/tools/root/rootmathcore.xml
new file mode 100644
index 00000000000..ed197be678b
--- /dev/null
+++ b/scram-tools.file/tools/root/rootmathcore.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootminuit.xml b/scram-tools.file/tools/root/rootminuit.xml
new file mode 100644
index 00000000000..736ed17b9dd
--- /dev/null
+++ b/scram-tools.file/tools/root/rootminuit.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootminuit2.xml b/scram-tools.file/tools/root/rootminuit2.xml
new file mode 100644
index 00000000000..36557761ab3
--- /dev/null
+++ b/scram-tools.file/tools/root/rootminuit2.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootmlp.xml b/scram-tools.file/tools/root/rootmlp.xml
new file mode 100644
index 00000000000..bdbf186b790
--- /dev/null
+++ b/scram-tools.file/tools/root/rootmlp.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootntuple.xml b/scram-tools.file/tools/root/rootntuple.xml
new file mode 100644
index 00000000000..9f5fa6b37dc
--- /dev/null
+++ b/scram-tools.file/tools/root/rootntuple.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootphysics.xml b/scram-tools.file/tools/root/rootphysics.xml
new file mode 100644
index 00000000000..3c26cff863c
--- /dev/null
+++ b/scram-tools.file/tools/root/rootphysics.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootpy.xml b/scram-tools.file/tools/root/rootpy.xml
new file mode 100644
index 00000000000..5bdc2febb4f
--- /dev/null
+++ b/scram-tools.file/tools/root/rootpy.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootpymva.xml b/scram-tools.file/tools/root/rootpymva.xml
new file mode 100644
index 00000000000..582e1ded97e
--- /dev/null
+++ b/scram-tools.file/tools/root/rootpymva.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootrflx.xml b/scram-tools.file/tools/root/rootrflx.xml
new file mode 100644
index 00000000000..fe93607a1c4
--- /dev/null
+++ b/scram-tools.file/tools/root/rootrflx.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootrgl.xml b/scram-tools.file/tools/root/rootrgl.xml
new file mode 100644
index 00000000000..774a2473517
--- /dev/null
+++ b/scram-tools.file/tools/root/rootrgl.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootrint.xml b/scram-tools.file/tools/root/rootrint.xml
new file mode 100644
index 00000000000..13b379f36df
--- /dev/null
+++ b/scram-tools.file/tools/root/rootrint.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootrio.xml b/scram-tools.file/tools/root/rootrio.xml
new file mode 100644
index 00000000000..62494ff43c9
--- /dev/null
+++ b/scram-tools.file/tools/root/rootrio.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootsmatrix.xml b/scram-tools.file/tools/root/rootsmatrix.xml
new file mode 100644
index 00000000000..7ff6a3f5509
--- /dev/null
+++ b/scram-tools.file/tools/root/rootsmatrix.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootspectrum.xml b/scram-tools.file/tools/root/rootspectrum.xml
new file mode 100644
index 00000000000..52084040643
--- /dev/null
+++ b/scram-tools.file/tools/root/rootspectrum.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootthread.xml b/scram-tools.file/tools/root/rootthread.xml
new file mode 100644
index 00000000000..9b60aba2b8a
--- /dev/null
+++ b/scram-tools.file/tools/root/rootthread.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/roottmva.xml b/scram-tools.file/tools/root/roottmva.xml
new file mode 100644
index 00000000000..eefb921d608
--- /dev/null
+++ b/scram-tools.file/tools/root/roottmva.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootvecops.xml b/scram-tools.file/tools/root/rootvecops.xml
new file mode 100644
index 00000000000..fcbbd965731
--- /dev/null
+++ b/scram-tools.file/tools/root/rootvecops.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootx11.xml b/scram-tools.file/tools/root/rootx11.xml
new file mode 100644
index 00000000000..0a7248b95ad
--- /dev/null
+++ b/scram-tools.file/tools/root/rootx11.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootxml.xml b/scram-tools.file/tools/root/rootxml.xml
new file mode 100644
index 00000000000..f787a1765a3
--- /dev/null
+++ b/scram-tools.file/tools/root/rootxml.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/root/rootxmlio.xml b/scram-tools.file/tools/root/rootxmlio.xml
new file mode 100644
index 00000000000..dac990816dd
--- /dev/null
+++ b/scram-tools.file/tools/root/rootxmlio.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/sherpa-toolfile.spec b/scram-tools.file/tools/sherpa/sherpa.xml
similarity index 79%
rename from sherpa-toolfile.spec
rename to scram-tools.file/tools/sherpa/sherpa.xml
index 5c43ca6d9cc..279dc62e853 100644
--- a/sherpa-toolfile.spec
+++ b/scram-tools.file/tools/sherpa/sherpa.xml
@@ -1,14 +1,3 @@
-### RPM external sherpa-toolfile 2.0
-Requires: sherpa
-
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/sherpa.xml
@@ -32,12 +21,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/sherpa.xml
-%ifos linux
-%ifnarch ppc64le
-
-%endif
-%endif
+
+
+
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/sigcpp-toolfile.spec b/scram-tools.file/tools/sigcpp/sigcpp.xml
similarity index 67%
rename from sigcpp-toolfile.spec
rename to scram-tools.file/tools/sigcpp/sigcpp.xml
index d1bf50b9447..380376d2a5d 100644
--- a/sigcpp-toolfile.spec
+++ b/scram-tools.file/tools/sigcpp/sigcpp.xml
@@ -1,13 +1,3 @@
-### RPM external sigcpp-toolfile 1.0
-Requires: sigcpp
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/sigcpp.xml
@@ -18,6 +8,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/sigcpp.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/sloccount-toolfile.spec b/scram-tools.file/tools/sloccount/sloccount.xml
similarity index 57%
rename from sloccount-toolfile.spec
rename to scram-tools.file/tools/sloccount/sloccount.xml
index 97cf433b39c..b30695b4ce5 100644
--- a/sloccount-toolfile.spec
+++ b/scram-tools.file/tools/sloccount/sloccount.xml
@@ -1,11 +1,3 @@
-### RPM external sloccount-toolfile 1.0
-Requires: sloccount
-
-%prep
-%build
-%install
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE > %i/etc/scram.d/sloccount.xml
@@ -13,5 +5,3 @@ cat << \EOF_TOOLFILE > %i/etc/scram.d/sloccount.xml
-EOF_TOOLFILE
-## IMPORT scram-tools-post
diff --git a/sqlite-toolfile.spec b/scram-tools.file/tools/sqlite/sqlite.xml
similarity index 72%
rename from sqlite-toolfile.spec
rename to scram-tools.file/tools/sqlite/sqlite.xml
index c9cc5fea902..918080a63a3 100644
--- a/sqlite-toolfile.spec
+++ b/scram-tools.file/tools/sqlite/sqlite.xml
@@ -1,13 +1,3 @@
-### RPM external sqlite-toolfile 1.0
-Requires: sqlite
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/sqlite.xml
@@ -20,6 +10,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/sqlite.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/starlight-toolfile.spec b/scram-tools.file/tools/starlight/starlight.xml
similarity index 70%
rename from starlight-toolfile.spec
rename to scram-tools.file/tools/starlight/starlight.xml
index 654318e9a6c..71f182acdae 100644
--- a/starlight-toolfile.spec
+++ b/scram-tools.file/tools/starlight/starlight.xml
@@ -1,13 +1,3 @@
-### RPM external starlight-toolfile 1.0
-Requires: starlight
-
-%prep
-
-%build
-
-%install
-mkdir -p %{i}/etc/scram.d
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/starlight.xml
@@ -20,6 +10,3 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/starlight.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/systemtools/env.sh b/scram-tools.file/tools/systemtools/env.sh
new file mode 100644
index 00000000000..f2ac0444abf
--- /dev/null
+++ b/scram-tools.file/tools/systemtools/env.sh
@@ -0,0 +1 @@
+export GCC_ROOT=$(which gcc | sed -e 's|/bin/gcc||')
diff --git a/scram-tools.file/tools/systemtools/opengl.xml b/scram-tools.file/tools/systemtools/opengl.xml
new file mode 100644
index 00000000000..132d5530bbd
--- /dev/null
+++ b/scram-tools.file/tools/systemtools/opengl.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/systemtools/openssl.xml b/scram-tools.file/tools/systemtools/openssl.xml
new file mode 100644
index 00000000000..58eec578316
--- /dev/null
+++ b/scram-tools.file/tools/systemtools/openssl.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/scram-tools.file/tools/systemtools/root_cxxdefaults.xml b/scram-tools.file/tools/systemtools/root_cxxdefaults.xml
new file mode 100644
index 00000000000..eefd924a0fd
--- /dev/null
+++ b/scram-tools.file/tools/systemtools/root_cxxdefaults.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/systemtools/sockets.xml b/scram-tools.file/tools/systemtools/sockets.xml
new file mode 100644
index 00000000000..a5703241c05
--- /dev/null
+++ b/scram-tools.file/tools/systemtools/sockets.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/systemtools/x11.xml b/scram-tools.file/tools/systemtools/x11.xml
new file mode 100644
index 00000000000..253cdd2bc15
--- /dev/null
+++ b/scram-tools.file/tools/systemtools/x11.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/scram-tools.file/tools/tauola/tauola.xml b/scram-tools.file/tools/tauola/tauola.xml
new file mode 100644
index 00000000000..bf3a3801bd8
--- /dev/null
+++ b/scram-tools.file/tools/tauola/tauola.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/tauola/tauola_headers.xml b/scram-tools.file/tools/tauola/tauola_headers.xml
new file mode 100644
index 00000000000..2f8a2c528aa
--- /dev/null
+++ b/scram-tools.file/tools/tauola/tauola_headers.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/tauolapp-toolfile.spec b/scram-tools.file/tools/tauolapp/tauolapp.xml
similarity index 75%
rename from tauolapp-toolfile.spec
rename to scram-tools.file/tools/tauolapp/tauolapp.xml
index d4a8056c6d5..a524e040fb1 100644
--- a/tauolapp-toolfile.spec
+++ b/scram-tools.file/tools/tauolapp/tauolapp.xml
@@ -1,13 +1,3 @@
-### RPM external tauolapp-toolfile 1.1.8
-Requires: tauolapp
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/tauolapp.xml
@@ -26,8 +16,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/tauolapp.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
-
-
diff --git a/scram-tools.file/tools/tbb/env.sh b/scram-tools.file/tools/tbb/env.sh
new file mode 100644
index 00000000000..a99188129f0
--- /dev/null
+++ b/scram-tools.file/tools/tbb/env.sh
@@ -0,0 +1 @@
+export GCC_GLIBCXX_VERSION=$(gcc -dumpversion | tr '.' '0')
diff --git a/scram-tools.file/tools/tbb/tbb.xml b/scram-tools.file/tools/tbb/tbb.xml
new file mode 100644
index 00000000000..7ae5df56730
--- /dev/null
+++ b/scram-tools.file/tools/tbb/tbb.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/tbb/tbbbind.xml b/scram-tools.file/tools/tbb/tbbbind.xml
new file mode 100644
index 00000000000..98ec0ca3c56
--- /dev/null
+++ b/scram-tools.file/tools/tbb/tbbbind.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/tensorflow/tensorflow-c.xml b/scram-tools.file/tools/tensorflow/tensorflow-c.xml
new file mode 100644
index 00000000000..bb8d141091b
--- /dev/null
+++ b/scram-tools.file/tools/tensorflow/tensorflow-c.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/tensorflow/tensorflow-cc.xml b/scram-tools.file/tools/tensorflow/tensorflow-cc.xml
new file mode 100644
index 00000000000..dad23922114
--- /dev/null
+++ b/scram-tools.file/tools/tensorflow/tensorflow-cc.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/tensorflow/tensorflow-executable_run_options.xml b/scram-tools.file/tools/tensorflow/tensorflow-executable_run_options.xml
new file mode 100644
index 00000000000..3dea8d486b6
--- /dev/null
+++ b/scram-tools.file/tools/tensorflow/tensorflow-executable_run_options.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/scram-tools.file/tools/tensorflow/tensorflow-framework.xml b/scram-tools.file/tools/tensorflow/tensorflow-framework.xml
new file mode 100644
index 00000000000..9c7b8806431
--- /dev/null
+++ b/scram-tools.file/tools/tensorflow/tensorflow-framework.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/tensorflow/tensorflow-runtime.xml b/scram-tools.file/tools/tensorflow/tensorflow-runtime.xml
new file mode 100644
index 00000000000..6eaedc369ec
--- /dev/null
+++ b/scram-tools.file/tools/tensorflow/tensorflow-runtime.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/scram-tools.file/tools/tensorflow/tensorflow-tf2xla.xml b/scram-tools.file/tools/tensorflow/tensorflow-tf2xla.xml
new file mode 100644
index 00000000000..400050054bb
--- /dev/null
+++ b/scram-tools.file/tools/tensorflow/tensorflow-tf2xla.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/scram-tools.file/tools/tensorflow/tensorflow-xla_compiled_cpu_function.xml b/scram-tools.file/tools/tensorflow/tensorflow-xla_compiled_cpu_function.xml
new file mode 100644
index 00000000000..bd77eef2d38
--- /dev/null
+++ b/scram-tools.file/tools/tensorflow/tensorflow-xla_compiled_cpu_function.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/scram-tools.file/tools/tensorflow/tensorflow.xml b/scram-tools.file/tools/tensorflow/tensorflow.xml
new file mode 100644
index 00000000000..5cdd52deef3
--- /dev/null
+++ b/scram-tools.file/tools/tensorflow/tensorflow.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/tensorflow/vectorized.tmpl b/scram-tools.file/tools/tensorflow/vectorized.tmpl
new file mode 100644
index 00000000000..e15393d6f6a
--- /dev/null
+++ b/scram-tools.file/tools/tensorflow/vectorized.tmpl
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/thepeg-toolfile.spec b/scram-tools.file/tools/thepeg/thepeg.xml
similarity index 73%
rename from thepeg-toolfile.spec
rename to scram-tools.file/tools/thepeg/thepeg.xml
index 57f0615335e..3fe4cec081e 100644
--- a/thepeg-toolfile.spec
+++ b/scram-tools.file/tools/thepeg/thepeg.xml
@@ -1,13 +1,3 @@
-### RPM external thepeg-toolfile 2.1
-Requires: thepeg
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/thepeg.xml
@@ -22,7 +12,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/thepeg.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
-
diff --git a/tinyxml2-toolfile.spec b/scram-tools.file/tools/tinyxml2/tinyxml2.xml
similarity index 68%
rename from tinyxml2-toolfile.spec
rename to scram-tools.file/tools/tinyxml2/tinyxml2.xml
index 1c60c22a182..2562d2a7153 100644
--- a/tinyxml2-toolfile.spec
+++ b/scram-tools.file/tools/tinyxml2/tinyxml2.xml
@@ -1,11 +1,3 @@
-### RPM external tinyxml2-toolfile 1.0
-Requires: tinyxml2
-
-%prep
-%build
-%install
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/tinyxml2.xml
@@ -16,7 +8,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/tinyxml2.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
-
diff --git a/tkonlinesw-toolfile.spec b/scram-tools.file/tools/tkonlinesw-fake/tkonlinesw.xml
similarity index 50%
rename from tkonlinesw-toolfile.spec
rename to scram-tools.file/tools/tkonlinesw-fake/tkonlinesw.xml
index 1cf912f3e29..42af24c63e7 100644
--- a/tkonlinesw-toolfile.spec
+++ b/scram-tools.file/tools/tkonlinesw-fake/tkonlinesw.xml
@@ -1,13 +1,3 @@
-### RPM external tkonlinesw-toolfile 1.0
-Requires: tkonlinesw
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/tkonlinesw.xml
@@ -22,17 +12,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/tkonlinesw.xml
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/tkonlineswdb.xml
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/tkonlinesw-fake/tkonlineswdb.xml b/scram-tools.file/tools/tkonlinesw-fake/tkonlineswdb.xml
new file mode 100644
index 00000000000..6f864403121
--- /dev/null
+++ b/scram-tools.file/tools/tkonlinesw-fake/tkonlineswdb.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/tkonlinesw/tkonlinesw.xml b/scram-tools.file/tools/tkonlinesw/tkonlinesw.xml
new file mode 100644
index 00000000000..42af24c63e7
--- /dev/null
+++ b/scram-tools.file/tools/tkonlinesw/tkonlinesw.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/tkonlinesw/tkonlineswdb.xml b/scram-tools.file/tools/tkonlinesw/tkonlineswdb.xml
new file mode 100644
index 00000000000..6f864403121
--- /dev/null
+++ b/scram-tools.file/tools/tkonlinesw/tkonlineswdb.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/toprex/toprex.xml b/scram-tools.file/tools/toprex/toprex.xml
new file mode 100644
index 00000000000..ec7a77fd723
--- /dev/null
+++ b/scram-tools.file/tools/toprex/toprex.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/toprex/toprex_headers.xml b/scram-tools.file/tools/toprex/toprex_headers.xml
new file mode 100644
index 00000000000..7b0de660589
--- /dev/null
+++ b/scram-tools.file/tools/toprex/toprex_headers.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/triton-inference-client-toolfile.spec b/scram-tools.file/tools/triton-inference-client/triton-inference-client.xml
similarity index 66%
rename from triton-inference-client-toolfile.spec
rename to scram-tools.file/tools/triton-inference-client/triton-inference-client.xml
index 33148fa7915..8b36594b337 100644
--- a/triton-inference-client-toolfile.spec
+++ b/scram-tools.file/tools/triton-inference-client/triton-inference-client.xml
@@ -1,13 +1,3 @@
-### RPM external triton-inference-client-toolfile 1.0
-Requires: triton-inference-client
-
-%prep
-
-%build
-
-%install
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/triton-inference-client.xml
@@ -20,6 +10,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/triton-inference-client.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/triton-inference-server/triton-inference-server.xml b/scram-tools.file/tools/triton-inference-server/triton-inference-server.xml
new file mode 100644
index 00000000000..a34d4b3d6a7
--- /dev/null
+++ b/scram-tools.file/tools/triton-inference-server/triton-inference-server.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ucx-toolfile.spec b/scram-tools.file/tools/ucx/ucx.xml
similarity index 68%
rename from ucx-toolfile.spec
rename to scram-tools.file/tools/ucx/ucx.xml
index 874373f3fa7..e525cb5da81 100644
--- a/ucx-toolfile.spec
+++ b/scram-tools.file/tools/ucx/ucx.xml
@@ -1,13 +1,3 @@
-### RPM external ucx-toolfile 1.0
-Requires: ucx
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/ucx.xml
@@ -20,6 +10,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/ucx.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/utm-toolfile.spec b/scram-tools.file/tools/utm/utm.xml
similarity index 74%
rename from utm-toolfile.spec
rename to scram-tools.file/tools/utm/utm.xml
index 79e694d3710..451294f1670 100644
--- a/utm-toolfile.spec
+++ b/scram-tools.file/tools/utm/utm.xml
@@ -1,13 +1,3 @@
-### RPM external utm-toolfile 1.1
-Requires: utm
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/utm.xml
@@ -23,6 +13,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/utm.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/valgrind-toolfile.spec b/scram-tools.file/tools/valgrind/valgrind.xml
similarity index 69%
rename from valgrind-toolfile.spec
rename to scram-tools.file/tools/valgrind/valgrind.xml
index ed15433d49e..c2eafc53fdd 100644
--- a/valgrind-toolfile.spec
+++ b/scram-tools.file/tools/valgrind/valgrind.xml
@@ -1,13 +1,3 @@
-### RPM external valgrind-toolfile 1.0
-Requires: valgrind
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/valgrind.xml
@@ -18,6 +8,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/valgrind.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/vdt/vdt.xml b/scram-tools.file/tools/vdt/vdt.xml
new file mode 100644
index 00000000000..5dc646e6aa6
--- /dev/null
+++ b/scram-tools.file/tools/vdt/vdt.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/vdt/vdt_headers.xml b/scram-tools.file/tools/vdt/vdt_headers.xml
new file mode 100644
index 00000000000..04cd0131f44
--- /dev/null
+++ b/scram-tools.file/tools/vdt/vdt_headers.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/vecgeom/vecgeom.xml b/scram-tools.file/tools/vecgeom/vecgeom.xml
new file mode 100644
index 00000000000..d66a3f63229
--- /dev/null
+++ b/scram-tools.file/tools/vecgeom/vecgeom.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/vecgeom/vecgeom_interface.xml b/scram-tools.file/tools/vecgeom/vecgeom_interface.xml
new file mode 100644
index 00000000000..8e2a077760e
--- /dev/null
+++ b/scram-tools.file/tools/vecgeom/vecgeom_interface.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/vecgeom/vectorized.tmpl b/scram-tools.file/tools/vecgeom/vectorized.tmpl
new file mode 100644
index 00000000000..cb4880d41c2
--- /dev/null
+++ b/scram-tools.file/tools/vecgeom/vectorized.tmpl
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/xerces-c-toolfile.spec b/scram-tools.file/tools/xerces-c/xerces-c.xml
similarity index 69%
rename from xerces-c-toolfile.spec
rename to scram-tools.file/tools/xerces-c/xerces-c.xml
index 1392ff93f22..08ef028e85d 100644
--- a/xerces-c-toolfile.spec
+++ b/scram-tools.file/tools/xerces-c/xerces-c.xml
@@ -1,13 +1,3 @@
-### RPM external xerces-c-toolfile 1.0
-Requires: xerces-c
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/xerces-c.xml
@@ -19,6 +9,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/xerces-c.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/xgboost-toolfile.spec b/scram-tools.file/tools/xgboost/xgboost.xml
similarity index 70%
rename from xgboost-toolfile.spec
rename to scram-tools.file/tools/xgboost/xgboost.xml
index cfdf1299961..5184d010c03 100644
--- a/xgboost-toolfile.spec
+++ b/scram-tools.file/tools/xgboost/xgboost.xml
@@ -1,13 +1,3 @@
-### RPM external xgboost-toolfile 1.0
-Requires: xgboost
-
-%prep
-
-%build
-
-%install
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/xgboost.xml
@@ -19,6 +9,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/xgboost.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/xrootd-toolfile.spec b/scram-tools.file/tools/xrootd/xrootd.xml
similarity index 71%
rename from xrootd-toolfile.spec
rename to scram-tools.file/tools/xrootd/xrootd.xml
index 02066f92c1c..4d898c7e2ba 100644
--- a/xrootd-toolfile.spec
+++ b/scram-tools.file/tools/xrootd/xrootd.xml
@@ -1,13 +1,3 @@
-### RPM external xrootd-toolfile 1.0
-Requires: xrootd
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/xrootd.xml
@@ -21,6 +11,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/xrootd.xml
-EOF_TOOLFILE
-export PYTHON_LIB_SITE_PACKAGES
-## IMPORT scram-tools-post
diff --git a/xtensor-toolfile.spec b/scram-tools.file/tools/xtensor/xtensor.xml
similarity index 58%
rename from xtensor-toolfile.spec
rename to scram-tools.file/tools/xtensor/xtensor.xml
index e559c9e26b9..9f189fc939b 100644
--- a/xtensor-toolfile.spec
+++ b/scram-tools.file/tools/xtensor/xtensor.xml
@@ -1,13 +1,3 @@
-### RPM external xtensor-toolfile 1.0
-Requires: xtensor
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/xtensor.xml
@@ -16,6 +6,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/xtensor.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/xtl-toolfile.spec b/scram-tools.file/tools/xtl/xtl.xml
similarity index 57%
rename from xtl-toolfile.spec
rename to scram-tools.file/tools/xtl/xtl.xml
index 1f115c25853..8ea3bba4e3d 100644
--- a/xtl-toolfile.spec
+++ b/scram-tools.file/tools/xtl/xtl.xml
@@ -1,13 +1,3 @@
-### RPM external xtl-toolfile 1.0
-Requires: xtl
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/xtl.xml
@@ -15,6 +5,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/xtl.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/xz-toolfile.spec b/scram-tools.file/tools/xz/xz.xml
similarity index 73%
rename from xz-toolfile.spec
rename to scram-tools.file/tools/xz/xz.xml
index 8157e512c07..be062bce8fc 100644
--- a/xz-toolfile.spec
+++ b/scram-tools.file/tools/xz/xz.xml
@@ -1,11 +1,3 @@
-### RPM external xz-toolfile 1.1
-Requires: xz
-
-%prep
-%build
-%install
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE > %i/etc/scram.d/xz.xml
@@ -18,5 +10,3 @@ cat << \EOF_TOOLFILE > %i/etc/scram.d/xz.xml
-EOF_TOOLFILE
-## IMPORT scram-tools-post
diff --git a/yaml-cpp-toolfile.spec b/scram-tools.file/tools/yaml-cpp/yaml-cpp.xml
similarity index 65%
rename from yaml-cpp-toolfile.spec
rename to scram-tools.file/tools/yaml-cpp/yaml-cpp.xml
index 65a27deb0e5..5deda30efee 100644
--- a/yaml-cpp-toolfile.spec
+++ b/scram-tools.file/tools/yaml-cpp/yaml-cpp.xml
@@ -1,13 +1,3 @@
-### RPM external yaml-cpp-toolfile 1.0
-Requires: yaml-cpp
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/yaml-cpp.xml
@@ -18,6 +8,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/yaml-cpp.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/yoda-toolfile.spec b/scram-tools.file/tools/yoda/yoda.xml
similarity index 66%
rename from yoda-toolfile.spec
rename to scram-tools.file/tools/yoda/yoda.xml
index 86b191d1f38..237aa45d500 100644
--- a/yoda-toolfile.spec
+++ b/scram-tools.file/tools/yoda/yoda.xml
@@ -1,13 +1,3 @@
-### RPM external yoda-toolfile 1.0
-Requires: yoda
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/yoda.xml
@@ -18,6 +8,3 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/yoda.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/scram-tools.file/tools/zlib/vectorized.tmpl b/scram-tools.file/tools/zlib/vectorized.tmpl
new file mode 100644
index 00000000000..b4fa1b78f52
--- /dev/null
+++ b/scram-tools.file/tools/zlib/vectorized.tmpl
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/scram-tools.file/tools/zlib/zlib.xml b/scram-tools.file/tools/zlib/zlib.xml
new file mode 100644
index 00000000000..a4f43b4c471
--- /dev/null
+++ b/scram-tools.file/tools/zlib/zlib.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/zstd-toolfile.spec b/scram-tools.file/tools/zstd/zstd.xml
similarity index 69%
rename from zstd-toolfile.spec
rename to scram-tools.file/tools/zstd/zstd.xml
index 2e4ecf4035f..89e556156e6 100644
--- a/zstd-toolfile.spec
+++ b/scram-tools.file/tools/zstd/zstd.xml
@@ -1,13 +1,3 @@
-### RPM external zstd-toolfile 1.0
-Requires: zstd
-%prep
-
-%build
-
-%install
-
-mkdir -p %{i}/etc/scram.d
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/zstd.xml
@@ -19,6 +9,3 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/zstd.xml
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/scramtoolbox-common.file b/scramtoolbox-common.file
deleted file mode 100644
index a26c423807e..00000000000
--- a/scramtoolbox-common.file
+++ /dev/null
@@ -1,8 +0,0 @@
-### FILE scramtoolbox-common
-
-%prep
-%define configVersion CMS_136
-%define toolBoxDir %{instroot}/configuration/%{configVersion}/toolbox
-%define toolConfDir %{instroot}/configuration/%{configVersion}/toolconf
-%define prepareDirectories mkdir -p %{toolBoxDir} %{toolConfDir}
-%define toolname %(echo %n | sed -e "s|-toolfile||")
\ No newline at end of file
diff --git a/systemtools.spec b/systemtools.spec
index a213d6ddcb8..b603b354e1b 100644
--- a/systemtools.spec
+++ b/systemtools.spec
@@ -1,103 +1,7 @@
-### RPM external systemtools 19
+### RPM external systemtools 20
## NOCOMPILER
Source: none
-
-
-%if "%{?use_system_gcc:set}" == "set"
-%define compilertools ccompiler cxxcompiler f77compiler
-%else
-%define compilertools %{nil}
-%endif
-
-%define systemtools sockets opengl x11 %compilertools
-%define sockets_version 1.0
-%define opengl_version XFree4.2
-%define x11_version R6
-
-## INITENV SETV SOCKETS_VERSION %sockets_version
-## INITENV SETV OPENGL_VERSION %opengl_version
-## INITENV SETV X11_VERSION %x11_version
-## INITENV SETV PKGTOOLS_SYSTEM_TOOLS %systemtools
-
%prep
%build
%install
-# SCRAM ToolBox toolfile
-mkdir -p %i/etc/scram.d
-#OpenSSL
-cat << \EOF_TOOLFILE >%i/etc/scram.d/openssl.xml
-
-
-
-
-EOF_TOOLFILE
-
-# Sockets
-cat << \EOF_TOOLFILE >%i/etc/scram.d/sockets.xml
-
-EOF_TOOLFILE
-%ifos linux
-cat << \EOF_TOOLFILE >>%i/etc/scram.d/sockets.xml
-
-
-
-
-EOF_TOOLFILE
-%endif
-%ifarch darwin
-cat << \EOF_TOOLFILE >>%i/etc/scram.d/sockets.xml
-
-EOF_TOOLFILE
-%endif
-echo " " >>%i/etc/scram.d/sockets.xml
-
-# OpenGL
-cat << \EOF_TOOLFILE >%i/etc/scram.d/opengl.xml
-
-
-
-
-
-EOF_TOOLFILE
-%ifarch darwin
-cat << \EOF_TOOLFILE >>%i/etc/scram.d/opengl.xml
-
-
-
-
-
-EOF_TOOLFILE
-%endif
-echo " " >>%i/etc/scram.d/opengl.xml
-
-# X11
-cat << \EOF_TOOLFILE >%i/etc/scram.d/x11.xml
-
-EOF_TOOLFILE
-%ifarch darwin
-cat << \EOF_TOOLFILE >>%i/etc/scram.d/x11.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-%endif
-cat << \EOF_TOOLFILE >>%i/etc/scram.d/x11.xml
-
-
-EOF_TOOLFILE
-
-export ORACLE_ENV_ROOT
-perl -p -i -e 's|\@([^@]*)\@|$ENV{$1}|g' %i/etc/scram.d/*.xml
-%post
-%{relocateConfig}etc/scram.d/*.xml
diff --git a/tauola-toolfile.spec b/tauola-toolfile.spec
deleted file mode 100644
index 20ea73951f5..00000000000
--- a/tauola-toolfile.spec
+++ /dev/null
@@ -1,35 +0,0 @@
-### RPM external tauola-toolfile 1.0
-Requires: tauola
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/tauola.xml
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/tauola_headers.xml
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
-
diff --git a/tbb-toolfile.spec b/tbb-toolfile.spec
deleted file mode 100644
index db897b1fcd2..00000000000
--- a/tbb-toolfile.spec
+++ /dev/null
@@ -1,44 +0,0 @@
-### RPM external tbb-toolfile 2.0
-Requires: tbb
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/tbb.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/tbbbind.xml
-
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-export GCC_GLIBCXX_VERSION=$(gcc -dumpversion | tr '.' '0')
-
-## IMPORT scram-tools-post
diff --git a/tensorflow-toolfile.spec b/tensorflow-toolfile.spec
deleted file mode 100644
index 6fe663470d2..00000000000
--- a/tensorflow-toolfile.spec
+++ /dev/null
@@ -1,92 +0,0 @@
-### RPM external tensorflow-toolfile 3.0
-%define base_package %(echo %{n} | sed 's|-toolfile||')
-%define base_package_uc %(echo %{base_package} | tr '[a-z-]' '[A-Z_]')
-%{expand:%(for v in %{package_vectorization}; do echo Requires: %{base_package}_$v; done)}
-Requires: %{base_package}
-
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-
-cat << \EOF_TOOLFILE > %i/etc/scram.d/%{base_package}.xml
-
-
-
-
-
-EOF_TOOLFILE
-for v in $(echo %{package_vectorization} | tr '[a-z-]' '[A-Z_]') ; do
- r=`eval echo \\$%{base_package_uc}_${v}_ROOT`
- echo " " >> %i/etc/scram.d/%{base_package}.xml
-done
-cat << \EOF_TOOLFILE >>%i/etc/scram.d/%{base_package}.xml
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE > %i/etc/scram.d/tensorflow-framework.xml
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE > %i/etc/scram.d/tensorflow-cc.xml
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE > %i/etc/scram.d/tensorflow-c.xml
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE > %i/etc/scram.d/tensorflow-runtime.xml
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE > %i/etc/scram.d/tensorflow-executable_run_options.xml
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE > %i/etc/scram.d/tensorflow-xla_compiled_cpu_function.xml
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE > %i/etc/scram.d/tensorflow-tf2xla.xml
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/tkonlinesw-fake-toolfile.spec b/tkonlinesw-fake-toolfile.spec
deleted file mode 100644
index baccd1febd8..00000000000
--- a/tkonlinesw-fake-toolfile.spec
+++ /dev/null
@@ -1,38 +0,0 @@
-### RPM external tkonlinesw-fake-toolfile 1.0
-Requires: tkonlinesw-fake
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/tkonlinesw.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/tkonlineswdb.xml
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/toprex-toolfile.spec b/toprex-toolfile.spec
deleted file mode 100644
index 41ed399e397..00000000000
--- a/toprex-toolfile.spec
+++ /dev/null
@@ -1,33 +0,0 @@
-### RPM external toprex-toolfile 1.0
-Requires: toprex
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/toprex.xml
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/toprex_headers.xml
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-## IMPORT scram-tools-post
-
diff --git a/vdt-toolfile.spec b/vdt-toolfile.spec
deleted file mode 100644
index e2347aff95f..00000000000
--- a/vdt-toolfile.spec
+++ /dev/null
@@ -1,32 +0,0 @@
-### RPM cms vdt-toolfile 1.0
-Requires: vdt
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/vdt_headers.xml
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-cat << \EOF_TOOLFILE >%i/etc/scram.d/vdt.xml
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/vecgeom-toolfile.spec b/vecgeom-toolfile.spec
deleted file mode 100644
index 0c771398fb7..00000000000
--- a/vecgeom-toolfile.spec
+++ /dev/null
@@ -1,46 +0,0 @@
-### RPM external vecgeom-toolfile 4.0
-%define base_package %(echo %{n} | sed 's|-toolfile||')
-%define base_package_uc %(echo %{base_package} | tr '[a-z-]' '[A-Z_]')
-%{expand:%(for v in %{package_vectorization}; do echo Requires: %{base_package}_$v; done)}
-Requires: %{base_package}
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/vecgeom_interface.xml
-
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/%{base_package}.xml
-
-
-
-
-
-
-EOF_TOOLFILE
-for v in $(echo %{package_vectorization} | tr '[a-z-]' '[A-Z_]') ; do
- r=`eval echo \\$%{base_package_uc}_${v}_ROOT`
- echo " " >> %i/etc/scram.d/%{base_package}.xml
-done
-cat << \EOF_TOOLFILE >>%i/etc/scram.d/%{base_package}.xml
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/vectorization/cmsdist_packages.py b/vectorization/cmsdist_packages.py
index c4497151f23..c5b9785898c 100755
--- a/vectorization/cmsdist_packages.py
+++ b/vectorization/cmsdist_packages.py
@@ -6,6 +6,10 @@
MULTI_TARGET_PACKAGES = []
VALID_TARGETS = {}
if machine() == "x86_64":
+############ IMPORTANT NOTE #############
+# For any newly added vecrtorized packages here,
+# please also add scram-tools.file/tools/package/vectorized.tmpl file
+#########################################
MULTI_TARGET_PACKAGES = [
"zlib",
"fastjet",
diff --git a/vincia-toolfile.spec b/vincia-toolfile.spec
deleted file mode 100644
index d849fd3d184..00000000000
--- a/vincia-toolfile.spec
+++ /dev/null
@@ -1,24 +0,0 @@
-### RPM external vincia-toolfile 2.0
-Requires: vincia
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/vincia.xml
-
-
-
-
-
-
-
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post
diff --git a/zlib-toolfile.spec b/zlib-toolfile.spec
deleted file mode 100644
index 7907d08e577..00000000000
--- a/zlib-toolfile.spec
+++ /dev/null
@@ -1,32 +0,0 @@
-### RPM external zlib-toolfile 2.0
-%define base_package %(echo %{n} | sed 's|-toolfile||')
-%define base_package_uc %(echo %{base_package} | tr '[a-z-]' '[A-Z_]')
-%{expand:%(for v in %{package_vectorization}; do echo Requires: %{base_package}_$v; done)}
-Requires: %{base_package}
-%prep
-
-%build
-
-%install
-
-mkdir -p %i/etc/scram.d
-cat << \EOF_TOOLFILE >%i/etc/scram.d/%{base_package}.xml
-
-
-
-
-
-
-EOF_TOOLFILE
-for v in $(echo %{package_vectorization} | tr '[a-z-]' '[A-Z_]') ; do
- r=`eval echo \\$%{base_package_uc}_${v}_ROOT`
- echo " " >> %i/etc/scram.d/%{base_package}.xml
-done
-cat << \EOF_TOOLFILE >>%i/etc/scram.d/%{base_package}.xml
-
-
-
-
-EOF_TOOLFILE
-
-## IMPORT scram-tools-post