-
Notifications
You must be signed in to change notification settings - Fork 26
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
Some updates for key4hep and Marlin packages #175
Conversation
ilcsoft/marlinpkg.py
Outdated
@@ -67,3 +67,5 @@ def postCheckDeps(self): | |||
if os.path.exists(libname): | |||
self.parent.module('Marlin').envpath["MARLIN_DLL"].append(libname) | |||
break | |||
else: |
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.
Do we know now, why this sometimes seems to only work on the second try?
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.
This else should be de-dented one level
for ...:
if ..:
break
else:
print("error: only when no 'break'")
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 think this function postCheckDeps
is called before the compilation happened, so the libraries will not exist at this point. The setting for MARLIN_DLL would need to move to checkInstall
instead?
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.
Except that init_ilcsoft.sh
is written before the compilation is done...
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.
Ah, that would explain what we saw almost perfectly...
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.
Copying the code that writes the init_ilcsoft.sh file and adding f.close()
does the trick for me.
master...andresailer:iLCInstall:python3
(used for building the nighlty clicdp.cern.ch ilcsoft stacks)
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.
Nice. Can the necessary commits simply be cherry picked to here? Or do we need to do it manually?
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 think one would need to manually cherry-pick
Cherry picked (hopefully) all of the relevant changes from your branch. |
Thanks for the fix. |
BEGINRELEASENOTES
- allow HEAD branch to be called main
- patch lcgeo install to work w/ latest k4geo
lib64
orlib
and make sure thatMARLIN_DLL
is populated properly.ENDRELEASENOTES