Skip to content

Commit

Permalink
Merge pull request #9514 from cms-sw/split-pythia6-tool
Browse files Browse the repository at this point in the history
[pythia6]Move pythia6_pdfdummy in to separate tool
  • Loading branch information
cmsbuild authored Nov 15, 2024
2 parents cfcc9ce + 4c5087f commit 6ff3cc6
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
4 changes: 2 additions & 2 deletions SCRAMV1.spec
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
### RPM lcg SCRAMV1 V3_00_77
### RPM lcg SCRAMV1 V3_00_78
## NOCOMPILER
## NO_VERSION_SUFFIX

%define tag 3e481c9f139604424fc8fa1872fdacd99af9fe98
%define tag 95b52ec18049cf1bf307f5ee97f7d768f018cc5f
%define branch SCRAMV3
%define github_user cms-sw
Source: git+https://github.com/%{github_user}/SCRAM.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz
Expand Down
2 changes: 1 addition & 1 deletion scram-project-build.file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ BuildRequires: dwz
%endif

%if "%{?configtag:set}" != "set"
%define configtag V09-05-01
%define configtag V09-05-02
%endif

%if "%{?buildarch:set}" != "set"
Expand Down
3 changes: 1 addition & 2 deletions scram-tools.file/tools/pythia6/pythia6.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<tool name="pythia6" version="@TOOL_VERSION@">
<tool name="pythia6" version="@TOOL_VERSION@" revision="1">
<lib name="pythia6"/>
<lib name="pythia6_dummy"/>
<lib name="pythia6_pdfdummy"/>
<client>
<environment name="PYTHIA6_BASE" default="@TOOL_ROOT@"/>
<environment name="LIBDIR" default="$PYTHIA6_BASE/lib"/>
Expand Down
4 changes: 4 additions & 0 deletions scram-tools.file/tools/pythia6/pythia6_pdfdummy.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<tool name="pythia6_pdfdummy" version="@TOOL_VERSION@" rivision="1">
<lib name="pythia6_pdfdummy"/>
<flags NO_RECURSIVE_EXPORT="1"/>
</tool>

0 comments on commit 6ff3cc6

Please sign in to comment.