github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-11-15 17:12:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

test package

Browse Source
This commit is contained in:
A13501350
2025-09-20 23:57:58 +08:00
parent 73531e9dfb
commit d4a91295ad
2 changed files with 47 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
.github/workflows/test-ci-windows.yml vendored
View File

@@ -92,11 +92,12 @@ jobs:
run: |
$archFlag = "${{ matrix.arch }}"
$cmakeArch = if ($archFlag -eq "x86") { "Win32" } else { "x64" }
$installDir = if ($archFlag -eq "x86") { "x86" } else { "amd64" }
cmake `
-DAPACHE_ROOT="$env:APACHE_ROOT" `
-DSSDEEP_ROOT="${{ github.workspace }}\ssdeep-install-${{ matrix.arch }}" `
-DCMAKE_INSTALL_PREFIX="${{ github.workspace }}\install-${{ matrix.arch }}" `
-DCMAKE_INSTALL_PREFIX="${{ github.workspace }}\iis\release\$installDir" `
-DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake" `
-A $cmakeArch `
-DWITH_SSDEEP=ON `
@@ -109,11 +110,43 @@ jobs:
run: |
cmake --build "iis\build-${{ matrix.arch }}" --config Release
# - name: Package IIS Module with WiX
# shell: pwsh
# run: |
# $CURRENT_DIR = "${{ github.workspace }}/iis/wix"
# $arch = "${{ matrix.arch }}"
# $wixArch = if ($arch -eq "x86") { "x86" } else { "x64" }
# candle.exe -ext WixUtilExtension -ext WixUIExtension "$CURRENT_DIR\installer.wxs" -out "$CURRENT_DIR\installer.wixobj" -arch $wixArch
# light.exe -ext WixUtilExtension -ext WixUIExtension "$CURRENT_DIR\installer.wixobj" -out "$CURRENT_DIR\installer-$arch.msi"
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: iis-module-${{ matrix.arch }}
path: iis/build-${{ matrix.arch }}/Release/
package:
needs: build
runs-on: windows-latest
steps:
- name: Checkout code
uses: actions/checkout@v5
- name: Download x86 artifacts
uses: actions/download-artifact@v4
with:
name: iis-module-x86
path: iis/release/x86/
- name: Download x64 artifacts
uses: actions/download-artifact@v4
with:
name: iis-module-x64
path: iis/release/amd64/
- name: Package IIS Module with WiX
shell: pwsh
run: |
$CURRENT_DIR = "${{ github.workspace }}\iis\"
candle.exe -ext WixUtilExtension -ext WixUIExtension "$CURRENT_DIR\installer.wxs" -out "$CURRENT_DIR\installer.wixobj" -arch x64
light.exe -ext WixUtilExtension -ext WixUIExtension "$CURRENT_DIR\installer.wixobj" -out "$CURRENT_DIR\installer\modsecurityiis-x64.msi"
candle.exe -ext WixUtilExtension -ext WixUIExtension "$CURRENT_DIR\installer.wxs" -out "$CURRENT_DIR\installer.wixobj" -arch x86
light.exe -ext WixUtilExtension -ext WixUIExtension "$CURRENT_DIR\installer.wixobj" -out "$CURRENT_DIR\installer\modsecurityiis-x86.msi"
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: modsecurityiis-installers
path: iis/installer/*.msi

5
iis/CMakeLists.txt
View File

@@ -149,6 +149,8 @@ if(APACHE_ROOT)
message(FATAL_ERROR "APACHE_ROOT/lib directory does not exist. Expected: '${APACHE_ROOT}/lib'. Please ensure Apache libraries are available.")
endif()
file(TO_CMAKE_PATH "${APACHE_ROOT}" APACHE_ROOT)
# Create imported targets for Apache libraries
add_library(Apache::httpd SHARED IMPORTED)
set_target_properties(Apache::httpd PROPERTIES
@@ -227,6 +229,9 @@ if(WITH_SSDEEP)
message(WARNING "SSDEEP_ROOT is not defined or path does not exist. Current SSDEEP_ROOT: '${SSDEEP_ROOT}'. Please set SSDEEP_ROOT to the ssdeep installation directory. Disabling SSDEEP support.")
set(WITH_SSDEEP OFF CACHE BOOL "Enable SSDEEP support" FORCE)
else()
file(TO_CMAKE_PATH "${SSDEEP_ROOT}" SSDEEP_ROOT)
message(STATUS "SSDEEP_ROOT: ${SSDEEP_ROOT}")
# 查找头文件