Rebase of pull request #2990 #3008
Conversation
|
A new Pull Request was created by @mark-grimes (Mark Grimes) for CMSSW_6_2_X_SLHC. Rebase of pull request #2990 It involves the following packages: Configuration/Geometry @civanch, @Dr15Jones, @ianna, @mdhildreth, @cmsbuild, @nclopezo, @Degano, @ktf can you please review it and eventually sign? Thanks. |
|
merge This has already been tested when it was #2990. |
| <use name="DetectorDescription/Core"/> | ||
|
|
||
| <flags EDM_PLUGIN="1"/> | ||
| <library file="DD*.cc" name="GeometryHGCalCommonDataPlugin"> </library> |
There was a problem hiding this comment.
@bsunanda,
This line removes module.cc from the library, and many plugins are not registered. This breaks the 122xx, 124xx and 126xx tests in step 1. Don't know how I didn't pick that up in initial testing. I will put in a pull request to fix it.
There was a problem hiding this comment.
Sorry - I shall change this. It completely slipped from my mind
On Thu, 27 Mar 2014, Mark Grimes wrote:
In Geometry/HGCalCommonData/plugins/BuildFile.xml:
-
- - + + + + + + + + + + +
@bsunanda,
This line removes module.cc from the library, and many plugins are not
registered. This breaks the 122xx, 124xx and 126xx tests in step 1. Don't
know how I didn't pick that up in initial testing. I will put in a pull
request to fix it.—
Reply to this email directly or view it onGitHub.[5033146__eyJzY29wZSI6Ik5ld3NpZXM6QmVhY29uIiwiZXhwaXJlcyI6MTcxMTU1Mz
A1MiwiZGF0YSI6eyJpZCI6Mjg0NTc0MTR9fQ==--878ddae1bf42e767c8c8ee33db81be0eaf5
539c8.gif]
There was a problem hiding this comment.
It's okay, I've fixed with #3053 and already merged.
Pull request #2990 won't merge into the main tree, even though I have no issues doing it locally. I have no idea why, but I'll see if this works. I just merged in #2990 and then rebased onto CMSSW_6_2_X_SLHC. It was CMSSW_6_2_X_SLHC that I merged into so I don't think the rebase actually did anything.