From 5e0ed47f781793795d779f9362bd660ec6558821 Mon Sep 17 00:00:00 2001 From: Samuel Audet Date: Mon, 28 Apr 2014 20:44:27 +0900 Subject: [PATCH] Release version 0.8 --- CHANGELOG.md | 1 + README.md | 8 ++-- pom.xml | 41 ++++++++++++++----- src/main/assembly/src.xml | 2 - .../org/bytedeco/javacpp/tools/Generator.java | 6 +-- .../bytedeco/javacpp/tools/IndexedSet.java | 2 +- 6 files changed, 40 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cdd0a3be7..2732cb851 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ +### April 28, 2014 version 0.8 * Move from Google Code to GitHub as main source code repository * Place build-time classes in the `org.bytedeco.javacpp.tools` package and bring out static nested classes, in an effort to avoid conflicts and ease development * Rename the `com.googlecode.javacpp` package to `org.bytedeco.javacpp` diff --git a/README.md b/README.md index 0d49f4d8e..54b0de9c0 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,8 @@ Please feel free to ask questions on [the mailing list](http://groups.google.com Downloads --------- - * JavaCPP 0.8 binary package [javacpp-0.8-bin.zip](http://search.maven.org/remotecontent?filepath=org/bytedeco/javacpp/0.8/javacpp-0.8-bin.zip) - * JavaCPP 0.8 source package [javacpp-0.8-src.zip](http://search.maven.org/remotecontent?filepath=org/bytedeco/javacpp/0.8/javacpp-0.8-src.zip) + * JavaCPP 0.8 binary package [javacpp-0.8-bin.zip](http://search.maven.org/remotecontent?filepath=org/bytedeco/javacpp/0.8/javacpp-0.8-bin.zip) (192 KB) + * JavaCPP 0.8 source package [javacpp-0.8-src.zip](http://search.maven.org/remotecontent?filepath=org/bytedeco/javacpp/0.8/javacpp-0.8-src.zip) (167 KB) Required Software @@ -64,7 +64,7 @@ To implement `native` methods, JavaCPP generates appropriate code for JNI, and p * [optimizing code performance](#optimizing-code-performance), or * [creating callback functions](#creating-callback-functions). -In addition to the few examples provided below, to learn more about how to use the features of this tool, please refer to [the source code of the JavaCPP Presets](https://github.com/bytedeco/javacpp-presets). For more information about the API itself, one may refer to [the documentation generated by Javadoc](https://bytedeco.org/javacpp/javadoc/). +In addition to the few examples provided below, to learn more about how to use the features of this tool, please refer to [the source code of the JavaCPP Presets](https://github.com/bytedeco/javacpp-presets). For more information about the API itself, one may refer to [the documentation generated by Javadoc](http://bytedeco.org/javacpp/apidocs/). As a matter of course, this all works with the Scala language as well, but to make the process even smoother, I would imagine that it should not be too hard to add support for "native properties", such that declarations like `@native var` could generate native getter and setter methods... @@ -327,7 +327,7 @@ And instead of `Loader.load()`, the library should be loaded with `System.load(" ---- -Original author: Samuel Audet <samuel.audet `at` gmail.com> +Original author: Samuel Audet [samuel.audet `at` gmail.com](mailto:samuel.audet at gmail.com) Project site: https://github.com/bytedeco/javacpp Discussion group: http://groups.google.com/group/javacpp-project diff --git a/pom.xml b/pom.xml index 43a605fab..1c85bd988 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ 4.0.0 org.bytedeco javacpp - 0.8-SNAPSHOT + 0.8 maven-plugin JavaCPP The missing bridge between Java and native C++ - https://github.com/bytedeco/javacpp + http://bytedeco.org/javacpp/ @@ -72,12 +72,11 @@ maven-compiler-plugin 2.3 - 1.5 - 1.5 + 1.6 + 1.6 - org.apache.maven.plugins maven-jar-plugin 2.4 @@ -99,7 +98,6 @@ - org.apache.maven.plugins maven-install-plugin 2.3 @@ -107,7 +105,6 @@ - org.apache.maven.plugins maven-assembly-plugin 2.3 @@ -126,7 +123,6 @@ - org.apache.maven.plugins maven-source-plugin 2.2 @@ -139,7 +135,6 @@ - org.apache.maven.plugins maven-javadoc-plugin 2.9 @@ -162,6 +157,33 @@ + + maven-deploy-plugin + 2.4 + + true + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6 + + + default-deploy + deploy + + deploy + + + + true + + sonatype-nexus-staging + https://oss.sonatype.org/ + true + + @@ -177,7 +199,6 @@ - org.apache.maven.plugins maven-gpg-plugin 1.1 diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml index e902db392..ed6278ccf 100644 --- a/src/main/assembly/src.xml +++ b/src/main/assembly/src.xml @@ -13,8 +13,6 @@ LICENSE* NOTICE* pom.xml - build.xml - nbproject/* true diff --git a/src/main/java/org/bytedeco/javacpp/tools/Generator.java b/src/main/java/org/bytedeco/javacpp/tools/Generator.java index b956fcafa..a4c29adab 100644 --- a/src/main/java/org/bytedeco/javacpp/tools/Generator.java +++ b/src/main/java/org/bytedeco/javacpp/tools/Generator.java @@ -150,8 +150,7 @@ public Generator(Logger logger, ClassProperties properties) { final ClassProperties properties; PrintWriter out, out2; IndexedSet callbacks; - IndexedSet functions; - IndexedSet deallocators, arrayDeallocators, jclasses, jclassesInit; + IndexedSet functions, deallocators, arrayDeallocators, jclasses, jclassesInit; HashMap> members; boolean mayThrowExceptions, usesAdapters; @@ -860,7 +859,8 @@ boolean methods(Class cls) { boolean didSomething = false; for (Class c : cls.getDeclaredClasses()) { - if (Pointer.class.isAssignableFrom(c)) { + if (Pointer.class.isAssignableFrom(c) || + Pointer.class.isAssignableFrom(c.getEnclosingClass())) { didSomething |= methods(c); } } diff --git a/src/main/java/org/bytedeco/javacpp/tools/IndexedSet.java b/src/main/java/org/bytedeco/javacpp/tools/IndexedSet.java index 055da0cc3..46cd9d7fe 100644 --- a/src/main/java/org/bytedeco/javacpp/tools/IndexedSet.java +++ b/src/main/java/org/bytedeco/javacpp/tools/IndexedSet.java @@ -36,7 +36,7 @@ public int index(E e) { return i; } - public Iterator iterator() { + @Override public Iterator iterator() { return keySet().iterator(); } }