Skip to content

Commit c23d1a9

Browse files
committed
Fix builds for systems presets
1 parent a462f13 commit c23d1a9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+624
-493
lines changed

.github/workflows/systems.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ jobs:
3737
runs-on: ubuntu-22.04
3838
steps:
3939
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
40+
macosx-arm64:
41+
runs-on: macos-14
42+
steps:
43+
- uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
4044
macosx-x86_64:
4145
runs-on: macos-13
4246
steps:
@@ -51,7 +55,7 @@ jobs:
5155
- uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
5256
redeploy:
5357
# needs: [linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64]
54-
needs: [linux-arm64, linux-x86_64, macosx-x86_64, windows-x86_64]
58+
needs: [linux-arm64, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86_64]
5559
runs-on: ubuntu-22.04
5660
steps:
5761
- uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1472,6 +1472,7 @@
14721472
<module>tesseract</module>
14731473
<module>pytorch</module>
14741474
<module>sentencepiece</module>
1475+
<module>systems</module>
14751476
</modules>
14761477
<properties>
14771478
<javacpp.platform.android-arm></javacpp.platform.android-arm>

systems/platform/pom.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@
6060
<!-- <version>${project.version}</version>-->
6161
<!-- <classifier>${javacpp.platform.linux-ppc64le}</classifier>-->
6262
<!-- </dependency>-->
63+
<dependency>
64+
<groupId>${project.groupId}</groupId>
65+
<artifactId>${javacpp.moduleId}</artifactId>
66+
<version>${project.version}</version>
67+
<classifier>${javacpp.platform.macosx-arm64}</classifier>
68+
</dependency>
6369
<dependency>
6470
<groupId>${project.groupId}</groupId>
6571
<artifactId>${javacpp.moduleId}</artifactId>
@@ -90,7 +96,7 @@
9096
<configuration>
9197
<archive>
9298
<manifestEntries>
93-
<Class-Path>${javacpp.moduleId}.jar ${javacpp.moduleId}-linux-x86.jar ${javacpp.moduleId}-linux-x86_64.jar ${javacpp.moduleId}-linux-armhf.jar ${javacpp.moduleId}-linux-arm64.jar ${javacpp.moduleId}-linux-ppc64le.jar ${javacpp.moduleId}-macosx-x86_64.jar ${javacpp.moduleId}-windows-x86.jar ${javacpp.moduleId}-windows-x86_64.jar</Class-Path>
99+
<Class-Path>${javacpp.moduleId}.jar ${javacpp.moduleId}-linux-x86.jar ${javacpp.moduleId}-linux-x86_64.jar ${javacpp.moduleId}-linux-armhf.jar ${javacpp.moduleId}-linux-arm64.jar ${javacpp.moduleId}-linux-ppc64le.jar ${javacpp.moduleId}-macosx-arm64.jar ${javacpp.moduleId}-macosx-x86_64.jar ${javacpp.moduleId}-windows-x86.jar ${javacpp.moduleId}-windows-x86_64.jar</Class-Path>
94100
</manifestEntries>
95101
</archive>
96102
</configuration>
@@ -140,6 +146,7 @@
140146
// requires static org.bytedeco.${javacpp.moduleId}.linux.armhf;
141147
requires static org.bytedeco.${javacpp.moduleId}.linux.arm64;
142148
// requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le;
149+
requires static org.bytedeco.${javacpp.moduleId}.macosx.arm64;
143150
requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
144151
// requires static org.bytedeco.${javacpp.moduleId}.windows.x86;
145152
requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64;

systems/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,19 @@
4545
</includePaths>
4646
</configuration>
4747
<executions>
48+
<execution>
49+
<id>javacpp-parser</id>
50+
<phase>generate-sources</phase>
51+
<goals>
52+
<goal>parse</goal>
53+
</goals>
54+
<configuration>
55+
<includePaths>
56+
<includePath>/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/</includePath>
57+
<includePath>/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/</includePath>
58+
</includePaths>
59+
</configuration>
60+
</execution>
4861
<execution>
4962
<id>javacpp-compiler</id>
5063
<phase>process-classes</phase>

0 commit comments

Comments
 (0)