bump versions

Esse commit está contido em:
Timothy Wall
2013-05-21 13:26:40 -04:00
commit b5759955d5
4 arquivos alterados com 20 adições e 7 exclusões
+1 -1
Ver Arquivo
@@ -1,6 +1,6 @@
JNA is dual-licensed under 2 alternative Open Source/Free JNA is dual-licensed under 2 alternative Open Source/Free
licenses: LGPL 2.1 and Apache License 2.0. (starting with 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 What this means is that one can choose either one of these
licenses (for purposes of re-distributing JNA; usually by licenses (for purposes of re-distributing JNA; usually by
+1 -1
Ver Arquivo
@@ -108,7 +108,7 @@ License
======= =======
This library is licensed under the LGPL, version 2.1 or later, and (from 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. license arrangements are negotiable.
*NOTE: Oracle is not sponsoring this project, even though the package name (com.sun.jna) might imply otherwise.* *NOTE: Oracle is not sponsoring this project, even though the package name (com.sun.jna) might imply otherwise.*
+15 -2
Ver Arquivo
@@ -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` - Check out the code with `git clone git@github.com:username/jna.git`
- Ensure you can build the project with `ant dist test` - Ensure you can build the project with `ant dist test`
- Make your code changes, write tests, build - 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 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 command-line utilities available. Feel free to report any issues, we'll
generally pull build fixes immediately. 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, see [Windows Development Environment](WindowsDevelopmentEnvironment.md).
For windows CE/Mobile 6.x, you'll need cegcc (http://gitorious.org/cegcc) for 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). 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 Required Testing
================ ================
+3 -3
Ver Arquivo
@@ -1,8 +1,8 @@
## Setting up a Windows Development Environment ## Setting up a Windows Development Environment
Windows builds require cygwin. MSYS may work, but is not supported. Windows builds require cygwin. MSYS will probably work, but is not supported.
When installing cygwin, include ssh, git, make, and either gcc3 or mingw64, When installing cygwin, include ssh, git, make, autotools, and either gcc3 or
depending on whether you're targeting win32 or win64, respectively (it's mingw64, depending on whether you're targeting win32 or win64, respectively (it's
possible to build both from the same host). possible to build both from the same host).
To build on Win64, you'll need mingw64 (available with cygwin or separately), To build on Win64, you'll need mingw64 (available with cygwin or separately),