fix: Add Windows pkg-config wrapper script and batch file

p2panda · Dec 8, 2024 · 2d65610 · 2d65610
1 parent 4cef1b9
commit 2d65610
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -215,7 +215,7 @@ jobs:
           $installPrefix = "$env:VCPKG_ROOT\installed\$env:VCPKG_TRIPLET"
 
           # Set up pkg-config environment
-          $env:PKG_CONFIG = "$installPrefix\tools\pkgconf\pkg-config.ps1"
+          $env:PKG_CONFIG = "$installPrefix\tools\pkgconf\pkg-config.bat"  # Changed to .bat
           $env:PKG_CONFIG_PATH = "$installPrefix\lib\pkgconfig"
           $env:PKG_CONFIG_LIBDIR = "$installPrefix\lib\pkgconfig"
           $env:PKG_CONFIG_ALLOW_CROSS = "1"

diff --git a/.github/workflows/install_vcpkg.ps1 b/.github/workflows/install_vcpkg.ps1
@@ -20,12 +20,21 @@ vcpkg install libadwaita:$env:VCPKG_TRIPLET
 # Create pkg-config wrapper script to handle Windows paths
 $wrapperContent = @"
 #!/usr/bin/env pwsh
-`$env:PKG_CONFIG_PATH = `$env:PKG_CONFIG_PATH -replace ";",":"
-`$env:PKG_CONFIG_LIBDIR = `$env:PKG_CONFIG_LIBDIR -replace ";",":"
-& "$pkgConfigPath" `$args
+`$env:PKG_CONFIG_PATH = `$env:PKG_CONFIG_PATH -replace ';',':'
+`$env:PKG_CONFIG_LIBDIR = `$env:PKG_CONFIG_LIBDIR -replace ';',':'
+& '$pkgConfigPath' @args
+"@
+
+$batchContent = @"
+@echo off
+powershell.exe -NoProfile -ExecutionPolicy Bypass -File ""%~dp0pkg-config.ps1"" %*
 "@
 
 $wrapperPath = "$env:VCPKG_ROOT\installed\$env:VCPKG_TRIPLET\tools\pkgconf\pkg-config.ps1"
+$batchPath = "$env:VCPKG_ROOT\installed\$env:VCPKG_TRIPLET\tools\pkgconf\pkg-config.bat"
+
 $wrapperContent | Out-File -FilePath $wrapperPath -Encoding UTF8
+$batchContent | Out-File -FilePath $batchPath -Encoding ASCII
 
 Write-Host "Created pkg-config wrapper at: $wrapperPath"
+Write-Host "Created pkg-config batch wrapper at: $batchPath"