-
-
Notifications
You must be signed in to change notification settings - Fork 111
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
Split dongles into separate bundles #159
Conversation
Signed-off-by: Chris Jackson <chris@cd-jackson.com>
Signed-off-by: Chris Jackson <chris@cd-jackson.com>
Signed-off-by: Chris Jackson <chris@cd-jackson.com>
a8fd9c2
to
d4530d3
Compare
I am a bit uncertain on the effects of this restructuring. So far we had this repo designed in a way that it includes the bundle in the repo root, so that it nicely blends into https://github.com/openhab/openhab-bundles. Did you check whether this aggregated build still works as expected? |
My expectation would be to have at least separated bundles for:
|
5fb5f03
to
439019f
Compare
40f681d
to
1ac56a4
Compare
Well, they are not pointing to any repo, my idea was to have it included in the same Maven reactor, so that the dependencies are found. As you are not using Tycho, but the Felix Bundle Plugin for the OSGi build, I am not at all certain anymore whether this can work.
If this is realistic and you say that the core framework libs are rather stable already, I'd think the easiest way to move forward is to include the external bundles in the target platform (https://github.com/openhab/openhab-deps-repo). If you could tell me which version (1.0.7, I suppose?) should be used, I can take care of this part. All you would then have to change in this PR is to completely remove the lib folder(s) and the m2e natures from the projects. |
1ac56a4
to
0bebbcc
Compare
Signed-off-by: Chris Jackson <chris@cd-jackson.com>
0bebbcc
to
85f3c8b
Compare
@cdjackson Short ping to make sure that you noticed my comment above. |
Sorry Kai, I didn't see a notification for this.
Can you explain your idea - does it also work in Eclipse IDE?
I would probably update to 1.0.8 to pickup some small fixes in the XBee driver, but I'd like to understand your alternative idea if there's a better way... |
Well, you do not need to care about dependencies, if all that you depend on is part of your own build - and that's what openhab-bundles is currently doing.
Yes, it works if you have all the projects in your workspace (i.e. the same as having all in the Maven reactor).
Ok, if you want me to add this to the target platform, just ping me once it is available. |
Signed-off-by: Chris Jackson <chris@cd-jackson.com>
@kaikreuzer I've released 1.0.8 this afternoon and just retested the binding (also with ZB3 :) ). I've removed the dependency JAR, so if y'all are happy, then we can look to get this all merged. Let me know if there's anything else you want me to do... Thanks |
Thanks @cdjackson, I have created openhab/openhab-distro#674, which adds the libs to the target platform in version 1.0.8. What is still missing in this PR is the removal of all Maven specific stuff - like m2e natures on projects, dependencies in the poms and definition of maven repo for zsmartsystems. None of that is needed as the resolution is done through p2 and Tycho. |
Thanks @kaikreuzer. I've updated the POM to remove all the dependencies. This works fine in the IDE, but somewhere maven is still picking up 1.0.23 and the build is failing. If I manually change the POM to 1.0.24 and build locally, it works fine. |
@cdjackson It is not just the poms, it is also the m2e nature on the projects that need to be removed as I said. Otherwise there are error markers on the project in the IDE. Once you have adapted that, is it ok from your end to merge? I.e. is all code up to date, so that I can adapt the distro to pick up these separate bundles instead of the old single one? Wrt the Maven build: Yes, I still have to update the dependencies reference in the parent pom - will do so soon. |
Signed-off-by: Chris Jackson <chris@cd-jackson.com>
Hopefully I've removed all the m2e bits from the project. Yes, once you're happy with the build then it can be merged. |
Ok, perfect, many thanks! Even Jenkins is now happy 👍 |
Will now try to update the distro accordingly... |
Thanks Kai.
|
Ok, I hope that openhab/openhab-distro#676 will make the Zigbee binding work smoothly in the distro - for openHAB, we are simply adding all the bundles, when the user wishes to install the binding. Not really ideal to have 8 bundles for a single binding, but you didn't like my 4-bundle-solution... 🙄 |
This splits each dongle into a separate bundles as per #47. Currently it's tested with the Telegesis dongle only but all dongles have been refactored.
The library jars are included in the PR at this stage so that it can be tested. These just need to be included into the TP.
There's also some tidying needed of the readme files etc.
Signed-off-by: Chris Jackson chris@cd-jackson.com