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.
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
Rename py2-dablooms to dablooms. Remove dablooms python binding. #5315
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
### RPM external dablooms-toolfile 1.0 | ||
Requires: dablooms | ||
|
||
%prep | ||
|
||
%build | ||
|
||
%install | ||
|
||
mkdir -p %{i}/etc/scram.d | ||
cat << \EOF_TOOLFILE >%{i}/etc/scram.d/dablooms.xml | ||
<tool name="dablooms" version="@TOOL_VERSION@"> | ||
<lib name="dablooms"/> | ||
<client> | ||
<environment name="DABLOOMS_BASE" default="@TOOL_ROOT@"/> | ||
<environment name="LIBDIR" default="$DABLOOMS_BASE/lib"/> | ||
<environment name="INCLUDE" default="$DABLOOMS_BASE/include"/> | ||
</client> | ||
</tool> | ||
EOF_TOOLFILE | ||
|
||
## IMPORT scram-tools-post |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
### RPM external dablooms 0.9.1 | ||
|
||
Source: https://github.com/bitly/dablooms/archive/v%realversion.tar.gz | ||
|
||
%prep | ||
%setup -n dablooms-%realversion | ||
|
||
%build | ||
make all | ||
|
||
%install | ||
make install prefix=%i |
This file was deleted.
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -137,7 +137,6 @@ Requires: py2-matplotlib | |
Requires: py2-numpy-toolfile | ||
Requires: py2-sqlalchemy | ||
Requires: py2-pygithub | ||
Requires: py2-dablooms-toolfile | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. we need a cmssw PR to go with this change. It will fail PR tests and IBs due to missing dablooms There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I am working on a coordinated change to StaticAnalyzers. |
||
Requires: py2-dxr-toolfile | ||
Requires: py2-PyYAML | ||
Requires: py2-pylint | ||
|
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.
@gartung , looks like you are missing LIBDIR here?
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.
Good catch. I must have picked it up because py2-dablooms was configured and linked libdablooms into external.
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.
And I didn't reconfigure externals when I did scram setup dablooms.
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.
The library was picked up from CMSSW_RELEASE_BASE externals.