Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bring python support for fastjet #3867

Merged
merged 3 commits into from
Mar 24, 2018
Merged

Bring python support for fastjet #3867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dae6eeb
Bring python support for fastjet
mrodozov Mar 22, 2018
d3caa36
Add repo and requirement changes
mrodozov Mar 22, 2018
825a335
Update also fastjet-toolfile
mrodozov Mar 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion fastjet-toolfile.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Requires: fastjet
mkdir -p %i/etc/scram.d
cat << \EOF_TOOLFILE >%i/etc/scram.d/fastjet.xml
<tool name="fastjet" version="@TOOL_VERSION@">
<info url="http://www.lpthe.jussieu.fr/~salam/fastjet/"/>
<info url="http://fastjet.fr"/>
<lib name="fastjetplugins"/>
<lib name="fastjettools"/>
<lib name="siscone"/>
Expand All @@ -21,8 +21,10 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/fastjet.xml
<environment name="INCLUDE" default="$FASTJET_BASE/include"/>
</client>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<runtime name="PYTHON27PATH" value="$FASTJET_BASE/lib/python@PYTHONV@/site-packages" type="path"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE
export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)

## IMPORT scram-tools-post
5 changes: 4 additions & 1 deletion fastjet.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
### RPM external fastjet 3.3.0
%define tag 26e1f4828f4622742062f1465ae8de9986f96f86
## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
Requires: python
%define tag acfff3bf99b6c754efe3768b81393935f3b9a05d
%define branch cms/v%{realversion}
%define github_user cms-externals
Source: git+https://github.com/%{github_user}/fastjet.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
Expand Down Expand Up @@ -31,6 +33,7 @@ esac
--enable-siscone \
--prefix=%{i} \
--enable-allcxxplugins \
--enable-pyext \
CXXFLAGS="$CXXFLAGS"

%build
Expand Down