Release version 0.8

bigbluebutton · Apr 28, 2014 · 5e0ed47 · 5e0ed47
1 parent 37b70e0
commit 5e0ed47
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 20 deletions.
diff --git 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
@@ -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 &lt;samuel.audet `at` gmail.com&gt;  
+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
@@ -4,12 +4,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.bytedeco</groupId>
   <artifactId>javacpp</artifactId>
-  <version>0.8-SNAPSHOT</version>
+  <version>0.8</version>
   <packaging>maven-plugin</packaging>
 
   <name>JavaCPP</name>
   <description>The missing bridge between Java and native C++</description>
-  <url>https://github.com/bytedeco/javacpp</url>
+  <url>http://bytedeco.org/javacpp/</url>
 
   <licenses>
     <license>
@@ -72,12 +72,11 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.3</version>
         <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
+          <source>1.6</source>
+          <target>1.6</target>
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <version>2.4</version>
         <configuration>
@@ -99,15 +98,13 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-install-plugin</artifactId>
         <version>2.3</version>
         <configuration>
           <createChecksum>true</createChecksum>
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <version>2.3</version>
         <configuration>
@@ -126,7 +123,6 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
         <version>2.2</version>
         <executions>
@@ -139,7 +135,6 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>2.9</version>
         <executions>
@@ -162,6 +157,33 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.4</version>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <version>1.6</version>
+        <executions>
+          <execution>
+            <id>default-deploy</id>
+            <phase>deploy</phase>
+            <goals>
+              <goal>deploy</goal>
+            </goals>
+          </execution>
+        </executions>
+        <extensions>true</extensions>
+        <configuration>
+          <serverId>sonatype-nexus-staging</serverId>
+          <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+          <skipStagingRepositoryClose>true</skipStagingRepositoryClose>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
@@ -177,7 +199,6 @@
       <build>
         <plugins>
           <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
             <version>1.1</version>
             <executions>

diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml
@@ -13,8 +13,6 @@
         <include>LICENSE*</include>
         <include>NOTICE*</include>
         <include>pom.xml</include>
-        <include>build.xml</include>
-        <include>nbproject/*</include>
       </includes>
       <useDefaultExcludes>true</useDefaultExcludes>
     </fileSet>

diff --git 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<String> callbacks;
-    IndexedSet<Class> functions;
-    IndexedSet<Class> deallocators, arrayDeallocators, jclasses, jclassesInit;
+    IndexedSet<Class> functions, deallocators, arrayDeallocators, jclasses, jclassesInit;
     HashMap<Class,LinkedList<String>> 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
@@ -36,7 +36,7 @@ public int index(E e) {
         return i;
     }
 
-    public Iterator<E> iterator() {
+    @Override public Iterator<E> iterator() {
         return keySet().iterator();
     }
 }