From b5759955d5a70a4bb2ae356b8ba92acb92b6546f Mon Sep 17 00:00:00 2001 From: Timothy Wall Date: Tue, 21 May 2013 13:26:40 -0400 Subject: [PATCH] bump versions --- LICENSE | 2 +- README.md | 2 +- www/Contributing.md | 17 +++++++++++++++-- www/WindowsDevelopmentEnvironment.md | 6 +++--- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/LICENSE b/LICENSE index b7b7ec65..401454e9 100644 --- a/LICENSE +++ b/LICENSE @@ -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 diff --git a/README.md b/README.md index a236ba02..7b63472c 100644 --- a/README.md +++ b/README.md @@ -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.* diff --git a/www/Contributing.md b/www/Contributing.md index 2b3ec1d3..5a09ade3 100644 --- a/www/Contributing.md +++ b/www/Contributing.md @@ -8,7 +8,7 @@ JNA contains work from many developers. You're encouraged to contribute to both - Check out the code with `git clone git@github.com: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 ================= @@ -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 git@github.com: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 ================ diff --git a/www/WindowsDevelopmentEnvironment.md b/www/WindowsDevelopmentEnvironment.md index c1f2d711..7e1bcc22 100644 --- a/www/WindowsDevelopmentEnvironment.md +++ b/www/WindowsDevelopmentEnvironment.md @@ -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),