* Replace requires with requires static in JPMS .platform modu…

…les (pull #900)
bytedeco · Jun 29, 2020 · 754d1be · 754d1be
1 parent 5a13d71
commit 754d1be
Show file tree

Hide file tree

Showing 57 changed files with 352 additions and 352 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Replace `requires` with `requires static` in JPMS `.platform` modules ([pull #900](https://github.com/bytedeco/javacpp-presets/pull/900))
  * Add presets for OpenPose 1.6.0 ([pull #898](https://github.com/bytedeco/javacpp-presets/pull/898))
  * Add comparison against MKL in `llvm/samples/polly/MatMulBenchmark.java`
  * Add `requires org.bytedeco.javacpp.${javacpp.platform.module}` to load `jnijavacpp` with JPMS ([pull #893](https://github.com/bytedeco/javacpp-presets/pull/893))

diff --git a/ale/platform/pom.xml b/ale/platform/pom.xml
@@ -117,11 +117,11 @@
                   <file>${project.build.directory}/${project.artifactId}.jar</file>
                   <moduleInfoSource>
                     module org.bytedeco.${javacpp.moduleId}.platform {
-                      requires org.bytedeco.${javacpp.moduleId}.linux.x86;
-                      requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
-                      requires org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
-                      requires org.bytedeco.${javacpp.moduleId}.windows.x86;
-                      requires org.bytedeco.${javacpp.moduleId}.windows.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.x86;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.windows.x86;
+                      requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64;
                     }
                   </moduleInfoSource>
                 </module>

diff --git a/arpack-ng/platform/pom.xml b/arpack-ng/platform/pom.xml
@@ -136,14 +136,14 @@
                   <file>${project.build.directory}/${project.artifactId}.jar</file>
                   <moduleInfoSource>
                     module org.bytedeco.${javacpp.packageName}.platform {
-                      requires org.bytedeco.${javacpp.packageName}.linux.x86;
-                      requires org.bytedeco.${javacpp.packageName}.linux.x86_64;
-                      requires org.bytedeco.${javacpp.packageName}.linux.armhf;
-                      requires org.bytedeco.${javacpp.packageName}.linux.arm64;
-                      requires org.bytedeco.${javacpp.packageName}.linux.ppc64le;
-                      requires org.bytedeco.${javacpp.packageName}.macosx.x86_64;
-                      requires org.bytedeco.${javacpp.packageName}.windows.x86;
-                      requires org.bytedeco.${javacpp.packageName}.windows.x86_64;
+                      requires static org.bytedeco.${javacpp.packageName}.linux.x86;
+                      requires static org.bytedeco.${javacpp.packageName}.linux.x86_64;
+                      requires static org.bytedeco.${javacpp.packageName}.linux.armhf;
+                      requires static org.bytedeco.${javacpp.packageName}.linux.arm64;
+                      requires static org.bytedeco.${javacpp.packageName}.linux.ppc64le;
+                      requires static org.bytedeco.${javacpp.packageName}.macosx.x86_64;
+                      requires static org.bytedeco.${javacpp.packageName}.windows.x86;
+                      requires static org.bytedeco.${javacpp.packageName}.windows.x86_64;
                     }
                   </moduleInfoSource>
                 </module>

diff --git a/arrow/platform/pom.xml b/arrow/platform/pom.xml
@@ -105,9 +105,9 @@
                   <file>${project.build.directory}/${project.artifactId}.jar</file>
                   <moduleInfoSource>
                     module org.bytedeco.${javacpp.moduleId}.platform {
-                      requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
-                      requires org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
-                      requires org.bytedeco.${javacpp.moduleId}.windows.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64;
                     }
                   </moduleInfoSource>
                 </module>

diff --git a/artoolkitplus/platform/pom.xml b/artoolkitplus/platform/pom.xml
@@ -159,18 +159,18 @@
                   <file>${project.build.directory}/${project.artifactId}.jar</file>
                   <moduleInfoSource>
                     module org.bytedeco.${javacpp.moduleId}.platform {
-//                      requires org.bytedeco.${javacpp.moduleId}.android.arm;
-//                      requires org.bytedeco.${javacpp.moduleId}.android.arm64;
-//                      requires org.bytedeco.${javacpp.moduleId}.android.x86;
-//                      requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
-                      requires org.bytedeco.${javacpp.moduleId}.linux.x86;
-                      requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
-                      requires org.bytedeco.${javacpp.moduleId}.linux.armhf;
-                      requires org.bytedeco.${javacpp.moduleId}.linux.arm64;
-                      requires org.bytedeco.${javacpp.moduleId}.linux.ppc64le;
-                      requires org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
-                      requires org.bytedeco.${javacpp.moduleId}.windows.x86;
-                      requires org.bytedeco.${javacpp.moduleId}.windows.x86_64;
+//                      requires static org.bytedeco.${javacpp.moduleId}.android.arm;
+//                      requires static org.bytedeco.${javacpp.moduleId}.android.arm64;
+//                      requires static org.bytedeco.${javacpp.moduleId}.android.x86;
+//                      requires static org.bytedeco.${javacpp.moduleId}.android.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.x86;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.armhf;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.arm64;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le;
+                      requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.windows.x86;
+                      requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64;
                     }
                   </moduleInfoSource>
                 </module>

diff --git a/caffe/platform/gpu/pom.xml b/caffe/platform/gpu/pom.xml
@@ -109,9 +109,9 @@
                 <module>
                   <file>${project.build.directory}/${project.artifactId}.jar</file>
                   <moduleInfoSource>
-                    module org.bytedeco.${javacpp.moduleId}.platform {
-                      requires org.bytedeco.${javacpp.moduleId}.linux.x86_64.gpu;
-//                      requires org.bytedeco.${javacpp.moduleId}.macosx.x86_64.gpu;
+                    module org.bytedeco.${javacpp.moduleId}.platform.gpu {
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64.gpu;
+//                      requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64.gpu;
                     }
                   </moduleInfoSource>
                 </module>

diff --git a/caffe/platform/pom.xml b/caffe/platform/pom.xml
@@ -115,9 +115,9 @@
                   <file>${project.build.directory}/${project.artifactId}.jar</file>
                   <moduleInfoSource>
                     module org.bytedeco.${javacpp.moduleId}.platform {
-                      requires org.bytedeco.${javacpp.moduleId}.linux.x86;
-                      requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
-                      requires org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.x86;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
                     }
                   </moduleInfoSource>
                 </module>

diff --git a/chilitags/platform/pom.xml b/chilitags/platform/pom.xml
@@ -159,18 +159,18 @@
                   <file>${project.build.directory}/${project.artifactId}.jar</file>
                   <moduleInfoSource>
                     module org.bytedeco.${javacpp.moduleId}.platform {
-//                      requires org.bytedeco.${javacpp.moduleId}.android.arm;
-//                      requires org.bytedeco.${javacpp.moduleId}.android.arm64;
-//                      requires org.bytedeco.${javacpp.moduleId}.android.x86;
-//                      requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
-                      requires org.bytedeco.${javacpp.moduleId}.linux.x86;
-                      requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
-                      requires org.bytedeco.${javacpp.moduleId}.linux.armhf;
-                      requires org.bytedeco.${javacpp.moduleId}.linux.arm64;
-                      requires org.bytedeco.${javacpp.moduleId}.linux.ppc64le;
-                      requires org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
-                      requires org.bytedeco.${javacpp.moduleId}.windows.x86;
-                      requires org.bytedeco.${javacpp.moduleId}.windows.x86_64;
+//                      requires static org.bytedeco.${javacpp.moduleId}.android.arm;
+//                      requires static org.bytedeco.${javacpp.moduleId}.android.arm64;
+//                      requires static org.bytedeco.${javacpp.moduleId}.android.x86;
+//                      requires static org.bytedeco.${javacpp.moduleId}.android.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.x86;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.armhf;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.arm64;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le;
+                      requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.windows.x86;
+                      requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64;
                     }
                   </moduleInfoSource>
                 </module>

diff --git a/cminpack/platform/pom.xml b/cminpack/platform/pom.xml
@@ -135,14 +135,14 @@
                   <file>${project.build.directory}/${project.artifactId}.jar</file>
                   <moduleInfoSource>
                     module org.bytedeco.${javacpp.moduleId}.platform {
-                      requires org.bytedeco.${javacpp.moduleId}.linux.x86;
-                      requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
-                      requires org.bytedeco.${javacpp.moduleId}.linux.armhf;
-                      requires org.bytedeco.${javacpp.moduleId}.linux.arm64;
-                      requires org.bytedeco.${javacpp.moduleId}.linux.ppc64le;
-                      requires org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
-                      requires org.bytedeco.${javacpp.moduleId}.windows.x86;
-                      requires org.bytedeco.${javacpp.moduleId}.windows.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.x86;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.armhf;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.arm64;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le;
+                      requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.windows.x86;
+                      requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64;
                     }
                   </moduleInfoSource>
                 </module>

diff --git a/cpu_features/platform/pom.xml b/cpu_features/platform/pom.xml
@@ -159,18 +159,18 @@
                   <file>${project.build.directory}/${project.artifactId}.jar</file>
                   <moduleInfoSource>
                     module org.bytedeco.${javacpp.moduleId}.platform {
-//                      requires org.bytedeco.${javacpp.moduleId}.android.arm;
-//                      requires org.bytedeco.${javacpp.moduleId}.android.arm64;
-//                      requires org.bytedeco.${javacpp.moduleId}.android.x86;
-//                      requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
-                      requires org.bytedeco.${javacpp.moduleId}.linux.x86;
-                      requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
-                      requires org.bytedeco.${javacpp.moduleId}.linux.armhf;
-                      requires org.bytedeco.${javacpp.moduleId}.linux.arm64;
-                      requires org.bytedeco.${javacpp.moduleId}.linux.ppc64le;
-                      requires org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
-                      requires org.bytedeco.${javacpp.moduleId}.windows.x86;
-                      requires org.bytedeco.${javacpp.moduleId}.windows.x86_64;
+//                      requires static org.bytedeco.${javacpp.moduleId}.android.arm;
+//                      requires static org.bytedeco.${javacpp.moduleId}.android.arm64;
+//                      requires static org.bytedeco.${javacpp.moduleId}.android.x86;
+//                      requires static org.bytedeco.${javacpp.moduleId}.android.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.x86;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.armhf;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.arm64;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le;
+                      requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.windows.x86;
+                      requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64;
                     }
                   </moduleInfoSource>
                 </module>

diff --git a/cpython/platform/pom.xml b/cpython/platform/pom.xml
@@ -135,14 +135,14 @@
                   <file>${project.build.directory}/${project.artifactId}.jar</file>
                   <moduleInfoSource>
                     module org.bytedeco.${javacpp.moduleId}.platform {
-                      requires org.bytedeco.${javacpp.moduleId}.linux.x86;
-                      requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
-                      requires org.bytedeco.${javacpp.moduleId}.linux.armhf;
-                      requires org.bytedeco.${javacpp.moduleId}.linux.arm64;
-                      requires org.bytedeco.${javacpp.moduleId}.linux.ppc64le;
-                      requires org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
-                      requires org.bytedeco.${javacpp.moduleId}.windows.x86;
-                      requires org.bytedeco.${javacpp.moduleId}.windows.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.x86;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.armhf;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.arm64;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le;
+                      requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.windows.x86;
+                      requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64;
                     }
                   </moduleInfoSource>
                 </module>

diff --git a/cuda/platform/pom.xml b/cuda/platform/pom.xml
@@ -111,10 +111,10 @@
                   <file>${project.build.directory}/${project.artifactId}.jar</file>
                   <moduleInfoSource>
                     module org.bytedeco.${javacpp.moduleId}.platform {
-                      requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
-                      requires org.bytedeco.${javacpp.moduleId}.linux.ppc64le;
-//                      requires org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
-                      requires org.bytedeco.${javacpp.moduleId}.windows.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le;
+//                      requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64;
                     }
                   </moduleInfoSource>
                 </module>

diff --git a/cuda/platform/redist/pom.xml b/cuda/platform/redist/pom.xml
@@ -106,11 +106,11 @@
                 <module>
                   <file>${project.build.directory}/${project.artifactId}.jar</file>
                   <moduleInfoSource>
-                    module org.bytedeco.${javacpp.moduleId}.platform {
-                      requires org.bytedeco.${javacpp.moduleId}.linux.x86_64.redist;
-                      requires org.bytedeco.${javacpp.moduleId}.linux.ppc64le.redist;
-//                      requires org.bytedeco.${javacpp.moduleId}.macosx.x86_64.redist;
-                      requires org.bytedeco.${javacpp.moduleId}.windows.x86_64.redist;
+                    module org.bytedeco.${javacpp.moduleId}.platform.redist {
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64.redist;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le.redist;
+//                      requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64.redist;
+                      requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64.redist;
                     }
                   </moduleInfoSource>
                 </module>

diff --git a/dnnl/platform/pom.xml b/dnnl/platform/pom.xml
@@ -105,9 +105,9 @@
                   <file>${project.build.directory}/${project.artifactId}.jar</file>
                   <moduleInfoSource>
                     module org.bytedeco.${javacpp.moduleId}.platform {
-                      requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
-                      requires org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
-                      requires org.bytedeco.${javacpp.moduleId}.windows.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
+                      requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64;
                     }
                   </moduleInfoSource>
                 </module>