Hydjet integration as external #5412
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| ### 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 | ||
| <tool name="hydjet" version="@TOOL_VERSION@"> | ||
| <lib name="hydjet"/> | ||
| <client> | ||
| <environment name="HYDJET_BASE" default="@TOOL_ROOT@"/> | ||
| <environment name="LIBDIR" default="$HYDJET_BASE/lib"/> | ||
| </client> | ||
| <use name="pyquen"/> | ||
| <use name="pythia6"/> | ||
| <use name="lhapdf"/> | ||
| </tool> | ||
| EOF_TOOLFILE | ||
|
|
||
| ## IMPORT scram-tools-post |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| ### RPM external hydjet 1.9.1 | ||
|
|
||
| Source: http://cern.ch/lokhtin/hydro/%{n}-%{realversion}.tar.gz | ||
|
|
||
| BuildRequires: cmake | ||
|
|
||
| Requires: pyquen pythia6 lhapdf | ||
|
|
||
|
|
||
| %prep | ||
| %setup -q -n %{n}-%{realversion} | ||
|
|
||
| %build | ||
|
|
||
| cmake . -DCMAKE_INSTALL_PREFIX=%i -DCMAKE_BUILD_TYPE=Release -DPYQUEN_DIR=${PYQUEN_ROOT} -DPYTHIA6_DIR=${PYTHIA6_ROOT} -DLHAPDF_ROOT_DIR=${LHAPDF_ROOT} | ||
| cmake --build . --clean-first -- %{makeprocesses} | ||
|
|
||
| %install | ||
|
|
||
| cmake --build . --target install --clean-first -- %{makeprocesses} | ||
|
There was a problem hiding this comment. please remove There was a problem hiding this comment. Yes, that was the goal (to clean in case the previous build found). What's wrong? The same behaviour was realized for pyquen. There was a problem hiding this comment. there is no need to do it twice. It has been done in the %build section already |
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| ### RPM external pyquen 1.5.4 | ||
|
|
||
| Source: http://lokhtin.web.cern.ch/lokhtin/%{n}/%{n}-%{realversion}.tar.gz | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please also add build dependency on
gmakeotherwise it will pick system gmake.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for advice. But, does it matter?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes it does, some times we end up in env (e.g. docker containers with minimal package installation) where gmake is not available via system
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I mean does it matter gmake, make, or ninja tool is used?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it depends, if you have run cmake to use ninja then you need to add dependency on ninja otheriwse default is
make(which is available via our gmake.spec) and for that you need to add dependency on gmake.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank You for Your explanation!