mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-19 06:26:14 -05:00
feat: build and smoke test native Windows ARM64 packages
This commit is contained in:
8 files changed
+50
-12
No files matched your search
@@ -366,7 +366,7 @@ mod tests {
|
|||||||
r#"{"version":1,"anchor":{"hardware_id":"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA","source":1}}"#
|
r#"{"version":1,"anchor":{"hardware_id":"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA","source":1}}"#
|
||||||
);
|
);
|
||||||
|
|
||||||
for source in [0, 4] {
|
for source in [0, u8::MAX] {
|
||||||
let json = serde_json::json!({
|
let json = serde_json::json!({
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"anchor": {
|
"anchor": {
|
||||||
|
|||||||
@@ -12,6 +12,9 @@ RequestExecutionLevel admin
|
|||||||
!ifndef PRODUCT_VERSION
|
!ifndef PRODUCT_VERSION
|
||||||
!error "PRODUCT_VERSION is required"
|
!error "PRODUCT_VERSION is required"
|
||||||
!endif
|
!endif
|
||||||
|
!ifndef TARGET_ARCH
|
||||||
|
!define TARGET_ARCH "x64"
|
||||||
|
!endif
|
||||||
!ifndef BUILD_VERSION
|
!ifndef BUILD_VERSION
|
||||||
!define BUILD_VERSION "${PRODUCT_VERSION}.0"
|
!define BUILD_VERSION "${PRODUCT_VERSION}.0"
|
||||||
!endif
|
!endif
|
||||||
@@ -43,10 +46,21 @@ ShowUninstDetails show
|
|||||||
!insertmacro MUI_LANGUAGE "English"
|
!insertmacro MUI_LANGUAGE "English"
|
||||||
|
|
||||||
Function .onInit
|
Function .onInit
|
||||||
${IfNot} ${RunningX64}
|
!if "${TARGET_ARCH}" == "arm64"
|
||||||
MessageBox MB_OK|MB_ICONSTOP "GP Connect requires 64-bit Windows."
|
${IfNot} ${IsNativeARM64}
|
||||||
|
MessageBox MB_OK|MB_ICONSTOP "This GP Connect installer requires Windows 11 on ARM64." /SD IDOK
|
||||||
|
SetErrorLevel 1
|
||||||
Abort
|
Abort
|
||||||
${EndIf}
|
${EndIf}
|
||||||
|
!else if "${TARGET_ARCH}" == "x64"
|
||||||
|
${IfNot} ${IsNativeAMD64}
|
||||||
|
MessageBox MB_OK|MB_ICONSTOP "This GP Connect installer requires x64 Windows." /SD IDOK
|
||||||
|
SetErrorLevel 1
|
||||||
|
Abort
|
||||||
|
${EndIf}
|
||||||
|
!else
|
||||||
|
!error "Unsupported TARGET_ARCH"
|
||||||
|
!endif
|
||||||
SetRegView 64
|
SetRegView 64
|
||||||
FunctionEnd
|
FunctionEnd
|
||||||
|
|
||||||
|
|||||||
@@ -232,11 +232,15 @@ try {
|
|||||||
throw 'Use the Windows installer to update this installation.'
|
throw 'Use the Windows installer to update this installation.'
|
||||||
}
|
}
|
||||||
if (!$Version) { $Version = $info.version }
|
if (!$Version) { $Version = $info.version }
|
||||||
if ($info.product -ne 'GP Connect' -or $info.architecture -ne 'x64' -or !$Version -or $info.version -ne $Version) {
|
$architecture = [System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant()
|
||||||
|
if ($info.product -ne 'GP Connect' -or $info.architecture -notin @('x64','arm64') -or $info.architecture -ne $architecture -or !$Version -or $info.version -ne $Version) {
|
||||||
throw 'The package version or architecture does not match this installer.'
|
throw 'The package version or architecture does not match this installer.'
|
||||||
}
|
}
|
||||||
if (![Environment]::Is64BitProcess -or [Environment]::OSVersion.Version.Build -lt 19041) {
|
if (![Environment]::Is64BitProcess -or [Environment]::OSVersion.Version.Build -lt 19041) {
|
||||||
throw 'GP Connect requires Windows 10 build 19041 or newer, x64.'
|
throw 'GP Connect requires Windows 10 build 19041 or newer.'
|
||||||
|
}
|
||||||
|
if ($architecture -eq 'arm64' -and [Environment]::OSVersion.Version.Build -lt 22000) {
|
||||||
|
throw 'GP Connect for ARM64 requires Windows 11.'
|
||||||
}
|
}
|
||||||
$payload = @(Get-ChildItem -LiteralPath $source -Force | Where-Object {
|
$payload = @(Get-ChildItem -LiteralPath $source -Force | Where-Object {
|
||||||
($_.PSIsContainer -and $_.Name -eq 'licenses') -or
|
($_.PSIsContainer -and $_.Name -eq 'licenses') -or
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
[CmdletBinding()]
|
[CmdletBinding()]
|
||||||
param(
|
param(
|
||||||
[string]$MsysRoot = 'C:\msys64',
|
[string]$MsysRoot = 'C:\msys64',
|
||||||
[ValidateSet('mingw64','ucrt64')][string]$MsysSubsystem = 'mingw64',
|
[ValidateSet('mingw64','ucrt64','clangarm64')][string]$MsysSubsystem = 'mingw64',
|
||||||
[string]$Prefix,
|
[string]$Prefix,
|
||||||
[int]$Jobs = 4
|
[int]$Jobs = 4
|
||||||
)
|
)
|
||||||
@@ -19,10 +19,16 @@ $nativeExit = $LASTEXITCODE
|
|||||||
$ErrorActionPreference = 'Stop'
|
$ErrorActionPreference = 'Stop'
|
||||||
if ($nativeExit -ne 0) { throw 'OpenConnect compilation failed.' }
|
if ($nativeExit -ne 0) { throw 'OpenConnect compilation failed.' }
|
||||||
|
|
||||||
|
$architecture = 'x64'
|
||||||
|
if ($MsysSubsystem -eq 'clangarm64') { $architecture = 'arm64' }
|
||||||
|
$component = 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64'
|
||||||
|
if ($architecture -eq 'arm64') { $component = 'Microsoft.VisualStudio.Component.VC.Tools.ARM64' }
|
||||||
|
$hostTools = 'Hostx64'
|
||||||
|
if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64') { $hostTools = 'Hostarm64' }
|
||||||
$vswhere = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
|
$vswhere = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
|
||||||
$vs = & $vswhere -latest -products '*' -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath
|
$vs = & $vswhere -latest -products '*' -requires $component -property installationPath
|
||||||
if (!$vs) { throw 'Visual Studio C++ Build Tools are required.' }
|
if (!$vs) { throw 'Visual Studio C++ Build Tools are required.' }
|
||||||
$tools = (Get-ChildItem "$vs\VC\Tools\MSVC\*\bin\Hostx64\x64\lib.exe" |
|
$tools = (Get-ChildItem "$vs\VC\Tools\MSVC\*\bin\$hostTools\$architecture\lib.exe" |
|
||||||
Sort-Object FullName | Select-Object -Last 1).DirectoryName
|
Sort-Object FullName | Select-Object -Last 1).DirectoryName
|
||||||
$dll = Join-Path $Prefix 'bin\libopenconnect-5.dll'
|
$dll = Join-Path $Prefix 'bin\libopenconnect-5.dll'
|
||||||
$exports = & "$tools\dumpbin.exe" /nologo /exports $dll
|
$exports = & "$tools\dumpbin.exe" /nologo /exports $dll
|
||||||
@@ -35,7 +41,7 @@ foreach ($symbol in @('openconnect_setup_cmd_pipe', 'openconnect_setup_tun_pipe'
|
|||||||
}
|
}
|
||||||
$definition = Join-Path $Prefix 'lib\openconnect.def'
|
$definition = Join-Path $Prefix 'lib\openconnect.def'
|
||||||
[System.IO.File]::WriteAllLines($definition, @('LIBRARY libopenconnect-5.dll', 'EXPORTS') + $names)
|
[System.IO.File]::WriteAllLines($definition, @('LIBRARY libopenconnect-5.dll', 'EXPORTS') + $names)
|
||||||
& "$tools\lib.exe" /nologo /machine:x64 "/def:$definition" "/out:$Prefix\lib\openconnect.lib"
|
& "$tools\lib.exe" /nologo "/machine:$architecture" "/def:$definition" "/out:$Prefix\lib\openconnect.lib"
|
||||||
if ($LASTEXITCODE -ne 0) { throw 'Could not generate the MSVC import library.' }
|
if ($LASTEXITCODE -ne 0) { throw 'Could not generate the MSVC import library.' }
|
||||||
|
|
||||||
# Copy only the native DLL's transitive MinGW runtime dependencies.
|
# Copy only the native DLL's transitive MinGW runtime dependencies.
|
||||||
|
|||||||
@@ -13,7 +13,12 @@ cd "$source_dir"
|
|||||||
autoreconf -fi
|
autoreconf -fi
|
||||||
mkdir -p "$build_dir"
|
mkdir -p "$build_dir"
|
||||||
cd "$build_dir"
|
cd "$build_dir"
|
||||||
"$source_dir/configure" --host=x86_64-w64-mingw32 --prefix="$prefix" \
|
host=x86_64-w64-mingw32
|
||||||
|
if [[ $subsystem == clangarm64 ]]; then
|
||||||
|
host=aarch64-w64-mingw32
|
||||||
|
export CC=clang AR=llvm-ar RANLIB=llvm-ranlib NM=llvm-nm
|
||||||
|
fi
|
||||||
|
"$source_dir/configure" --host="$host" --prefix="$prefix" \
|
||||||
--enable-shared --disable-static --disable-nls --disable-docs --disable-dsa-tests \
|
--enable-shared --disable-static --disable-nls --disable-docs --disable-dsa-tests \
|
||||||
--without-libproxy --without-stoken --without-libpcsclite --without-libpskc \
|
--without-libproxy --without-stoken --without-libpcsclite --without-libpskc \
|
||||||
--without-gssapi --with-gnutls --without-openssl --with-gnutls-tss2=no \
|
--without-gssapi --with-gnutls --without-openssl --with-gnutls-tss2=no \
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[CmdletBinding()]
|
[CmdletBinding()]
|
||||||
param([string]$MsysRoot = 'C:\msys64', [string]$Prefix = $env:OPENCONNECT_WINDOWS_PREFIX,
|
param([string]$MsysRoot = 'C:\msys64', [string]$Prefix = $env:OPENCONNECT_WINDOWS_PREFIX,
|
||||||
[ValidateSet('mingw64','ucrt64')][string]$MsysSubsystem = 'mingw64')
|
[ValidateSet('mingw64','ucrt64','clangarm64')][string]$MsysSubsystem = 'mingw64')
|
||||||
$repo = Split-Path $PSScriptRoot -Parent
|
$repo = Split-Path $PSScriptRoot -Parent
|
||||||
if (!$Prefix) { $Prefix = Join-Path $repo 'target\native-windows' }
|
if (!$Prefix) { $Prefix = Join-Path $repo 'target\native-windows' }
|
||||||
& "$MsysRoot\usr\bin\bash.exe" "$PSScriptRoot/test-openconnect-windows.sh" $repo $Prefix $MsysSubsystem
|
& "$MsysRoot\usr\bin\bash.exe" "$PSScriptRoot/test-openconnect-windows.sh" $repo $Prefix $MsysSubsystem
|
||||||
|
|||||||
@@ -8,7 +8,9 @@ prefix=$(cygpath -u "$2")
|
|||||||
build_dir="$repo/target/openconnect-windows"
|
build_dir="$repo/target/openconnect-windows"
|
||||||
source_dir="$repo/crates/openconnect/deps/openconnect"
|
source_dir="$repo/crates/openconnect/deps/openconnect"
|
||||||
export PATH="$prefix/bin:$PATH"
|
export PATH="$prefix/bin:$PATH"
|
||||||
gcc -Wall -Wextra -I"$build_dir" -I"$source_dir" -I"$source_dir/json" \
|
compiler=gcc
|
||||||
|
if [[ $subsystem == clangarm64 ]]; then compiler=clang; fi
|
||||||
|
"$compiler" -Wall -Wextra -I"$build_dir" -I"$source_dir" -I"$source_dir/json" \
|
||||||
$(pkg-config --cflags gnutls libxml-2.0) \
|
$(pkg-config --cflags gnutls libxml-2.0) \
|
||||||
"$repo/crates/openconnect/tests/windows_packet_pipe.c" \
|
"$repo/crates/openconnect/tests/windows_packet_pipe.c" \
|
||||||
-L"$prefix/lib" -lopenconnect -lws2_32 -o "$build_dir/test-windows-packet-pipe.exe"
|
-L"$prefix/lib" -lopenconnect -lws2_32 -o "$build_dir/test-windows-packet-pipe.exe"
|
||||||
|
|||||||
@@ -28,6 +28,13 @@ foreach ($name in @('gpgui.exe', 'gpauth.exe')) {
|
|||||||
$process = Start-Process (Join-Path $destination $name) -ArgumentList '--version' -PassThru -Wait
|
$process = Start-Process (Join-Path $destination $name) -ArgumentList '--version' -PassThru -Wait
|
||||||
if ($process.ExitCode -ne 0) { throw "The installed $name cannot start." }
|
if ($process.ExitCode -ne 0) { throw "The installed $name cannot start." }
|
||||||
}
|
}
|
||||||
|
$helper = Join-Path $destination 'gp-posture.exe'
|
||||||
|
$output = Join-Path $env:TEMP 'gp-posture-install-test.json'
|
||||||
|
$process = Start-Process $helper -PassThru -Wait -RedirectStandardOutput $output
|
||||||
|
if ($process.ExitCode -ne 0) { throw 'The installed posture helper failed.' }
|
||||||
|
$report = Get-Content $output -Raw | ConvertFrom-Json
|
||||||
|
if ($null -eq $report.anti_malware -or $null -eq $report.firewall) { throw 'Invalid posture helper output.' }
|
||||||
|
Remove-Item $output
|
||||||
$state = Join-Path $env:LOCALAPPDATA 'GP Connect\config\protected-state'
|
$state = Join-Path $env:LOCALAPPDATA 'GP Connect\config\protected-state'
|
||||||
New-Item -ItemType Directory -Force $state | Out-Null
|
New-Item -ItemType Directory -Force $state | Out-Null
|
||||||
$marker = Join-Path $state 'ci-install-retention'
|
$marker = Join-Path $state 'ci-install-retention'
|
||||||
|
|||||||
Reference in new issue
Block a user