Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 3 additions & 9 deletions .github/actions/deploy-windows/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,9 @@ runs:

C:\msys64\usr\bin\bash -lc "pacman -Q"

if "%CI_DEPLOY_PLATFORM%"=="windows-arm64" (
echo Installing Windows SDK 10.0.26100.4654 for Windows on ARM
curl -Lo winsdksetup.exe https://go.microsoft.com/fwlink/p/?LinkId=2327008
start /wait winsdksetup.exe /features OptionId.DesktopCPParm64 OptionId.NetFxSoftwareDevelopmentKit /quiet
) else (
echo Installing Windows SDK 8.1
curl -Lo sdksetup.exe https://go.microsoft.com/fwlink/p/?LinkId=323507
sdksetup.exe /features OptionId.WindowsDesktopSoftwareDevelopmentKit OptionId.NetFxSoftwareDevelopmentKit /quiet
)
echo Installing Windows SDK 10.0.26100.4654
curl -Lo winsdksetup.exe https://go.microsoft.com/fwlink/p/?LinkId=2327008
start /wait winsdksetup.exe /features OptionId.DesktopCPParm64 OptionId.NetFxSoftwareDevelopmentKit /quiet

echo Removing broken stuff from WSL, MSYS2, etc
rm "C:/msys64/usr/bin/curl.exe" "C:/msys64/mingw32/bin/curl.exe" "C:/msys64/mingw64/bin/curl.exe"
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/systems.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ jobs:
runs-on: macos-13
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
windows-arm64:
runs-on: windows-11-arm
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
# windows-x86:
# runs-on: windows-2022
# steps:
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

* Add `windows-arm64` builds for LLVM ([pull #1656](https://github.com/bytedeco/javacpp-presets/pull/1656))
* Add `windows-arm64` builds for LLVM ([pull #1656](https://github.com/bytedeco/javacpp-presets/pull/1656)), and system APIs with upgrade to Windows SDK 10.0 ([pull #1659](https://github.com/bytedeco/javacpp-presets/pull/1659))
* Introduce CUDA-enabled `linux-arm64-gpu` builds to presets for OpenCV ([pull #1651](https://github.com/bytedeco/javacpp-presets/pull/1651))
* Reenable again `linux-arm64` builds for CPython and NumPy ([pull #1652](https://github.com/bytedeco/javacpp-presets/pull/1652))
* Bundle libraries for VA-API 2.x with FFmpeg to avoid loading issues ([issue bytedeco/javacv#2340](https://github.com/bytedeco/javacv/issues/2340))
Expand Down
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1616,6 +1616,7 @@
</activation>
<modules>
<module>llvm</module>
<module>systems</module>
</modules>
<properties>
<javacpp.platform.android-arm></javacpp.platform.android-arm>
Expand Down
9 changes: 8 additions & 1 deletion systems/platform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,12 @@
<version>${project.version}</version>
<classifier>${javacpp.platform.macosx-x86_64}</classifier>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>${javacpp.moduleId}</artifactId>
<version>${project.version}</version>
<classifier>${javacpp.platform.windows-arm64}</classifier>
</dependency>
<!-- <dependency>-->
<!-- <groupId>${project.groupId}</groupId>-->
<!-- <artifactId>${javacpp.moduleId}</artifactId>-->
Expand All @@ -96,7 +102,7 @@
<configuration>
<archive>
<manifestEntries>
<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>
<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-arm64.jar ${javacpp.moduleId}-windows-x86.jar ${javacpp.moduleId}-windows-x86_64.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
Expand Down Expand Up @@ -148,6 +154,7 @@
// requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le;
requires static org.bytedeco.${javacpp.moduleId}.macosx.arm64;
requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.windows.arm64;
// requires static org.bytedeco.${javacpp.moduleId}.windows.x86;
requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64;
}
Expand Down
Loading
Loading