and finally we have dxcompiler build from nano server ltsc2022; update winsdk-msvc-toolchain.cmake, add atl & mfc, a few hacks with global tmp .gitconfig on CMake configure, redist/msvc.ps1 script

Author: AnastaZIuk

.dockerignore

@@ -1 +1,2 @@
-**
+**
+!redist/**

Dockerfile

@@ -29,6 +29,8 @@ RUN mkdir C:\Temp && cd C:\Temp `
 && (start /w vs_buildtools.exe --quiet --wait --norestart --nocache `
 --remove Microsoft.VisualStudio.Component.VC.Tools.x86.x64 `
 --add Microsoft.VisualStudio.Component.VC.%VC_VERSION%.x86.x64 `
+--add Microsoft.VisualStudio.Component.VC.%VC_VERSION%.ATL `
+--add Microsoft.VisualStudio.Component.VC.%VC_VERSION%.MFC `
 --add Microsoft.VisualStudio.Component.Windows11SDK.%WINDOWS_11_SDK_VERSION% `
 --add Microsoft.VisualCpp.DIA.SDK `
 --installPath %IMPL_ARTIFACTS_DIR% `
@@ -116,6 +118,7 @@ Remove-Item C:\Temp\git.zip
 # ---------------- FINAL IMAGE ----------------
 FROM ${IMPL_NANO_BASE}:${IMPL_NANO_TAG}
 SHELL ["pwsh", "-NoLogo", "-NoProfile", "-ExecutionPolicy", "Bypass", "-Command"]
+USER ContainerAdministrator
 
 ARG IMPL_ARTIFACTS_DIR
 COPY --link --from=buildtools ["C:/Program Files (x86)/Windows Kits/10", "C:/WindowsKits10SDK"]
@@ -126,6 +129,10 @@ COPY --link --from=ninja ["${IMPL_ARTIFACTS_DIR}", "C:/Ninja"]
 COPY --link --from=nasm ["${IMPL_ARTIFACTS_DIR}", "C:/Nasm"]
 COPY --link --from=git ["${IMPL_ARTIFACTS_DIR}", "C:/Git"]
 
+COPY redist/msvc.ps1 msvc.ps1
+ARG MSVC_VERSION
+RUN $REDIST_PATH = 'C:/BuildTools/VC/Redist/MSVC/' + $env:MSVC_VERSION ; pwsh -File msvc.ps1 -RedistPath "$REDIST_PATH" -Arch x64
+
 ARG CMAKE_VERSION
 ARG PYTHON_VERSION
 ARG NINJA_VERSION
@@ -134,9 +141,8 @@ ARG GIT_VERSION
 ARG WINDOWS_11_SDK_VERSION
 ARG WINDOWS_SDK_VERSION
 ARG VC_VERSION
-ARG MSVC_VERSION
 
-USER ContainerAdministrator
+
 ENV CMAKE_WINDOWS_KITS_10_DIR="C:\WindowsKits10SDK" `
 CMAKE_VERSION=${CMAKE_VERSION} `
 PYTHON_VERSION=${PYTHON_VERSION} `

cmake/winsdk-msvc-toolchain.cmake

@@ -28,12 +28,12 @@ if("${FOUND}" MATCHES "-1")
     message(FATAL_ERROR "MSVC_TOOLSET_DIR is not within VS_INSTANCE_LOCATION, did you move the MSVC toolset directory outside the VS installation? (bad idea!)")
 endif()
 
-set(CMAKE_SYSTEM_NAME Windows)
 set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_HOST_SYSTEM_PROCESSOR})
 
 if(ARCH)
     if(ARCH MATCHES "x64")
     elseif(ARCH MATCHES "arm64")
+        set(CMAKE_SYSTEM_NAME Windows)
         set(CMAKE_SYSTEM_PROCESSOR arm64)
         # never tested it but I'm pretty sure _COMPILER needs to be updated depending on target ARCH
         message(FATAL_ERROR "TODO, Cross compilation requires ARM64 build tools compoment and updates to the toolchain file!")
@@ -49,6 +49,7 @@ set(LIB
     "${WINDOWS_KITS_10_DIR}/Lib/${WINDOWS_SDK_VERSION}/ucrt/${ARCH}"
     "${WINDOWS_KITS_10_DIR}/Lib/${WINDOWS_SDK_VERSION}/um/${ARCH}"
     "${MSVC_TOOLSET_DIR}/lib/${ARCH}"
+    "${MSVC_TOOLSET_DIR}/atlmfc/lib/${ARCH}"
 )
 
 set(INCLUDE
@@ -58,6 +59,7 @@ set(INCLUDE
     "${WINDOWS_KITS_10_DIR}/Include/${WINDOWS_SDK_VERSION}/ucrt"
     "${WINDOWS_KITS_10_DIR}/Include/${WINDOWS_SDK_VERSION}/um"
     "${MSVC_TOOLSET_DIR}/include"
+    "${MSVC_TOOLSET_DIR}/atlmfc/include"
 )
 
 set(ENV{LIB} "${LIB}")
@@ -75,22 +77,24 @@ endfunction()
 _VALIDATE_ENV_V_(LIB)
 _VALIDATE_ENV_V_(INCLUDE)
 
-set(CMAKE_C_COMPILER "${MSVC_TOOLSET_DIR}/bin/Host${ARCH}/${ARCH}/cl.exe")
-set(CMAKE_CXX_COMPILER "${MSVC_TOOLSET_DIR}/bin/Host${ARCH}/${ARCH}/cl.exe")
-set(CMAKE_ASM_COMPILER "${MSVC_TOOLSET_DIR}/bin/Host${ARCH}/${ARCH}/cl.exe")
-set(CMAKE_ASM_MASM_COMPILER "${MSVC_TOOLSET_DIR}/bin/Host${ARCH}/${ARCH}/ml64.exe")
+set(CMAKE_C_COMPILER "${MSVC_TOOLSET_DIR}/bin/Host${ARCH}/${ARCH}/cl.exe" CACHE FILEPATH "")
+set(CMAKE_CXX_COMPILER "${MSVC_TOOLSET_DIR}/bin/Host${ARCH}/${ARCH}/cl.exe" CACHE FILEPATH "")
+set(CMAKE_ASM_COMPILER "${MSVC_TOOLSET_DIR}/bin/Host${ARCH}/${ARCH}/cl.exe" CACHE FILEPATH "")
+set(CMAKE_ASM_MASM_COMPILER "${MSVC_TOOLSET_DIR}/bin/Host${ARCH}/${ARCH}/ml64.exe" CACHE FILEPATH "")
 find_program(CMAKE_ASM_NASM_COMPILER nasm HINTS ENV PATH ENV NASM_DIR NO_CACHE REQUIRED)
-set(CMAKE_RC_COMPILER "${WINDOWS_KITS_10_DIR}/bin/${WINDOWS_SDK_VERSION}/${ARCH}/rc.exe")
-set(CMAKE_LINKER "${MSVC_TOOLSET_DIR}/bin/Host${ARCH}/${ARCH}/link.exe")
-set(CMAKE_AR "${MSVC_TOOLSET_DIR}/bin/Host${ARCH}/${ARCH}/lib.exe")
-set(CMAKE_MT "${WINDOWS_KITS_10_DIR}/bin/${WINDOWS_SDK_VERSION}/${ARCH}/mt.exe")
+set(CMAKE_ASM_NASM_COMPILER "${CMAKE_ASM_NASM_COMPILER}" CACHE FILEPATH "")
+set(CMAKE_RC_COMPILER "${WINDOWS_KITS_10_DIR}/bin/${WINDOWS_SDK_VERSION}/${ARCH}/rc.exe" CACHE FILEPATH "")
+set(CMAKE_LINKER "${MSVC_TOOLSET_DIR}/bin/Host${ARCH}/${ARCH}/link.exe" CACHE FILEPATH "")
+set(CMAKE_AR "${MSVC_TOOLSET_DIR}/bin/Host${ARCH}/${ARCH}/lib.exe" CACHE FILEPATH "")
+set(CMAKE_MT "${WINDOWS_KITS_10_DIR}/bin/${WINDOWS_SDK_VERSION}/${ARCH}/mt.exe" CACHE FILEPATH "")
 
 macro(_UPDATE_STANDARD_DIRECTORIES_ WHAT VARV)
-    set(CMAKE_C_STANDARD_${WHAT}_DIRECTORIES ${VARV})
-    set(CMAKE_CXX_STANDARD_${WHAT}_DIRECTORIES ${VARV})
-    set(CMAKE_ASM_STANDARD_${WHAT}_DIRECTORIES ${VARV})
-    set(CMAKE_NASM_STANDARD_${WHAT}_DIRECTORIES ${VARV})
-    set(CMAKE_MASM_STANDARD_${WHAT}_DIRECTORIES ${VARV})
+    set(CMAKE_C_STANDARD_${WHAT}_DIRECTORIES ${VARV} CACHE FILEPATH "")
+    set(CMAKE_CXX_STANDARD_${WHAT}_DIRECTORIES ${VARV} CACHE FILEPATH "")
+    set(CMAKE_RC_STANDARD_${WHAT}_DIRECTORIES ${VARV} CACHE FILEPATH "")
+    set(CMAKE_ASM_STANDARD_${WHAT}_DIRECTORIES ${VARV} CACHE FILEPATH "")
+    set(CMAKE_NASM_STANDARD_${WHAT}_DIRECTORIES ${VARV} CACHE FILEPATH "")
+    set(CMAKE_MASM_STANDARD_${WHAT}_DIRECTORIES ${VARV} CACHE FILEPATH "")
 endmacro()
 
 _UPDATE_STANDARD_DIRECTORIES_(INCLUDE "${INCLUDE}")

redist/msvc.ps1

@@ -0,0 +1,63 @@
+param(
+    [Parameter(Mandatory=$true)]
+    [string]$RedistPath,
+
+    [Parameter(Mandatory=$true)]
+    [string]$Arch
+)
+
+function Find-DllDirs {
+    param([string]$BaseDir)
+    $dllDirs = @()
+    if (-Not (Test-Path $BaseDir)) {
+        Write-Warning "Directory does not exist: $BaseDir"
+        return $dllDirs
+    }
+    Get-ChildItem -Path $BaseDir -Recurse -Directory | ForEach-Object {
+        if (Get-ChildItem -Path $_.FullName -Filter *.dll -File -ErrorAction SilentlyContinue) {
+            $dllDirs += $_.FullName
+        }
+    }
+    return $dllDirs
+}
+
+$RedistPath = Resolve-Path -Path $RedistPath | Select-Object -ExpandProperty Path
+
+$ReleaseBase = Join-Path $RedistPath $Arch
+$DebugBase   = Join-Path $RedistPath "debug_nonredist\$Arch"
+
+Write-Host "`n[*] Scanning release DLLs in: $ReleaseBase"
+$ReleaseDirs = Find-DllDirs -BaseDir $ReleaseBase
+
+Write-Host "`n[*] Scanning debug DLLs in: $DebugBase"
+$DebugDirs = Find-DllDirs -BaseDir $DebugBase
+
+if (-Not $ReleaseDirs.Count) {
+    Write-Error "No release DLL directories found."
+    exit 2
+}
+if (-Not $DebugDirs.Count) {
+    Write-Error "No debug DLL directories found."
+    exit 3
+}
+
+$AllDirs = $ReleaseDirs + $DebugDirs
+$EnvVarName = "MSVC_$($Arch.ToUpper())_REDIST_DIRS"
+$EnvVarValue = ($AllDirs -join ";")
+
+Write-Host "`n[+] Setting system environment variable $EnvVarName ..."
+
+try {
+    $regResult = & reg add "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v $EnvVarName /t REG_EXPAND_SZ /d "$EnvVarValue" /f 2>&1
+
+    if ($LASTEXITCODE -ne 0) {
+        throw "reg add failure:`n$regResult"
+    }
+
+    Write-Host "    Done."
+    Write-Host "    Value:"
+    $AllDirs | ForEach-Object { Write-Host "      $_" }
+} catch {
+    Write-Error "Failed due to:`n $_"
+    exit 4
+}

tests/3rdparty/CMakeLists.txt

@@ -9,11 +9,24 @@ set(CMAKE_FIND_PACKAGE_REDIRECTS_DIR "${CMAKE_CURRENT_BINARY_DIR}/packages/redir
 file(DOWNLOAD ${CPM_URL} ${CPM_CMAKE} EXPECTED_HASH SHA256=c0fc82149e00c43a21febe7b2ca57b2ffea2b8e88ab867022c21d6b81937eb50) # cmake -E sha256sum CPM.cmake
 include(${CPM_CMAKE})
 
+# I'm doing hard assumption here for my tests, no SSH remotes & forced HTTPS
+# for the configuration only, note the nano image doesn't rewrite urls
+set(ENV{GIT_CONFIG_GLOBAL} "${CMAKE_CURRENT_BINARY_DIR}/.gitconfig")
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/.gitconfig"
+[=[
+[url "https://github.com/"]
+  insteadOf = [email protected]:
+[safe]
+  directory = *
+]=]
+)
+
 CPMAddPackage(NAME libjpeg-turbo URL https://github.com/libjpeg-turbo/libjpeg-turbo/archive/97a1575cb877e593cf9940cd869f41b1ddd4a4fd.tar.gz)
 CPMAddPackage(NAME blake3 URL https://github.com/BLAKE3-team/BLAKE3/archive/refs/tags/1.6.1.tar.gz DOWNLOAD_ONLY YES)
 add_subdirectory("${blake3_SOURCE_DIR}/c")
-CPMAddPackage(NAME dxc GITHUB_REPOSITORY Devsh-Graphics-Programming/DirectXShaderCompiler GIT_TAG b2e75826b70d85d03686dd8a755ef477b4fa3807 GIT_SHALLOW YES DOWNLOAD_ONLY YES)
+CPMAddPackage(NAME dxc GITHUB_REPOSITORY Devsh-Graphics-Programming/DirectXShaderCompiler GIT_TAG 96a5b5c85ee1ec7e8333d7140e1d2384be4faa02 GIT_SHALLOW YES DOWNLOAD_ONLY YES)
 
+set(DXC_ENABLE_ETW OFF) # this is very important, without disabling this one its impossbile to compile dxcompiler on nano server within its current build system
 set(HLSL_OPTIONAL_PROJS_IN_DEFAULT OFF)
 set(HLSL_ENABLE_ANALYZE OFF)
 set(HLSL_OFFICIAL_BUILD OFF)
@@ -53,7 +66,8 @@ set(SPIRV_SKIP_EXECUTABLES ON)
 set(HLSL_ENABLE_DEBUG_ITERATORS ON)
 
 include("${dxc_SOURCE_DIR}/cmake/caches/PredefinedParams.cmake")
-add_subdirectory("${dxc_SOURCE_DIR}")
+add_subdirectory("${dxc_SOURCE_DIR}" EXCLUDE_FROM_ALL)
+set_target_properties(dxcompiler PROPERTIES EXCLUDE_FROM_ALL False)
 
 # old jpeg-turbo doesn't explicilty associate .asm extension with ASM dialect, small patch
 get_target_property(TARGET_SOURCE_DIR simd SOURCE_DIR)

tests/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_policy(SET CMP0119 NEW) # https://cmake.org/cmake/help/latest/policy/CMP0119.html#policy:CMP0119
-cmake_minimum_required(VERSION 3.30)
+cmake_minimum_required(VERSION 3.31.0)
 project(NanoMSVC CXX C)
 
 set(CMAKE_CXX_STANDARD 20)