Skip to content

Commit d6ef040

Browse files
devjeonghwandevjeonghwan
authored
Fix builds for system APIs on Mac and Windows (pull #1747)
1 parent 1c3d1a7 commit d6ef040

579 files changed

Lines changed: 620 additions & 664 deletions

File tree

Some content is hidden

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

‎.github/actions/deploy-windows/action.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,21 @@ runs:
3838
3939
C:\msys64\usr\bin\bash -lc "pacman -Q"
4040
41+
echo Uninstalling Windows SDK 10.0.26100.XXXX
42+
powershell "Get-ChildItem 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall','HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall' | Get-ItemProperty | Where-Object { $_.DisplayName -like 'Windows Software Development Kit - Windows 10.0.26100.*' } | ForEach-Object { Start-Process -FilePath 'cmd.exe' -ArgumentList '/c', $_.QuietUninstallString -Wait -NoNewWindow }"
43+
44+
echo Verifying Windows SDK 10.0.26100.XXXX has been uninstalled
45+
powershell "$matches = Get-ChildItem 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall','HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall' | Get-ItemProperty | Where-Object { $_.DisplayName -like 'Windows Software Development Kit - Windows 10.0.26100.*' }; $matches | Select-Object DisplayName, DisplayVersion, InstallLocation, QuietUninstallString | Format-List; if ($matches) { exit 1 }"
46+
if %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
47+
4148
echo Installing Windows SDK 10.0.26100.4654
4249
curl -Lo winsdksetup.exe https://go.microsoft.com/fwlink/p/?LinkId=2327008
4350
start /wait winsdksetup.exe /features OptionId.DesktopCPParm64 OptionId.NetFxSoftwareDevelopmentKit /quiet
4451
52+
echo Verifying Windows SDK 10.0.26100.4654 is installed
53+
powershell "$matches = Get-ChildItem 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall','HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall' | Get-ItemProperty | Where-Object { $_.DisplayName -like 'Windows Software Development Kit - Windows 10.0.26100.4654' }; $matches | Select-Object DisplayName, DisplayVersion, InstallLocation, QuietUninstallString | Format-List; if (-not $matches) { exit 20 }"
54+
if %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
55+
4556
echo Removing broken stuff from WSL, MSYS2, etc
4657
rm "C:/msys64/usr/bin/curl.exe" "C:/msys64/mingw32/bin/curl.exe" "C:/msys64/mingw64/bin/curl.exe"
4758
rm "C:/WINDOWS/system32/bash.EXE" "C:/msys64/usr/bin/link.exe" "C:/msys64/usr/bin/timeout.exe" "C:/msys64/usr/bin/python.exe" "C:/msys64/usr/bin/python3.exe"

‎systems/src/gen/java/org/bytedeco/systems/global/macosx.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6282,9 +6282,6 @@ public static native int posix_spawn_file_actions_addfchdir_np(@Cast("posix_spaw
62826282
// Targeting ../macosx/rusage_info_v5.java
62836283

62846284

6285-
// Targeting ../macosx/rusage_info_v6.java
6286-
6287-
62886285
// Targeting ../macosx/rusage_info_current.java
62896286

62906287

‎systems/src/gen/java/org/bytedeco/systems/global/windows.java‎

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Targeted by JavaCPP version 1.5.13: DO NOT EDIT THIS FILE
1+
// Targeted by JavaCPP version 1.5.14-SNAPSHOT: DO NOT EDIT THIS FILE
22

33
package org.bytedeco.systems.global;
44

@@ -7014,7 +7014,8 @@ public static native void WritePointerRaw(
70147014
TokenIsSandboxed = 47,
70157015
TokenIsAppSilo = 48,
70167016
TokenLoggingInformation = 49,
7017-
MaxTokenInfoClass = 50; // MaxTokenInfoClass should always be the last enum
7017+
TokenLearningMode = 50,
7018+
MaxTokenInfoClass = 51; // MaxTokenInfoClass should always be the last enum
70187019
// Targeting ..\windows\TOKEN_USER.java
70197020

70207021

@@ -7086,7 +7087,7 @@ public static native void WritePointerRaw(
70867087
// Valid bits for each TOKEN_AUDIT_POLICY policy mask field.
70877088
//
70887089

7089-
public static final int POLICY_AUDIT_SUBCATEGORY_COUNT = (59);
7090+
public static final int POLICY_AUDIT_SUBCATEGORY_COUNT = (60);
70907091
// Targeting ..\windows\TOKEN_AUDIT_POLICY.java
70917092

70927093

@@ -8209,6 +8210,33 @@ public static native void WritePointerRaw(
82098210
public static final int PF_ARM_SVE_F64MM_INSTRUCTIONS_AVAILABLE = 59;
82108211
public static final int PF_BMI2_INSTRUCTIONS_AVAILABLE = 60;
82118212
public static final int PF_MOVDIR64B_INSTRUCTION_AVAILABLE = 61;
8213+
public static final int PF_ARM_LSE2_AVAILABLE = 62;
8214+
public static final int PF_RESERVED_FEATURE = 63;
8215+
public static final int PF_ARM_SHA3_INSTRUCTIONS_AVAILABLE = 64;
8216+
public static final int PF_ARM_SHA512_INSTRUCTIONS_AVAILABLE = 65;
8217+
public static final int PF_ARM_V82_I8MM_INSTRUCTIONS_AVAILABLE = 66;
8218+
public static final int PF_ARM_V82_FP16_INSTRUCTIONS_AVAILABLE = 67;
8219+
public static final int PF_ARM_V86_BF16_INSTRUCTIONS_AVAILABLE = 68;
8220+
public static final int PF_ARM_V86_EBF16_INSTRUCTIONS_AVAILABLE = 69;
8221+
public static final int PF_ARM_SME_INSTRUCTIONS_AVAILABLE = 70;
8222+
public static final int PF_ARM_SME2_INSTRUCTIONS_AVAILABLE = 71;
8223+
public static final int PF_ARM_SME2_1_INSTRUCTIONS_AVAILABLE = 72;
8224+
public static final int PF_ARM_SME2_2_INSTRUCTIONS_AVAILABLE = 73;
8225+
public static final int PF_ARM_SME_AES_INSTRUCTIONS_AVAILABLE = 74;
8226+
public static final int PF_ARM_SME_SBITPERM_INSTRUCTIONS_AVAILABLE = 75;
8227+
public static final int PF_ARM_SME_SF8MM4_INSTRUCTIONS_AVAILABLE = 76;
8228+
public static final int PF_ARM_SME_SF8MM8_INSTRUCTIONS_AVAILABLE = 77;
8229+
public static final int PF_ARM_SME_SF8DP2_INSTRUCTIONS_AVAILABLE = 78;
8230+
public static final int PF_ARM_SME_SF8DP4_INSTRUCTIONS_AVAILABLE = 79;
8231+
public static final int PF_ARM_SME_SF8FMA_INSTRUCTIONS_AVAILABLE = 80;
8232+
public static final int PF_ARM_SME_F8F32_INSTRUCTIONS_AVAILABLE = 81;
8233+
public static final int PF_ARM_SME_F8F16_INSTRUCTIONS_AVAILABLE = 82;
8234+
public static final int PF_ARM_SME_F16F16_INSTRUCTIONS_AVAILABLE = 83;
8235+
public static final int PF_ARM_SME_B16B16_INSTRUCTIONS_AVAILABLE = 84;
8236+
public static final int PF_ARM_SME_F64F64_INSTRUCTIONS_AVAILABLE = 85;
8237+
public static final int PF_ARM_SME_I16I64_INSTRUCTIONS_AVAILABLE = 86;
8238+
public static final int PF_ARM_SME_LUTv2_INSTRUCTIONS_AVAILABLE = 87;
8239+
public static final int PF_ARM_SME_FA64_INSTRUCTIONS_AVAILABLE = 88;
82128240
//
82138241

82148242
//
@@ -13525,6 +13553,7 @@ public static native void RtlInitializeSListHead(
1352513553
public static final int FAST_FAIL_INVALID_THREAD_STATE = 74;
1352613554
public static final int FAST_FAIL_CORRUPT_WOW64_STATE = 75;
1352713555
public static final int FAST_FAIL_INVALID_EXTENDED_STATE = 76;
13556+
public static final int FAST_FAIL_KERNEL_POINTER_EXPECTED = 77;
1352813557
public static final int FAST_FAIL_INVALID_FAST_FAIL_CODE = 0xFFFFFFFF;
1352913558

1353013559
// #if _MSC_VER >= 1610

‎systems/src/gen/java/org/bytedeco/systems/macosx/rusage_info_v6.java‎

Lines changed: 0 additions & 83 deletions
This file was deleted.

‎systems/src/gen/java/org/bytedeco/systems/windows/ACCESS_ALLOWED_ACE.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Targeted by JavaCPP version 1.5.13: DO NOT EDIT THIS FILE
1+
// Targeted by JavaCPP version 1.5.14-SNAPSHOT: DO NOT EDIT THIS FILE
22

33
package org.bytedeco.systems.windows;
44

‎systems/src/gen/java/org/bytedeco/systems/windows/ACCESS_ALLOWED_CALLBACK_ACE.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Targeted by JavaCPP version 1.5.13: DO NOT EDIT THIS FILE
1+
// Targeted by JavaCPP version 1.5.14-SNAPSHOT: DO NOT EDIT THIS FILE
22

33
package org.bytedeco.systems.windows;
44

‎systems/src/gen/java/org/bytedeco/systems/windows/ACCESS_ALLOWED_CALLBACK_OBJECT_ACE.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Targeted by JavaCPP version 1.5.13: DO NOT EDIT THIS FILE
1+
// Targeted by JavaCPP version 1.5.14-SNAPSHOT: DO NOT EDIT THIS FILE
22

33
package org.bytedeco.systems.windows;
44

‎systems/src/gen/java/org/bytedeco/systems/windows/ACCESS_ALLOWED_OBJECT_ACE.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Targeted by JavaCPP version 1.5.13: DO NOT EDIT THIS FILE
1+
// Targeted by JavaCPP version 1.5.14-SNAPSHOT: DO NOT EDIT THIS FILE
22

33
package org.bytedeco.systems.windows;
44

‎systems/src/gen/java/org/bytedeco/systems/windows/ACCESS_DENIED_ACE.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Targeted by JavaCPP version 1.5.13: DO NOT EDIT THIS FILE
1+
// Targeted by JavaCPP version 1.5.14-SNAPSHOT: DO NOT EDIT THIS FILE
22

33
package org.bytedeco.systems.windows;
44

‎systems/src/gen/java/org/bytedeco/systems/windows/ACCESS_DENIED_CALLBACK_ACE.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Targeted by JavaCPP version 1.5.13: DO NOT EDIT THIS FILE
1+
// Targeted by JavaCPP version 1.5.14-SNAPSHOT: DO NOT EDIT THIS FILE
22

33
package org.bytedeco.systems.windows;
44

0 commit comments

Comments
 (0)