microsoft · Neumann-A · Nov 12, 2024 · Nov 12, 2024 · Nov 13, 2024 · Nov 14, 2024
diff --git a/.gitignore b/.gitignore
@@ -290,7 +290,7 @@ __pycache__/
 /packages/
 /scripts/buildsystems/tmp/
 #ignore custom triplets
-/triplets/*
+
 #add vcpkg-designed triplets back in
 !/triplets/arm-uwp.cmake
 !/triplets/arm64-windows.cmake

diff --git a/ports/msvc/download_msbuild.cmake b/ports/msvc/download_msbuild.cmake
diff --git a/ports/msvc/download_sdk.cmake b/ports/msvc/download_sdk.cmake
diff --git a/ports/msvc/download_toolkit.cmake b/ports/msvc/download_toolkit.cmake
diff --git a/ports/msvc/extract-vsix.ps1 b/ports/msvc/extract-vsix.ps1
@@ -0,0 +1,19 @@
+param (
+    [Parameter(Mandatory=$true)]
+    [string]$VsixFile,
+    [Parameter(Mandatory=$true)]
+    [string]$ExtractTo = "install"
+)
+
+Add-Type -AssemblyName System.IO.Compression.FileSystem
+[System.IO.Compression.ZipFile]::OpenRead(${VsixFile}).Entries |
+    Where-Object { $_.FullName -like 'Contents/*' } |
+    ForEach-Object { 
+        $relativePath = $_.FullName.Substring(9)  # Remove 'Contents/'
+        $outputPath = Join-Path -Path ${ExtractTo} -ChildPath $relativePath
+        $parentPath = [System.IO.Path]::GetDirectoryName($outputPath)
+        if(-not (Test-Path -Path $parentPath)) {
+            New-Item -Path $parentPath -ItemType Directory -Force
+        }
+        [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $outputPath, $true)  # Extract entry to the install folder
+    }
diff --git a/ports/msvc/msbuild-config.cmake b/ports/msvc/msbuild-config.cmake
@@ -0,0 +1,14 @@
+include(CMakeFindDependencyMacro)
+
+find_dependency(VCToolKit)
+find_dependency(WinSDK)
+
+set(${CMAKE_FIND_PACKAGE_NAME}_PACKAGE_ROOT "${CMAKE_CURRENT_LIST_DIR}/../..")
+
+list(APPEND CMAKE_PROGRAM_PATH "${${CMAKE_FIND_PACKAGE_NAME}_PACKAGE_ROOT}/MSBuild/Current/Bin")
+
+find_program(MSBUILD_EXECUTABLE NAMES MSBuild PATHS "${${CMAKE_FIND_PACKAGE_NAME}_PACKAGE_ROOT}/MSBuild/Current/Bin" REQUIRED NO_DEFAULT_PATH NO_CACHE)
+
+set(msbuild_FOUND TRUE)
+set(MSBUILD_FOUND TRUE)
+set(MSBuild_FOUND TRUE)
diff --git a/ports/msvc/msvc-config.cmake b/ports/msvc/msvc-config.cmake
diff --git a/ports/msvc/msvc-env.cmake b/ports/msvc/msvc-env.cmake
@@ -0,0 +1,100 @@
+include_guard(GLOBAL)
+
+if(NOT DEFINED ENV{VCPKG_TOOLCHAIN_ENV_ALREADY_SET})
+  set(MSVC_DIR "${CMAKE_CURRENT_LIST_DIR}/../../")
+  set(VS_DIR "${CMAKE_CURRENT_LIST_DIR}/../../VS")
+  set(SDK_DIR "${CMAKE_CURRENT_LIST_DIR}/../../WinSDK")
+
+  set(WinSDK_VERSION "10.0.26100.0")
+  set(VCToolkit_VERSION "14.41.34120")
+  set(VCToolkit_REDIST_VERSION "14.40.33807")
+
+  set(LIB 
+        "${VS_DIR}/VC/Tools/MSVC/${VCToolkit_VERSION}/ATLMFC/lib/x64"
+        "${VS_DIR}/VC/Tools/MSVC/${VCToolkit_VERSION}/lib/x64"
+        #"${SDK_DIR}/Windows Kits/NETFXSDK/4.8/lib/um/x64"
+        "${SDK_DIR}/Windows Kits/10/lib/${WinSDK_VERSION}/ucrt/x64"
+        "${SDK_DIR}/Windows Kits/10/lib/${WinSDK_VERSION}/um/x64"
+  )
+  cmake_path(CONVERT "${LIB}" TO_NATIVE_PATH_LIST LIB NORMALIZE)
+  set(ENV{LIB} "${LIB}")
+  set(LIBPATH 
+        "${VS_DIR}/VC/Tools/MSVC/${VCToolkit_VERSION}/ATLMFC/lib/x64"
+        "${VS_DIR}/VC/Tools/MSVC/${VCToolkit_VERSION}/lib/x64"
+        "${VS_DIR}/VC/Tools/MSVC/${VCToolkit_VERSION}/lib/x86/store/references"
+        "${SDK_DIR}/Windows Kits/10/UnionMetadata/${WinSDK_VERSION}"
+        "${SDK_DIR}/Windows Kits/10/References/${WinSDK_VERSION}"
+        #C:/Windows/Microsoft.NET/Framework64/v4.0.30319
+  )
+  cmake_path(CONVERT "${LIBPATH}" TO_NATIVE_PATH_LIST LIBPATH NORMALIZE)
+  set(ENV{LIBPATH} "${LIBPATH}")
+  set(INCLUDE
+        "${VS_DIR}/VC/Tools/MSVC/${VCToolkit_VERSION}/include"
+        "${VS_DIR}/VC/Tools/MSVC/${VCToolkit_VERSION}/ATLMFC/include"
+        "${VS_DIR}/VC/Auxiliary/VS/include"
+        "${SDK_DIR}/Windows Kits/10/include/${WinSDK_VERSION}/ucrt"
+        "${SDK_DIR}/Windows Kits/10/include/${WinSDK_VERSION}/um"
+        "${SDK_DIR}/Windows Kits/10/include/${WinSDK_VERSION}/shared"
+        "${SDK_DIR}/Windows Kits/10/include/${WinSDK_VERSION}/winrt"
+        "${SDK_DIR}/Windows Kits/10/include/${WinSDK_VERSION}/cppwinrt"
+        #"${SDK_DIR}/Windows Kits/NETFXSDK/4.8/include/um"
+  )
+  cmake_path(CONVERT "${INCLUDE}" TO_NATIVE_PATH_LIST INCLUDE NORMALIZE)
+  set(ENV{INCLUDE} "${INCLUDE}")
+  set(EXTERNAL_INCLUDE ${INCLUDE})
+  cmake_path(CONVERT "${EXTERNAL_INCLUDE}" TO_NATIVE_PATH_LIST EXTERNAL_INCLUDE NORMALIZE)
+
+  set(ENV{EXTERNAL_INCLUDE} "${EXTERNAL_INCLUDE}")
+  set(ENV{DevEnvDir} "${VS_DIR}/Common7/IDE/")
+  set(ENV{ExtensionSdkDir} "${SDK_DIR}/Windows Kits/10/ExtensionSDKs")
+  set(ENV{UniversalCRTSdkDir} "${SDK_DIR}/Windows Kits/10/")
+  set(ENV{UCRTVersion} "${WinSDK_VERSION}")
+  set(ENV{VCIDEInstallDir} "${VS_DIR}/Common7/IDE/VC/")
+  set(ENV{VCINSTALLDIR} "${VS_DIR}/VC/")
+  set(ENV{VCToolsInstallDir} "${VS_DIR}/VC/Tools/MSVC/${VCToolkit_VERSION}/")
+  set(ENV{VCToolsRedistDir} "${VS_DIR}/VC/Redist/MSVC/${VCToolkit_REDIST_VERSION}/")
+  set(ENV{VCToolsVersion} "${VCToolkit_VERSION}")
+  set(ENV{VisualStudioVersion} "17.0")
+  set(ENV{VS170COMNTOOLS} "${VS_DIR}/Common7/Tools/")
+  set(ENV{VSINSTALLDIR} "${VS_DIR}/")
+  set(WindowsLibPath 
+        "${SDK_DIR}/Windows Kits/10/UnionMetadata/${WinSDK_VERSION}"
+        "${SDK_DIR}/Windows Kits/10/References/${WinSDK_VERSION}"
+  )
+  cmake_path(CONVERT "${WindowsLibPath}" TO_NATIVE_PATH_LIST WindowsLibPath NORMALIZE)
+  set(ENV{WindowsLibPath} "${WindowsLibPath}")
+  set(ENV{WindowsSdkBinPath} "${SDK_DIR}/Windows Kits/10/bin/")
+  set(ENV{WindowsSdkDir} "${SDK_DIR}/Windows Kits/10/")
+  set(ENV{WindowsSDKLibVersion} "${WinSDK_VERSION}/")
+  set(ENV{WindowsSdkVerBinPath} "${SDK_DIR}/Windows Kits/10/bin/${WinSDK_VERSION}/")
+  set(ENV{WindowsSDKVersion} "${WinSDK_VERSION}/")
+  #set(WindowsSDK_ExecutablePath_x64 "${SDK_DIR}/Windows/v10.0A/bin/NETFX 4.8 Tools/x64/")
+  #set(WindowsSDK_ExecutablePath_x86 "${SDK_DIR}/Windows/v10.0A/bin/NETFX 4.8 Tools/")
+
+  set(ADD_TO_PATH 
+        "${VS_DIR}/VC/Tools/MSVC/${VCToolkit_VERSION}/bin/HostX64/x64"
+        #${VS_DIR}/Common7/IDE/VC/VCPackages
+        #${VS_DIR}/Common7/IDE/CommonExtensions/Microsoft/TestWindow
+        #${VS_DIR}/Common7/IDE/CommonExtensions/Microsoft/TeamFoundation/Team Explorer
+        "${VS_DIR}/MSBuild/Current/bin/Roslyn"
+        #C:/Program Files (x86)/Microsoft SDKs/Windows/v10.0A/bin/NETFX 4.8 Tools/x64/
+        #C:/Program Files (x86)/HTML Help Workshop
+        #${VS_DIR}/Common7/IDE/CommonExtensions/Microsoft/FSharp/Tools
+        #${VS_DIR}/Team Tools/DiagnosticsHub/Collector
+        "${SDK_DIR}/Windows Kits/10/bin/${WinSDK_VERSION}/x64"
+        "${SDK_DIR}/Windows Kits/10/bin/x64"
+        "${VS_DIR}/MSBuild/Current/Bin/"
+        #C:/Windows/Microsoft.NET/Framework64/v4.0.30319
+        #${VS_DIR}/Common7/IDE/
+        #${VS_DIR}/Common7/Tools/
+  )
+  cmake_path(CONVERT "$ENV{PATH}" TO_CMAKE_PATH_LIST path)
+  list(PREPEND path ${ADD_TO_PATH})
+
+  cmake_path(CONVERT "${path}" TO_NATIVE_PATH_LIST path NORMALIZE)
+  set(ENV{PATH} "${path}")
+
+  set(ENV{VCPKG_TOOLCHAIN_ENV_ALREADY_SET} "1")
+endif()
+
+set(MSVC_FOUND TRUE)
diff --git a/ports/msvc/portfile.cmake b/ports/msvc/portfile.cmake
@@ -0,0 +1,29 @@
+set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
+set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
+#set(VCPKG_POLICY_SKIP_COPYRIGHT_CHECK enabled)
+
+find_program(pwsh_exe NAMES pwsh powershell)
+
+set(WinSDK_VERSION "10.0.26100.0")
+set(VCToolkit_VERSION "14.41.34120")
+set(VCToolkit_REDIST_VERSION "14.40.33807")
+
+include("${CMAKE_CURRENT_LIST_DIR}/portfile_winsdk.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/portfile_toolkit.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/portfile_msbuild.cmake")
+
+if(NOT VCPKG_CRT_LINKAGE STREQUAL "static")
+    file(COPY "${CURRENT_PACKAGES_DIR}/VS/VC/Redist/MSVC/${VCToolkit_REDIST_VERSION}/x64/Microsoft.VC143.CRT/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+    file(COPY "${CURRENT_PACKAGES_DIR}/VS/VC/Redist/MSVC/${VCToolkit_REDIST_VERSION}/x64/Microsoft.VC143.MFC/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+    file(COPY "${CURRENT_PACKAGES_DIR}/WinSDK/Windows Kits/10/Redist/${WinSDK_VERSION}/ucrt/DLLs/x64/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+
+    if(NOT VCPKG_BUILD_TYPE)
+        file(COPY "${CURRENT_PACKAGES_DIR}/VS/VC/Redist/MSVC/${VCToolkit_REDIST_VERSION}/debug_nonredist/x64/Microsoft.VC143.DebugCRT/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+        file(COPY "${CURRENT_PACKAGES_DIR}/VS/VC/Redist/MSVC/${VCToolkit_REDIST_VERSION}/debug_nonredist/x64/Microsoft.VC143.DebugMFC/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+        file(COPY "${CURRENT_PACKAGES_DIR}/WinSDK/Windows Kits/10/bin/${WinSDK_VERSION}/x64/ucrt" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+        file(COPY "${CURRENT_PACKAGES_DIR}/WinSDK/Windows Kits/10/Redist/${WinSDK_VERSION}/ucrt/DLLs/x64/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" PATTERN "ucrtbase.dll" EXCLUDE)
+    endif()
+endif()
+
+configure_file("${CMAKE_CURRENT_LIST_DIR}/msvc-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" @ONLY)
+configure_file("${CMAKE_CURRENT_LIST_DIR}/msvc-env.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/msvc-env.cmake" @ONLY)
diff --git a/ports/msvc/portfile_msbuild.cmake b/ports/msvc/portfile_msbuild.cmake
@@ -0,0 +1,66 @@
+block()
+  set(MSBuild_FILES "")
+  include("${CMAKE_CURRENT_LIST_DIR}/download_msbuild.cmake")
+  set(prefix MSBuild)
+
+  foreach(item IN LISTS ${prefix}_FILES)
+    vcpkg_download_distfile(
+        downloaded_file
+        URLS "${${prefix}_${item}_URL}"
+        FILENAME "VS-${VERSION}/MSBuild/${${prefix}_${item}_FILENAME}"
+        SHA512 "${${prefix}_${item}_SHA512}"
+    )
+
+    list(APPEND vsix_installers "${downloaded_file}")
+  endforeach()
+
+  set(counter 0)
+  foreach(item IN LISTS vsix_installers)
+      vcpkg_execute_required_process(
+        COMMAND "${pwsh_exe}" -ExecutionPolicy Bypass -File "${CMAKE_CURRENT_LIST_DIR}/extract-vsix.ps1" "-VsixFile" "${item}" "-ExtractTo" "${CURRENT_PACKAGES_DIR}/VS"
+        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}"
+        LOGNAME "extract_msbuild_${counter}.log"
+      )
+  endforeach()
+
+  set(msbuild_base "${CURRENT_PACKAGES_DIR}/VS/MSBuild/Microsoft/VC/v170/")
+  set(winsdk_props "${msbuild_base}/Microsoft.Cpp.WindowsSDK.props")
+  set(vc_common_props "${msbuild_base}/Microsoft.Cpp.Common.props")
+  file(READ "${winsdk_props}" winsdk_props_content)
+  string(REPLACE 
+    [[<_LatestWindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion($(SDKIdentifier), $(SDKVersion)))</_LatestWindowsTargetPlatformVersion>]]
+    "<_LatestWindowsTargetPlatformVersion>${WinSDK_VERSION}</_LatestWindowsTargetPlatformVersion>" 
+    winsdk_props_content 
+    "${winsdk_props_content}"
+  )
+  string(REPLACE 
+    [[<WindowsSdkDir_10 Condition=\"'$(WindowsSdkDir_10)' == ''\">$(Registry:HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v10.0@InstallationFolder)</WindowsSdkDir_10>]]
+    "" 
+    winsdk_props_content 
+    "${winsdk_props_content}"
+  )
+  string(REPLACE 
+    [[<WindowsSdkDir_10 Condition=\"'$(WindowsSdkDir_10)' == ''\">$(Registry:HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v10.0@InstallationFolder)</WindowsSdkDir_10>]]
+    "<WindowsSdkDir_10 Condition=\"'$(WindowsSdkDir_10)' == ''\">$(MSBuildThisFileDirectory)\\..\\..\\..\\..\\..\\WinSDK\\Windows Kits\\10\\</WindowsSdkDir_10>" 
+    winsdk_props_content 
+    "${winsdk_props_content}"
+  )
+  string(REPLACE 
+    [[<UniversalCRTSdkDir_10 Condition=\"'$(UniversalCRTSdkDir_10)' == ''\">$(Registry:HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows Kits\\Installed Roots@KitsRoot10)</UniversalCRTSdkDir_10>]]
+    "" 
+    winsdk_props_content 
+    "${winsdk_props_content}"
+  )
+  string(REPLACE 
+    [[<UniversalCRTSdkDir_10 Condition=\"'$(UniversalCRTSdkDir_10)' == ''\">$(Registry:HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots@KitsRoot10)</UniversalCRTSdkDir_10>]]
+    "<UniversalCRTSdkDir_10 Condition=\"'$(UniversalCRTSdkDir_10)' == ''\">$(MSBuildThisFileDirectory)\\..\\..\\..\\..\\..\\WinSDK\\Windows Kits\\10\\</UniversalCRTSdkDir_10>" 
+    winsdk_props_content 
+    "${winsdk_props_content}"
+  )
+  file(WRITE "${winsdk_props}" "${winsdk_props_content}")
+
+  vcpkg_replace_string("${vc_common_props}"
+    [[<VSInstallDir>$(VsInstallRoot)\</VSInstallDir>]]
+    "<VSInstallDir>$(MSBuildThisFileDirectory)\\..\\..\\..\\..\\</VSInstallDir>"
+  )
+endblock()
diff --git a/ports/msvc/portfile_toolkit.cmake b/ports/msvc/portfile_toolkit.cmake
@@ -0,0 +1,29 @@
+block()
+  set(VCToolkit_FILES "")
+  include("${CMAKE_CURRENT_LIST_DIR}/download_toolkit.cmake")
+  set(prefix VCToolkit)
+
+  foreach(item IN LISTS VCToolkit_FILES)
+    vcpkg_download_distfile(
+        downloaded_file
+        URLS "${${prefix}_${item}_URL}"
+        FILENAME "VS-${VERSION}/VS/${${prefix}_${item}_FILENAME}"
+        SHA512 "${${prefix}_${item}_SHA512}"
+    )
+
+    list(APPEND vsix_installers "${downloaded_file}")
+  endforeach()
+
+  set(counter 0)
+  foreach(item IN LISTS vsix_installers)
+      math(EXPR counter "${counter} + 1")
+      message(STATUS "Extracting '${item}'")
+      vcpkg_execute_required_process(
+        COMMAND "${pwsh_exe}" -ExecutionPolicy Bypass -File "${CMAKE_CURRENT_LIST_DIR}/extract-vsix.ps1" "-VsixFile" "${item}" "-ExtractTo" "${CURRENT_PACKAGES_DIR}/VS"
+        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}"
+        LOGNAME "extract_msbuild_${counter}.log"
+      )
+  endforeach()
+endblock()
+
+#D:\vcpkg_folders\no_msvc\packages\msvc_x64-windows-release\VS\VC\Tools\MSVC\14.41.34120