Skip to content

Commit af6ef19

Browse files
author
Andrea Medeghini
committed
improve build scripts
1 parent 1cf70cb commit af6ef19

7 files changed

Lines changed: 29 additions & 29 deletions

File tree

‎ffmpeg4java-linux-test/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<artifactItem>
3535
<groupId>com.nextbreakpoint</groupId>
3636
<artifactId>com.nextbreakpoint.ffmpeg4java.linux</artifactId>
37+
<classifier>x86_64</classifier>
3738
<type>jar</type>
3839
<overWrite>true</overWrite>
3940
<outputDirectory>${project.build.directory}/lib</outputDirectory>

‎ffmpeg4java-linux/pom.xml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,24 +41,20 @@
4141
<artifactId>maven-jar-plugin</artifactId>
4242
<executions>
4343
<execution>
44-
<id>macos</id>
44+
<id>native</id>
4545
<phase>package</phase>
4646
<goals>
4747
<goal>jar</goal>
4848
</goals>
4949
<configuration>
50-
<archive>
51-
<manifestEntries>
52-
<Automatic-Module-Name>com.nextbreakpoint.ffmpeg4java.linux</Automatic-Module-Name>
53-
</manifestEntries>
54-
</archive>
5550
<classifier>x86_64</classifier>
56-
<excludes>
57-
</excludes>
5851
<includes>
59-
<include>**/*.class</include>
6052
<include>**/*.so</include>
53+
<include>**/*.txt</include>
6154
</includes>
55+
<excludes>
56+
<exclude>**/*.class</exclude>
57+
</excludes>
6258
</configuration>
6359
</execution>
6460
</executions>

‎ffmpeg4java-macos-test/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<artifactItem>
3535
<groupId>com.nextbreakpoint</groupId>
3636
<artifactId>com.nextbreakpoint.ffmpeg4java.macos</artifactId>
37+
<classifier>x86_64</classifier>
3738
<type>jar</type>
3839
<overWrite>true</overWrite>
3940
<outputDirectory>${project.build.directory}/lib</outputDirectory>

‎ffmpeg4java-macos/pom.xml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,22 +41,20 @@
4141
<artifactId>maven-jar-plugin</artifactId>
4242
<executions>
4343
<execution>
44-
<id>macos</id>
44+
<id>native</id>
4545
<phase>package</phase>
4646
<goals>
4747
<goal>jar</goal>
4848
</goals>
4949
<configuration>
50-
<archive>
51-
<manifestEntries>
52-
<Automatic-Module-Name>com.nextbreakpoint.ffmpeg4java.macos</Automatic-Module-Name>
53-
</manifestEntries>
54-
</archive>
5550
<classifier>x86_64</classifier>
5651
<includes>
57-
<include>**/*.class</include>
5852
<include>**/*.dylib</include>
53+
<include>**/*.txt</include>
5954
</includes>
55+
<excludes>
56+
<exclude>**/*.class</exclude>
57+
</excludes>
6058
</configuration>
6159
</execution>
6260
</executions>

‎ffmpeg4java-windows-test/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<artifactItem>
3535
<groupId>com.nextbreakpoint</groupId>
3636
<artifactId>com.nextbreakpoint.ffmpeg4java.windows</artifactId>
37+
<classifier>x86_64</classifier>
3738
<type>jar</type>
3839
<overWrite>true</overWrite>
3940
<outputDirectory>${project.build.directory}/lib</outputDirectory>

‎ffmpeg4java-windows/pom.xml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,24 +41,20 @@
4141
<artifactId>maven-jar-plugin</artifactId>
4242
<executions>
4343
<execution>
44-
<id>macos</id>
44+
<id>native</id>
4545
<phase>package</phase>
4646
<goals>
4747
<goal>jar</goal>
4848
</goals>
4949
<configuration>
50-
<archive>
51-
<manifestEntries>
52-
<Automatic-Module-Name>com.nextbreakpoint.ffmpeg4java.windows</Automatic-Module-Name>
53-
</manifestEntries>
54-
</archive>
5550
<classifier>x86_64</classifier>
56-
<excludes>
57-
</excludes>
5851
<includes>
59-
<include>**/*.class</include>
6052
<include>**/*.dll</include>
53+
<include>**/*.txt</include>
6154
</includes>
55+
<excludes>
56+
<exclude>**/*.class</exclude>
57+
</excludes>
6258
</configuration>
6359
</execution>
6460
</executions>

‎pom.xml‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,16 @@
193193
</dependency>
194194
</dependencies>
195195
</plugin>
196+
<plugin>
197+
<groupId>org.apache.maven.plugins</groupId>
198+
<artifactId>maven-jar-plugin</artifactId>
199+
<configuration>
200+
<includes>
201+
<include>**/*.class</include>
202+
<include>**/*.txt</include>
203+
</includes>
204+
</configuration>
205+
</plugin>
196206
<plugin>
197207
<groupId>org.codehaus.mojo</groupId>
198208
<artifactId>versions-maven-plugin</artifactId>
@@ -317,9 +327,8 @@
317327
<profile>
318328
<id>windows</id>
319329
<properties>
320-
<build.type>win32_x86_64</build.type>
321330
<arch.type>x86_64</arch.type>
322-
<os.type>win32</os.type>
331+
<os.type>windows</os.type>
323332
</properties>
324333
<modules>
325334
<module>ffmpeg4java-windows-test</module>
@@ -328,7 +337,6 @@
328337
<profile>
329338
<id>linux</id>
330339
<properties>
331-
<build.type>linux_x86_64</build.type>
332340
<arch.type>x86_64</arch.type>
333341
<os.type>linux</os.type>
334342
</properties>
@@ -339,7 +347,6 @@
339347
<profile>
340348
<id>macos</id>
341349
<properties>
342-
<build.type>macos_x86_64</build.type>
343350
<arch.type>x86_64</arch.type>
344351
<os.type>macos</os.type>
345352
</properties>

0 commit comments

Comments
 (0)