Skip to content

Commit 3e3a482

Browse files
committed
upgrade dockcross and add armv5
1 parent 5113aa4 commit 3e3a482

1 file changed

Lines changed: 29 additions & 10 deletions

File tree

pom.xml

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
<junit.runner.version>1.${junit.minor}</junit.runner.version>
6969

7070
<javacan.architecture>x86_64</javacan.architecture>
71-
<dockcross.default-tag>20220224-bfdbf76</dockcross.default-tag>
72-
<dockcross.image>dockcross/linux-x64:${dockcross.default-tag}</dockcross.image>
71+
<dockcross.default-tag>20230215-2dd9a1c</dockcross.default-tag>
72+
<dockcross.image>docker.io/dockcross/linux-x64:${dockcross.default-tag}</dockcross.image>
7373
<dockcross.link-mode>dynamic</dockcross.link-mode>
7474

7575
<headers.target>${project.build.directory}/jni/${project.artifactId}</headers.target>
@@ -385,17 +385,19 @@
385385
<javacan.test.architecture>${javacan.architecture}</javacan.test.architecture>
386386

387387
<dockcross.image.x86_64>${dockcross.image}</dockcross.image.x86_64>
388-
<dockcross.image.x86_32>dockcross/linux-x86:${dockcross.default-tag}</dockcross.image.x86_32>
389-
<dockcross.image.armv6>dockcross/linux-armv6:${dockcross.default-tag}</dockcross.image.armv6>
390-
<dockcross.image.armv7>dockcross/linux-armv7:${dockcross.default-tag}</dockcross.image.armv7>
391-
<dockcross.image.armv7a>dockcross/linux-armv7a:${dockcross.default-tag}</dockcross.image.armv7a>
392-
<dockcross.image.armv7l>dockcross/linux-armv7l-musl:${dockcross.default-tag}</dockcross.image.armv7l>
393-
<dockcross.image.aarch64>dockcross/linux-arm64:${dockcross.default-tag}</dockcross.image.aarch64>
394-
<dockcross.image.riscv32>dockcross/linux-riscv32:${dockcross.default-tag}</dockcross.image.riscv32>
395-
<dockcross.image.riscv64>dockcross/linux-riscv64:${dockcross.default-tag}</dockcross.image.riscv64>
388+
<dockcross.image.x86_32>docker.io/dockcross/linux-x86:${dockcross.default-tag}</dockcross.image.x86_32>
389+
<dockcross.image.armv5>docker.io/dockcross/linux-armv5:${dockcross.default-tag}</dockcross.image.armv5>
390+
<dockcross.image.armv6>docker.io/dockcross/linux-armv6:${dockcross.default-tag}</dockcross.image.armv6>
391+
<dockcross.image.armv7>docker.io/dockcross/linux-armv7:${dockcross.default-tag}</dockcross.image.armv7>
392+
<dockcross.image.armv7a>docker.io/dockcross/linux-armv7a:${dockcross.default-tag}</dockcross.image.armv7a>
393+
<dockcross.image.armv7l>docker.io/dockcross/linux-armv7l-musl:${dockcross.default-tag}</dockcross.image.armv7l>
394+
<dockcross.image.aarch64>docker.io/dockcross/linux-arm64:${dockcross.default-tag}</dockcross.image.aarch64>
395+
<dockcross.image.riscv32>docker.io/dockcross/linux-riscv32:${dockcross.default-tag}</dockcross.image.riscv32>
396+
<dockcross.image.riscv64>docker.io/dockcross/linux-riscv64:${dockcross.default-tag}</dockcross.image.riscv64>
396397

397398
<dockcross.link-mode.x86_64>${dockcross.link-mode}</dockcross.link-mode.x86_64>
398399
<dockcross.link-mode.x86_32>${dockcross.link-mode}</dockcross.link-mode.x86_32>
400+
<dockcross.link-mode.armv5>${dockcross.link-mode}</dockcross.link-mode.armv5>
399401
<dockcross.link-mode.armv6>${dockcross.link-mode}</dockcross.link-mode.armv6>
400402
<dockcross.link-mode.armv7>${dockcross.link-mode}</dockcross.link-mode.armv7>
401403
<dockcross.link-mode.armv7a>${dockcross.link-mode}</dockcross.link-mode.armv7a>
@@ -454,6 +456,23 @@
454456
</arguments>
455457
</configuration>
456458
</execution>
459+
<execution>
460+
<id>compile-native-armv5</id>
461+
<phase>compile</phase>
462+
<goals>
463+
<goal>exec</goal>
464+
</goals>
465+
<configuration>
466+
<arguments>
467+
<argument>${java.home}</argument>
468+
<argument>${project.artifactId}</argument>
469+
<argument>${project.version}</argument>
470+
<argument>${dockcross.image.armv5}</argument>
471+
<argument>armv5</argument>
472+
<argument>${dockcross.link-mode.armv5}</argument>
473+
</arguments>
474+
</configuration>
475+
</execution>
457476
<execution>
458477
<id>compile-native-armv6</id>
459478
<phase>compile</phase>

0 commit comments

Comments
 (0)