Fixes a number of errors in the bndrun handling#6401
Fixes a number of errors in the bndrun handling#6401pkriens merged 3 commits intobndtools:masterfrom
Conversation
--- Signed-off-by: github-actions <github-actions@bndtools.org> Signed-off-by: github-actions <github-actions@bndtools.org>
|
@chrisrueger could you take this for a spin? I added a small feature to the BndEditModel. You can now instantiate it with 'effective'. It makes the BndEditModel read only but it shows the effective properties. I quickly tried it in the UI and it is really nice, it shows you all the effective properties with inheritance and includes. However, it needs of course UI support to activate it and to disable the UI so no changes can be made. But if you look for a weekend project ... |
Yes, I try a quick test later.
Sounds pretty nice. Doesn't the
I can have a look. Let's see which weekend it'll be ;) |
|
Works good so far. I tested with the reproducer of @sad-poet and our own project. |
--- Signed-off-by: github-actions <github-actions@bndtools.org> Signed-off-by: github-actions <github-actions@bndtools.org>
Some of the changes we made to handle the UI of inherited properties were not correctly
handling all cases. These shortcomings were hidden because we reread the properties
from the file system.
The issue is that the BndEditModel is about the properties in the document while
the resolver handles properties after processing. So we needed to setup a processor
that properly reflected:
For this I hadded a sub-Processor to the bndrun. This subprocessor contained all the
document values (e.g. -include is in there) and intercepted access to the deleted
keys.
However, we accidentially reread the properties of the bndrun sub processor from file. This
worked fine in the workspace but the LauncUtils lets the Maven handler muck around to
add a repository. Unfortuantely, this also set the base directory of the bndrun to a
temporary directory for unknown reasons. So when the properties were read and an
include was found it could not find it.
Then there was an unrelated problem that I think was also masked. It turns out the UI
was updating the model with requirements even if requirements were not changed or
added. This created a null key in the bndrun that never existed. Since this example
used the
-runrequirementskey in an include file, it hid the original value. Andweridly it caused an NPE later.
So uncomfortable many changes ... I guess we need to test this well and probably release
a 7.2 soon.
Fixes #6393
Fixes #6394
Fixes #6394
Signed-off-by: github-actions github-actions@bndtools.org