Fix jar output for native deps

master
agibsonccc 2021-03-09 18:01:05 +09:00
parent e5c703a28d
commit f6804e760d
2 changed files with 5 additions and 6 deletions

View File

@ -93,7 +93,7 @@
<configuration> <configuration>
<skipMain>${javacpp.parser.skip}</skipMain> <skipMain>${javacpp.parser.skip}</skipMain>
<includes> <includes>
<include>org/nd4j/nativeblas/**.java</include> <include>org/nd4j/nativeblas/*.java</include>
</includes> </includes>
</configuration> </configuration>
</execution> </execution>
@ -219,14 +219,11 @@
<classOrPackageName>org.nd4j.nativeblas.Nd4jCpu</classOrPackageName> <classOrPackageName>org.nd4j.nativeblas.Nd4jCpu</classOrPackageName>
<copyLibs>true</copyLibs> <copyLibs>true</copyLibs>
<configDirectory>${project.build.directory}/classes/META-INF/native-image/${javacpp.platform}${javacpp.platform.extension}/</configDirectory> <configDirectory>${project.build.directory}/classes/META-INF/native-image/${javacpp.platform}${javacpp.platform.extension}/</configDirectory>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
@ -262,7 +259,6 @@
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId> <artifactId>maven-deploy-plugin</artifactId>

View File

@ -166,6 +166,9 @@
org/nd4j/nativeblas/${javacpp.platform}${javacpp.platform.extension}/* org/nd4j/nativeblas/${javacpp.platform}${javacpp.platform.extension}/*
</exclude> </exclude>
<exclude>lib/**</exclude> <exclude>lib/**</exclude>
<exclude>*.dll</exclude>
<exclude>*.dylib</exclude>
<exclude>*.so</exclude>
<exclude>META-INF/native-image/${javacpp.platform}${javacpp.platform.extension}/</exclude> <exclude>META-INF/native-image/${javacpp.platform}${javacpp.platform.extension}/</exclude>
</excludes> </excludes>
</configuration> </configuration>