[TOOLFILES] Check mergebility after merging with latest cmsdist #7110
Conversation
|
A new Pull Request was created by @mrodozov (Mircho Rodozov) for branch IB/CMSSW_12_0_X/master. @cmsbuild, @smuzaffar, @mrodozov, @iarspider can you please review it and eventually sign? Thanks. |
scramv1-tool-conf.file
Outdated
|
|
||
| done \ | ||
| tool_script=${SCRAM_TOOLS_ROOT}/scram-tools/$tool/$(echo $tool | tr '[A-Z]' '[a-z]').sh \ | ||
| if [ -f $tool_script ]; then ($tool_script %i/tools/selected); fi |
There was a problem hiding this comment.
@mrodozov , I was thinking to move all this CopyScramTools logic in a script which we can call like ${SCRAM_TOOLS_ROOT}/get_tools <tool_name> <outdir>. This tool then can process the <toolname>/<toolname>*.xml files and replace @TOOL_ROOT@ and @TOOL_VERSION@ and can internally call ${SCRAM_TOOLS_ROOT}/get_tools/<toolname>/<toolname>.sh if available
There was a problem hiding this comment.
I'll move that part in a file to be called as a script with args then
There was a problem hiding this comment.
the ${SCRAM_TOOLS_ROOT}/get_tools script can take care of common variables e.g.
TOOL_ROOT
TOOL_VERSION
PYTHONV
PYTHON3V
and rest can go in tool's specific script. The tool's specific script should only set the environment variables e.g.
COMPILER_NAME_SUFFIX
OS_CSHAREDOBJECTFLAGS
ARCH_CSHAREDOBJECTFLAGS
BOOST_CHRONO_LIB
BOOST_DATE_TIME_LIB
and the get_tools script should do the replacement. e.g. get_tools can do source gcc/gcc.sh ( which should set the env) and then get_tools should do the replacement of @VARIABLE@
There was a problem hiding this comment.
@mrodozov , please take note of my comment #7110 (comment) too
|
please test |
|
-1 Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-68cf0c/16546/summary.html External BuildI found compilation warning when building: See details on the summary page. |
| %ifarch x86_64 | ||
| Requires: dmtcp-toolfile | ||
| Requires: tkonlinesw-toolfile | ||
| Requires: oracle-toolfile |
There was a problem hiding this comment.
@mrodozov , we need to keep the dependencies but should replace <tool>-toolfile with <tool> only.
This should also be done for coral and fwlite tool-conf.spec
There was a problem hiding this comment.
this file is containing a short list because so I first finish pkgs with any script logic, the short list if for not deploying all xmls every time (not to build the whole cmssw-tool-conf)
There was a problem hiding this comment.
this type of changes are better to test locally as this will help with debugging.
|
Pull request #7110 was updated. |
|
please test |
|
-1 Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-68cf0c/16548/summary.html External BuildI found compilation warning when building: See details on the summary page. |
|
Pull request #7110 was updated. |
|
Pull request #7110 was updated. |
|
test parameters:
|
|
please test |
|
abort |
|
please test |
|
please test for CMSSW_12_0_X/slc7_ppc64le_gcc9 |
|
please test for slc7_aarch64_gcc9 |
| %post | ||
| 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 |
There was a problem hiding this comment.
@mrodozov once test are done then please remove these lines, I think these are not needed any more ... right?
|
Pull request #7110 was updated. |
|
closing in favor of #7147 |
this of course cant be tested yet