by default, don't build native

make Structure get/setFieldValue protected
Esse commit está contido em:
Timothy Wall
2013-06-26 07:27:17 -04:00
commit d62a8abb24
5 arquivos alterados com 9 adições e 9 exclusões
+2 -1
Ver Arquivo
@@ -7,7 +7,6 @@ NOTE: JNI native support is typically incompatible between minor versions, and a
Features
--------
* [#241](https://github.com/twall/jna/issues/241) - Added `com.sun.jna.platform.win32.Shell32.SHAppBarMessage` - [@bsorrentino](https://github.com/bsorrentino).
* Added ASL licensing to facilitate distribution - [@twall](https://github.com/twall).
* [#109](https://github.com/twall/jna/issues/109): Set default Java compatibility level to 1.6 - [@twall](https://github.com/twall).
* [#209](https://github.com/twall/jna/issues/209): Improved default performance saving last error results - [@twall](https://github.com/twall).
@@ -22,6 +21,8 @@ Features
* Added `jna.debug_load` property to diagnose library loading issues - [@twall](https://github.com/twall).
* Throw explicit `IllegalArgumentException` when `Structure.ByReference` is used where it shouldn't be (can result in multiply freed memory or other unexpected behavior) - [@twall](https://github.com/twall).
* [#243](https://github.com/twall/jna/issues/243): Automatically accommodate long library paths on Windows which would otherwise fail - [@twall](https://github.com/twall).
* [#241](https://github.com/twall/jna/issues/241) - Added `com.sun.jna.platform.win32.Shell32.SHAppBarMessage` - [@bsorrentino](https://github.com/bsorrentino).
* Make `Structure.read/writeField()` protected to facilitate per-field overrides - [@twall](https://github.com/twall).
Bug Fixes
---------
+3 -3
Ver Arquivo
@@ -624,7 +624,7 @@ public abstract class Structure {
* updated from the contents of native memory.
*/
// TODO: make overridable method with calculated native type, offset, etc
Object readField(StructField structField) {
protected Object readField(StructField structField) {
// Get the offset of the field
int offset = structField.offset;
@@ -734,7 +734,7 @@ public abstract class Structure {
writeField(structField);
}
void writeField(StructField structField) {
protected void writeField(StructField structField) {
if (structField.isReadOnly)
return;
@@ -1663,7 +1663,7 @@ public abstract class Structure {
return null;
}
static class StructField extends Object {
protected static class StructField extends Object {
public String name;
public Class type;
public Field field;
+2 -2
Ver Arquivo
@@ -17,8 +17,8 @@ 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
Native bits are built by passing `-Dskip-native=false` to `ant`. It's
safe to skip the native build as long as your modifications are restricted to
Java code.
For debian-style installs,
+2 -2
Ver Arquivo
@@ -34,7 +34,7 @@ Every Time
* Verify the <version> tags in [pom-jna.xml](https://github.com/twall/jna/blob/master/pom-jna.xml) and [pom-platform.xml](https://github.com/twall/jna/blob/master/pom-platform.xml)
match the version (jna.version) in [build.xml](https://github.com/twall/jna/blob/master/build.xml).
* Run `ant -Dmaven-release=true -Dskip-native=true stage`. This uploads current checkout to [maven.java.net](https://maven.java.net).
* Run `ant -Dmaven-release=true stage`. This uploads current checkout to [maven.java.net](https://maven.java.net).
* Follow steps from [release
it](https://docs.sonatype.org/display/Repository/Sonatype+OSS+Maven+Repository+Usage+Guide#SonatypeOSSMavenRepositoryUsageGuide-8a.ReleaseIt).
Note that the releases are managed from [maven.java.net](https://maven.java.net).
@@ -55,7 +55,7 @@ see: https://maven.java.net/content/repositories/snapshots/net/java/dev/jna/ for
To publish a development SNAPSHOT do the following:
git checkout -- .
ant deploy -Dskip-native=true
ant deploy
Note: Unlike stable, unchanging releases, a SNAPSHOT may be re-published at any time (and is typically deleted after a
full release is performed).
-1
Ver Arquivo
@@ -10,7 +10,6 @@ JNA Release Process
* Run `ant clean dist` target. Commit and push generated files in dist, except for a platform specific jar: "<os>-<arch>.jar".
You will also see differences in the pom-*.xml files and src/.../Native.java. Commit and push these also. Do not commit the altered platform specific jar "<os>-<arch>.jar" in lib/native/.
At some point we may change the 'dist' target to "skip-native", thereby avoiding the rebuild of the "<os>-<arch>.jar" files in lib/native and dist.
* Update Javadoc
Check out gh-pages branch, copy latest doc/javadoc into <version>/javadoc,