Skip to content

#655 Update to latest jmdns #849

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

Merged
merged 2 commits into from
Oct 18, 2017
Merged

#655 Update to latest jmdns #849

merged 2 commits into from
Oct 18, 2017

Conversation

wimjongman
Copy link
Member

  • fixed

@wimjongman wimjongman self-assigned this Oct 17, 2017
@wimjongman
Copy link
Member Author

Is there a way to pickup the build from Travis?

@wimjongman wimjongman requested a review from jantje October 17, 2017 12:32
@jantje
Copy link
Member

jantje commented Oct 17, 2017

@wimjongman
yes goto sloeber.io->install->latest nightly :-)
Do you want to do more testing before I merge?

@jantje
Copy link
Member

jantje commented Oct 17, 2017

@wimjongman
Oeps no that is only after the merge.
I'm trying to see whether this is possible

@jantje
Copy link
Member

jantje commented Oct 17, 2017

@wimjongman
I don't think these versions get uploaded anywhere.
But it compiled and tested ok
(as expected as jdmns is not involved here)
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 78.022 sec - in io.sloeber.core.RegressionTest

is_extern_C_taken_into_account(io.sloeber.core.RegressionTest) Time elapsed: 12.18 sec

are_defines_before_includes_taken_into_account(io.sloeber.core.RegressionTest) Time elapsed: 5.597 sec

redirectedJson(io.sloeber.core.RegressionTest) Time elapsed: 4.359 sec

issue555(io.sloeber.core.RegressionTest) Time elapsed: 0 sec

issue687(io.sloeber.core.RegressionTest) Time elapsed: 4.146 sec

are_jantjes_options_taken_into_account(io.sloeber.core.RegressionTest) Time elapsed: 3.804 sec

Results :

Tests run: 6, Failures: 0, Errors: 0, Skipped: 0

PID=3666 still running at 720 seconds

Ran for 720 seconds

Exit status of 0

@@ -9,7 +9,8 @@ bin.includes = .,\
config/,\
OSGI-INF/,\
src/io/sloeber/core/templates/sketch.ino,\
lib/
lib/,\
lib/jmdns-3.5.3.jar
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As there are multiple jars there I think it is better to have them all mentioned or none. Now there is just one.
PS only saying this as you asked my review :-)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes thanks. That build.properties is a mess,

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't feel qualified to confirm this.
I'm also thinking: The mess has probably some correlation with my sentence just before this one. ;-)

@wimjongman
Copy link
Member Author

i'm running a local test and I get:

java.lang.NoClassDefFoundError: org/slf4j/LoggerFactory
at javax.jmdns.impl.NetworkTopologyDiscoveryImpl.(NetworkTopologyDiscoveryImpl.java:24)
at javax.jmdns.NetworkTopologyDiscovery$Factory.newNetworkTopologyDiscovery(NetworkTopologyDiscovery.java:114)
at javax.jmdns.NetworkTopologyDiscovery$Factory.getInstance(NetworkTopologyDiscovery.java:126)
at cc.arduino.packages.discoverers.NetworkDiscovery.start(NetworkDiscovery.java:106)
at io.sloeber.core.Activator$2.run(Activator.java:221)
at org.eclipse.core.internal.jobs.Worker.run(Worker.java:56)
Caused by: java.lang.ClassNotFoundException: org.slf4j.LoggerFactory cannot be found by io.sloeber.core_4.1.0.201710171639
at org.eclipse.osgi.internal.loader.BundleLoader.findClassInternal(BundleLoader.java:484)
at org.eclipse.osgi.internal.loader.BundleLoader.findClass(BundleLoader.java:395)
at org.eclipse.osgi.internal.loader.BundleLoader.findClass(BundleLoader.java:387)
at org.eclipse.osgi.internal.loader.ModuleClassLoader.loadClass(ModuleClassLoader.java:150)
at java.lang.ClassLoader.loadClass(Unknown Source)
... 6 more

@wimjongman
Copy link
Member Author

I fixed that error but the code in cc.arduino that we have copied in io.sloeber.core is way out of sync. I don't know what that code is supposed to do but we are using a bunch of JMDNS internal API that cc.arduino now has resolved.

theirs: https://github.com/arduino/Arduino/blob/master/arduino-core/src/cc/arduino/packages/discoverers/NetworkDiscovery.java

ours: https://github.com/Sloeber/arduino-eclipse-plugin/blob/master/io.sloeber.core/src/cc/arduino/packages/discoverers/NetworkDiscovery.java

@jantje
Copy link
Member

jantje commented Oct 17, 2017

I took a look. We should be able to copy the file without issues.
I guess you prefer me doing so as I see some files are no longer part of arduino.cc

@jantje
Copy link
Member

jantje commented Oct 18, 2017

@wimjongman I propose to accept this change and then I'll upgrade the arduino.cc package

@jantje jantje merged commit b194b1b into Sloeber:master Oct 18, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants