Merge pull request #8984 from cms-sw/genreflex-rootcling

ROOT: Use rootcling instead of genreflex for root dict generation

scram-project-build.file

@@ -55,7 +55,7 @@ BuildRequires: dwz
 %endif
 
 %if "%{?configtag:set}" != "set"
-%define configtag       V09-02-03
+%define configtag       V09-02-04
 %endif
 
 %if "%{?buildarch:set}" != "set"

scram-tools.file/tools/root/env.sh

@@ -1,8 +1,3 @@
 ROOT_GX11_LIB=GX11
 [ $(uname -s) = "Darwin" ] && ROOT_GX11_LIB=GCocoa
 export ROOT_GX11_LIB
-
-export GENREFLEX_FAILES_ON_WARNS=--fail_on_warnings
-if [ "$ROOT_CXXMODULES" = "1" ] ; then
-  export GENREFLEX_FAILES_ON_WARNS=-failOnWarnings
-fi

scram-tools.file/tools/root/root.xml

@@ -1,6 +1,6 @@
 <tool name="root" version="@TOOL_VERSION@">
   <info url="http://root.cern.ch/root/"/>
   <use name="rootphysics"/>
-  <flags GENREFLEX_FAILES_ON_WARNS="@GENREFLEX_FAILES_ON_WARNS@"/>
+  <flags GENREFLEX_FAILES_ON_WARNS="-failOnWarnings"/>
   <flags CXXMODULES="@ROOT_CXXMODULES@"/>
 </tool>

scram-tools.file/tools/root/rootrflx.xml

@@ -7,7 +7,7 @@
     <flags GENREFLEX_GCCXMLOPT="-m64"/>
   </ifarchitecture>
   <flags GENREFLEX_CPPFLAGS="-DCMS_DICT_IMPL -D_REENTRANT -DGNUSOURCE -D__STRICT_ANSI__"/>
-  <runtime name="GENREFLEX" value="$ROOTRFLX_BASE/bin/genreflex"/>
+  <runtime name="GENREFLEX" value="$ROOTRFLX_BASE/bin/rootcling"/>
   <flags OVERRIDABLE_FLAGS="GENREFLEX_CPPFLAGS"/>
   <use name="root_interface"/>
   <use name="rootcling"/>