Skip to content
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 for issue#226 "Convert platform to OSGi" #266

Merged
merged 3 commits into from
Sep 21, 2013

Conversation

brettwooldridge
Copy link
Contributor

Sorry for the messy commits. Commit e4a1158 was made, but on reviewing the diff I noticed that there was a large number of lines that showed whitespace differences (obscuring what was actually changed). Commit 57197d3 reverted the e4a1158 commit, returning the repository to pristine condition. Commit 9de2005 contains the same changes as the original e4a1158 commit with most of the whitespace differences removed.

As the commit message says:

Build jna-platform jar with OSGi headers. Also, fix OSGi "Bundle-Version" header of core jna.jar to contain full version number, rather than just ${jna.major} number.

…eader of core jna.jar to contain full version number, rather

than just ${jna.major} number.
…rsion" header of core jna.jar to contain full version number, rather"

This reverts commit e4a1158.
…eader of core jna.jar to contain full version number, rather

than just ${jna.major} number.
@twall
Copy link
Contributor

twall commented Sep 20, 2013

LGTM

@brettwooldridge
Copy link
Contributor Author

I have verified that it works in my Equinox (Eclipse) OSGi server, I would expect it to work in Apache Felix as well as it's all standard OSGi fare.

@dblock
Copy link
Member

dblock commented Sep 20, 2013

Re: messy commit. Google 'topic branches' and 'squashing'. Both will help you make cleaner PRs next time :) Either way, thanks for contributing!


-->

<target name="-do-jar-without-manifest">
Copy link
Contributor

Choose a reason for hiding this comment

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

Why does this show up under the -do-jar-without-manifest target? I don't particularly care for the baroque netbeans ant configuration, but it seemed odd to me that tweaks to the manifest setup would go in the -do-jar-without-manifest target rather than -do-jar-with-manifest, unless the latter means that netbeans is going to auto-generate one for you.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That netbeans configuration is gross, I've never seen such a thing. From what I can tell poking around, -do-jar-with-manifest is used only when there is an existing manifest file rather than an ant-define dynamic manifest. My personal advice would be not to accept future contributions that depend on an IDE-generated ant/maven file in order to build; that is a maintenance disaster. If I didn't need those OSGi headers so badly, I never would have continued trying to figure out that crazy netbeans file. It uses XML namespaces in the tags for Christ sake. Anyway, I think the "do-jar-without-manifest" is actually the correct semantic for what it is.

twall added a commit that referenced this pull request Sep 21, 2013
Fix for issue#226 "Convert platform to OSGi"

Verified that new OSGI entries show up in jna-platform.jar.
@twall twall merged commit e79f6e0 into java-native-access:master Sep 21, 2013
@bhamail bhamail mentioned this pull request Dec 9, 2016
mstyura pushed a commit to mstyura/jna that referenced this pull request Sep 9, 2024
Motivation:

We use an old version of maven atm.

Modifications:

Update to maven 3.8.1

Result:

Use latest maven release when compiling
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.

3 participants