* Make sure to include only native libraries in platform specific JA…

…R files (pull bytedeco/javacpp#89) * Execute the `cppbuild.sh` scripts within the Maven build lifecycle, can be skipped with `-Djavacpp.cppbuild.skip` (pull #175)
bytedeco · Mar 12, 2016 · 9b4bfeb · 9b4bfeb
1 parent dfaa545
commit 9b4bfeb
Show file tree

Hide file tree

Showing 19 changed files with 81 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,11 @@
 
+ * Make sure to include only native libraries in platform specific JAR files ([pull bytedeco/javacpp#89](https://github.com/bytedeco/javacpp/pull/89))
+ * Execute the `cppbuild.sh` scripts within the Maven build lifecycle, can be skipped with `-Djavacpp.cppbuild.skip` ([pull #175](https://github.com/bytedeco/javacpp-presets/pull/175))
  * Fix Caffe crashing in GPU mode: Do not define `CPU_ONLY` ([issue #147](https://github.com/bytedeco/javacpp-presets/issues/147))
  * Make OpenBLAS build for Caffe more generic ([issue #154](https://github.com/bytedeco/javacpp-presets/issues/154))
  * Include missing `graph_constructor.h` header file from the `tensorflow` module ([issue #165](https://github.com/bytedeco/javacpp-presets/issues/165))
  * Add missing `GraphDefBuilder.Options.WithAttr()` methods from the `tensorflow` module ([issue #160](https://github.com/bytedeco/javacpp-presets/issues/160))
- * Add `linux-armhf` platform to the `cppbuild.sh` scripts of OpenCV and FFmpeg
+ * Add `linux-armhf` platform to the `cppbuild.sh` scripts of OpenCV, FFmpeg, etc ([pull #177](https://github.com/bytedeco/javacpp-presets/pull/177))
  * Add support for Motion JPEG to the minimal configuration proposed for FFmpeg in the `cppbuild.sh` file
  * Make `mvn -Djavacpp.platform=...` and `mvn -Djavacpp.platform.dependency=...` commands work correctly
  * Add presets for the `dnn` module of OpenCV 3.1 ([issue #145](https://github.com/bytedeco/javacpp-presets/issues/145))

diff --git a/artoolkitplus/pom.xml b/artoolkitplus/pom.xml
@@ -28,6 +28,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
       </plugin>

diff --git a/caffe/pom.xml b/caffe/pom.xml
@@ -33,6 +33,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
       </plugin>

diff --git a/chilitags/pom.xml b/chilitags/pom.xml
@@ -29,6 +29,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
       </plugin>

diff --git a/cuda/pom.xml b/cuda/pom.xml
@@ -28,6 +28,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
       </plugin>

diff --git a/ffmpeg/pom.xml b/ffmpeg/pom.xml
@@ -24,6 +24,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
       </plugin>

diff --git a/fftw/pom.xml b/fftw/pom.xml
@@ -28,6 +28,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
       </plugin>

diff --git a/flandmark/pom.xml b/flandmark/pom.xml
@@ -33,6 +33,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
       </plugin>

diff --git a/flycapture/pom.xml b/flycapture/pom.xml
@@ -29,6 +29,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
       </plugin>

diff --git a/gsl/pom.xml b/gsl/pom.xml
@@ -28,6 +28,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
       </plugin>

diff --git a/leptonica/pom.xml b/leptonica/pom.xml
@@ -28,6 +28,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
       </plugin>

diff --git a/libdc1394/pom.xml b/libdc1394/pom.xml
@@ -28,6 +28,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
       </plugin>

diff --git a/libfreenect/pom.xml b/libfreenect/pom.xml
@@ -28,6 +28,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
       </plugin>

diff --git a/llvm/pom.xml b/llvm/pom.xml
@@ -24,6 +24,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
       </plugin>

diff --git a/mxnet/pom.xml b/mxnet/pom.xml
@@ -33,6 +33,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
       </plugin>

diff --git a/pom.xml b/pom.xml
@@ -82,6 +82,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <javacpp.cppbuild.skip>false</javacpp.cppbuild.skip> <!-- To skip execution of cppbuild.sh: -Djavacpp.cppbuild.skip=true -->
     <javacpp.parser.skip>false</javacpp.parser.skip>     <!-- To skip header file parsing phase: -Djavacpp.parser.skip=true  -->
     <javacpp.compiler.skip>false</javacpp.compiler.skip> <!-- To skip native compilation phase: -Djavacpp.compiler.skip=true -->
   </properties>
@@ -105,7 +106,7 @@
         <version>2.7</version>
         <executions>
           <execution>
-            <id>generate-sources</id>
+            <id>javacpp.parser</id>
             <phase>generate-sources</phase>
             <goals>
               <goal>resources</goal>
@@ -122,7 +123,7 @@
         </configuration>
         <executions>
           <execution>
-            <id>generate-sources</id>
+            <id>javacpp.parser</id>
             <phase>generate-sources</phase>
             <goals>
               <goal>compile</goal>
@@ -159,7 +160,7 @@
         </configuration>
         <executions>
           <execution>
-            <id>generate-sources</id>
+            <id>javacpp.parser</id>
             <phase>generate-sources</phase>
             <goals>
               <goal>build</goal>
@@ -171,7 +172,7 @@
             </configuration>
           </execution>
           <execution>
-            <id>process-classes</id>
+            <id>javacpp.compiler</id>
             <phase>process-classes</phase>
             <goals>
               <goal>build</goal>
@@ -236,7 +237,7 @@
               <skipIfEmpty>true</skipIfEmpty>
               <includes>
                 <include>${javacpp.platform.library.path}/</include>
-                <include>org/bytedeco/javacpp/${javacpp.platform}/</include>
+                <include>org/bytedeco/javacpp/${javacpp.platform}/${javacpp.platform.library.prefix}*${javacpp.platform.library.suffix}*</include>
               </includes>
             </configuration>
           </execution>
@@ -326,17 +327,19 @@
         <version>1.4.0</version>
         <executions>
           <execution>
-            <id>cppbuild</id>
+            <id>javacpp.cppbuild</id>
             <phase>generate-sources</phase>
             <goals>
               <goal>exec</goal>
             </goals>
           </execution>
         </executions>
         <configuration>
-          <executable>${project.basedir}/../cppbuild.sh</executable>
+          <skip>${javacpp.cppbuild.skip}</skip>
           <workingDirectory>${project.basedir}/..</workingDirectory>
+          <executable>bash</executable>
           <arguments>
+            <argument>${project.basedir}/../cppbuild.sh</argument>
             <argument>install</argument>
             <argument>${project.artifactId}</argument>
             <argument>-platform</argument>

diff --git a/tensorflow/pom.xml b/tensorflow/pom.xml
@@ -28,6 +28,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
       </plugin>

diff --git a/tesseract/pom.xml b/tesseract/pom.xml
@@ -33,6 +33,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
       </plugin>

diff --git a/videoinput/pom.xml b/videoinput/pom.xml
@@ -30,6 +30,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
       </plugin>