Skip to content

Commit

Permalink
bump versions
Browse files Browse the repository at this point in the history
  • Loading branch information
twall committed May 21, 2013
1 parent adafa3b commit b575995
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 7 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
JNA is dual-licensed under 2 alternative Open Source/Free
licenses: LGPL 2.1 and Apache License 2.0. (starting with
JNA version 3.6.0).
JNA version 4.0.0).

What this means is that one can choose either one of these
licenses (for purposes of re-distributing JNA; usually by
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ License
=======

This library is licensed under the LGPL, version 2.1 or later, and (from
version 3.6 onward) the Apache Software License, version 2.0. Commercial
version 4.0 onward) the Apache Software License, version 2.0. Commercial
license arrangements are negotiable.

*NOTE: Oracle is not sponsoring this project, even though the package name (com.sun.jna) might imply otherwise.*
Expand Down
17 changes: 15 additions & 2 deletions www/Contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ JNA contains work from many developers. You're encouraged to contribute to both
- Check out the code with `git clone [email protected]:username/jna.git`
- Ensure you can build the project with `ant dist test`
- Make your code changes, write tests, build
- Submit pull requests, topical branches are encouraged.
- Submit pull requests, forks and/or topical branches are encouraged.

Build Environment
=================
Expand All @@ -17,12 +17,25 @@ gcc, autotools (for libffi), ant (1.8+), a JDK (1.4+), and a few other typical
command-line utilities available. Feel free to report any issues, we'll
generally pull build fixes immediately.

Native builds may be skipped by passing `-Dskip-native=true` to `ant`. It's
save to skip the native build as long as your modifications are restricted to
Java code.

For debian-style installs,

% apt-get install git ant openjdk-6-jdk make autotools gcc

For most unix-like systems:

% git clone [email protected]:twall/jna
% ant dist test

For Windows, see [Windows Development Environment](WindowsDevelopmentEnvironment.md).

For windows CE/Mobile 6.x, you'll need cegcc (http://gitorious.org/cegcc) for
cross-compiling and a JavaME implementation (phoneME (http://davy.preuveneers.be/phoneme) works well).

Native builds may be skipped by passing `-Dskip-native=true` to `ant`.
For Android, see [Android Development Environment)(AndroidDevelopmentEnvironment.md).

Required Testing
================
Expand Down
6 changes: 3 additions & 3 deletions www/WindowsDevelopmentEnvironment.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
## Setting up a Windows Development Environment

Windows builds require cygwin. MSYS may work, but is not supported.
When installing cygwin, include ssh, git, make, and either gcc3 or mingw64,
depending on whether you're targeting win32 or win64, respectively (it's
Windows builds require cygwin. MSYS will probably work, but is not supported.
When installing cygwin, include ssh, git, make, autotools, and either gcc3 or
mingw64, depending on whether you're targeting win32 or win64, respectively (it's
possible to build both from the same host).

To build on Win64, you'll need mingw64 (available with cygwin or separately),
Expand Down

0 comments on commit b575995

Please sign in to comment.