commit ef7de5191f2e6572adf67e73fdc44b3894acd815
parent 2305b50b58d5c3fe021e79c0f10254de88e4ac28
Author: KEINOS <github+fork-qiita-news@keinos.com>
Date: Mon, 14 Jul 2025 20:32:00 +0000
Merge remote-tracking branch 'upstream/master'
Diffstat:
8 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
@@ -68,6 +68,7 @@ Browsable
BSODs
Buf
buildtransitive
+buildtrees
cancelledbyuser
casemap
casemappings
@@ -113,6 +114,7 @@ dacl
datetimeoffset
Dbg
Dcom
+DCPPREST
debian
decompressor
dedupe
@@ -126,6 +128,7 @@ desktopappinstaller
devblogs
devhome
DFX
+DHAVE
dic
diskfull
DISPLAYCATALOG
@@ -139,6 +142,7 @@ dustojnikhummer
dvinns
dwgs
dwrite
+DYAML
ecfr
ecfrbrowse
EFGH
@@ -468,6 +472,7 @@ rwgch
rwgs
ryfu
sacl
+sancov
SARL
savepoint
sawgc
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -149,6 +149,14 @@ jobs:
maximumCpuCount: true
- task: CopyFiles@2
+ displayName: Copy vcpkg logs
+ inputs:
+ SourceFolder: $(VCPKG_INSTALLATION_ROOT)\buildtrees
+ Contents: '**\*.log'
+ TargetFolder: '$(artifactsDir)\vcpkgLogs'
+ condition: succeededOrFailed()
+
+ - task: CopyFiles@2
displayName: 'Copy specific build artifacts'
inputs:
Contents: |
@@ -285,6 +293,7 @@ jobs:
inputs:
targetPath: '$(artifactsDir)'
artifact: 'Build.$(artifactIdentifier)'
+ condition: succeededOrFailed()
- task: ComponentGovernanceComponentDetection@0
displayName: Component Governance
@@ -640,6 +649,14 @@ jobs:
maximumCpuCount: true
- task: CopyFiles@2
+ displayName: Copy vcpkg logs
+ inputs:
+ SourceFolder: $(VCPKG_INSTALLATION_ROOT)\buildtrees
+ Contents: '**\*.log'
+ TargetFolder: '$(artifactsDir)\vcpkgLogs'
+ condition: succeededOrFailed()
+
+ - task: CopyFiles@2
displayName: Copy Fuzzing Artifacts for Publishing
inputs:
SourceFolder: '$(buildOutDir)\WinGetYamlFuzzing'
@@ -650,6 +667,7 @@ jobs:
displayName: Publish Fuzzing Artifacts
inputs:
targetPath: '$(artifactsDir)'
+ condition: succeededOrFailed()
- task: onefuzz-task@0
inputs:
diff --git a/src/AppInstallerCLI.sln b/src/AppInstallerCLI.sln
@@ -183,9 +183,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VcpkgCustomTriplets", "Vcpk
VcpkgCustomTriplets\arm64-release.cmake = VcpkgCustomTriplets\arm64-release.cmake
VcpkgCustomTriplets\arm64.cmake = VcpkgCustomTriplets\arm64.cmake
VcpkgCustomTriplets\common.cmake = VcpkgCustomTriplets\common.cmake
+ VcpkgCustomTriplets\fuzzing.cmake = VcpkgCustomTriplets\fuzzing.cmake
+ VcpkgCustomTriplets\x64-fuzzing.cmake = VcpkgCustomTriplets\x64-fuzzing.cmake
VcpkgCustomTriplets\x64-release-static.cmake = VcpkgCustomTriplets\x64-release-static.cmake
VcpkgCustomTriplets\x64-release.cmake = VcpkgCustomTriplets\x64-release.cmake
VcpkgCustomTriplets\x64.cmake = VcpkgCustomTriplets\x64.cmake
+ VcpkgCustomTriplets\x86-fuzzing.cmake = VcpkgCustomTriplets\x86-fuzzing.cmake
VcpkgCustomTriplets\x86-release-static.cmake = VcpkgCustomTriplets\x86-release-static.cmake
VcpkgCustomTriplets\x86-release.cmake = VcpkgCustomTriplets\x86-release.cmake
VcpkgCustomTriplets\x86.cmake = VcpkgCustomTriplets\x86.cmake
diff --git a/src/VcpkgCustomTriplets/common.cmake b/src/VcpkgCustomTriplets/common.cmake
@@ -2,3 +2,19 @@ set(VCPKG_LIBRARY_LINKAGE static)
set(VCPKG_C_FLAGS "/Qspectre /W3 /guard:cf")
set(VCPKG_CXX_FLAGS "/Qspectre /W3 /guard:cf")
set(VCPKG_INSTALL_OPTIONS, "--debug")
+
+if(PORT MATCHES "cpprestsdk")
+ set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /D_NO_ASYNCRTIMP /DCPPREST_EXCLUDE_WEBSOCKETS")
+ set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} /D_NO_ASYNCRTIMP /DCPPREST_EXCLUDE_WEBSOCKETS")
+elseif(PORT MATCHES "detours")
+ set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /D_LIB")
+ set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} /D_LIB")
+elseif(PORT MATCHES "jsoncpp")
+ set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /D_DISABLE_VECTOR_ANNOTATION /D_DISABLE_STRING_ANNOTATION")
+ set(VCPKG_CXX_FLAGS "${VCPKG_C_FLAGS} /D_DISABLE_VECTOR_ANNOTATION /D_DISABLE_STRING_ANNOTATION")
+elseif(PORT MATCHES "libyaml")
+ set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /DYAML_DECLARE_STATIC /DHAVE_CONFIG_H")
+ set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} /DYAML_DECLARE_STATIC /DHAVE_CONFIG_H")
+endif()
+
+message("Compilation flags for ${PORT}: ${VCPKG_CXX_FLAGS}")+
\ No newline at end of file
diff --git a/src/VcpkgCustomTriplets/fuzzing.cmake b/src/VcpkgCustomTriplets/fuzzing.cmake
@@ -0,0 +1,5 @@
+if(PORT MATCHES "jsoncpp|libyaml")
+ set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /fsanitize=address /fsanitize-coverage=inline-8bit-counters /fsanitize-coverage=edge /fsanitize-coverage=trace-cmp /fsanitize-coverage=trace-div")
+ set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} /fsanitize=address /fsanitize-coverage=inline-8bit-counters /fsanitize-coverage=edge /fsanitize-coverage=trace-cmp /fsanitize-coverage=trace-div")
+ set(VCPKG_LINKER_FLAGS libsancov.lib)
+endif()+
\ No newline at end of file
diff --git a/src/VcpkgCustomTriplets/x64-fuzzing.cmake b/src/VcpkgCustomTriplets/x64-fuzzing.cmake
@@ -0,0 +1,2 @@
+include("${CMAKE_CURRENT_LIST_DIR}/x64-release-static.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/fuzzing.cmake")
diff --git a/src/VcpkgCustomTriplets/x86-fuzzing.cmake b/src/VcpkgCustomTriplets/x86-fuzzing.cmake
@@ -0,0 +1,2 @@
+include("${CMAKE_CURRENT_LIST_DIR}/x86-release-static.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/fuzzing.cmake")
diff --git a/src/vcpkg.props b/src/vcpkg.props
@@ -41,11 +41,11 @@
<VcpkgConfiguration>Release</VcpkgConfiguration>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Fuzzing|x64'">
- <VcpkgTriplet>x64-release-static</VcpkgTriplet>
+ <VcpkgTriplet>x64-fuzzing</VcpkgTriplet>
<VcpkgConfiguration>Release</VcpkgConfiguration>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Fuzzing|Win32'">
- <VcpkgTriplet>x86-release-static</VcpkgTriplet>
+ <VcpkgTriplet>x86-fuzzing</VcpkgTriplet>
<VcpkgConfiguration>Release</VcpkgConfiguration>
</PropertyGroup>
</Project>
