-
Notifications
You must be signed in to change notification settings - Fork 1.7k
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
fix native compile error due to use of ant if,unless #1302
fix native compile error due to use of ant if,unless #1302
Conversation
Thanks, completely overlooked this. |
If I'm not mistaken, the Another question, that runs in my mind: Why do we have two definitions of the same build? We should unify that, but I admit that is out of scope for this PR. |
This commit confuses me, but I don't want to get too off-topic. The generic suffix handling should be simpler (and I'd expect, better), minus whatever bug it introduced. Probably not worth nitpicking, but the pattern matching seems less likely to falter over time when compared to the hard-coded platforms.
I too found this all to be quite redundant. Ant handles imported build files well, so the redundancy seems -- from a high level -- unwarranted. |
Oh, was it the Yeah it seems it's used in quite a few places. 😕 |
@tresf at the time that I backed it out, it was intended as a change with minimal risk. It restored the original logic on the non-darwin platforms, while retaining the updated behavior for darwin. A cleanup followup can be of course 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.
Good to merge if it fixes the build. My initial assessment, that fixes for windows need to be included were wrong, as the prefix in this build file is not correctly determined. The TL;DR version is that the build script is broken:
native/build.xml
still calls into javah, which is gone in recent JDKs- the version of the native library is not correct
- the checksum for the api is not correct
and most probably other fixes are missing.
Thanks for looking at it. I went ahead and merged (to get build happy), and hope to get some time to look over the other issues to mentioned. |
I think this will fix the build failure that occurred recently in the JNA-maven build. Was missing some ant namespace stuff to enable nifty new things.