step towards CE registry

Author: AnastaZIuk

tools/nsc/CMakeLists.txt

@@ -69,6 +69,13 @@ find_program(SPIRV_DIS_EXE
 	REQUIRED
 )
 
+cmake_path(GET Vulkan_INCLUDE_DIR PARENT_PATH VULKAN_SDK_INSTALL_DIRECTORY)
+get_filename_component(VULKAN_SDK_VERSION "${VULKAN_SDK_INSTALL_DIRECTORY}" NAME)
+
+if(NOT EXISTS "${VULKAN_SDK_INSTALL_DIRECTORY}")
+  message(FATAL_ERROR "Internal error, VULKAN_SDK_INSTALL_DIRECTORY doesn't exist")
+endif()
+
 find_program(CTEST_EXE
 	NAMES ctest
 	REQUIRED
@@ -100,12 +107,12 @@ set(NBL_BUILD_INFO_POSTPROCESS_COMMAND
 cmake_path(GET SPIRV_DIS_EXE PARENT_PATH VULKAN_SDK_BIN_DIRECTORY)
 cmake_path(NATIVE_PATH VULKAN_SDK_BIN_DIRECTORY NORMALIZE VULKAN_SDK_BIN_DIRECTORY)
 cmake_path(GET SPIRV_DIS_EXE FILENAME SPIRV_DIS_EXE)
-set(SPIRV_DIS_EXE "C:\\vulkan\\bin\\${SPIRV_DIS_EXE}")
-cmake_path(NATIVE_PATH SPIRV_DIS_EXE NORMALIZE SPIRV_DIS_EXE)
+set(CT_SPIRV_DIS_EXE "C:\\vulkan\\${VULKAN_SDK_VERSION}\\bin\\${SPIRV_DIS_EXE}")
+cmake_path(NATIVE_PATH CT_SPIRV_DIS_EXE NORMALIZE CT_SPIRV_DIS_EXE)
 
 set(NBL_CE_GENERATE_CONFIG_COMMAND
   "${CMAKE_COMMAND}"
-  "-DSPIRV_DIS_EXE=${SPIRV_DIS_EXE}"
+  "-DSPIRV_DIS_EXE=${CT_SPIRV_DIS_EXE}"
   "-DNSC_RELEASE_BUILD_INFO=${NSC_RELEASE_BUILD_INFO}"
   "-DNSC_RELWITHDEBINFO_BUILD_INFO=${NSC_RELWITHDEBINFO_BUILD_INFO}"
   "-DNSC_DEBUG_BUILD_INFO=${NSC_DEBUG_BUILD_INFO}"
@@ -120,7 +127,8 @@ set(NBL_DOCKER_CE_COMPOSE_TARGET "${GODBOLT_BINARY_DIRECTORY}/compose.yml")
 include(InstallRequiredSystemLibraries)
 
 string(REPLACE "v" "VC" TARGET_DCRT ${CMAKE_VS_PLATFORM_TOOLSET})
-set(DEBUG_CRT_DIRECTORY_SOURCE "${MSVC_REDIST_DIR}/debug_nonredist/x64/Microsoft.${TARGET_DCRT}.DebugCRT")
+set(DEBUG_CRT_RELATIVE debug_nonredist/x64/Microsoft.${TARGET_DCRT}.DebugCRT)
+set(DEBUG_CRT_DIRECTORY_SOURCE "${MSVC_REDIST_DIR}/${DEBUG_CRT_RELATIVE}")
 cmake_path(NATIVE_PATH MSVC_REDIST_DIR NORMALIZE NBL_REDIST_DIR)
 
 if(NOT EXISTS "${DEBUG_CRT_DIRECTORY_SOURCE}")
@@ -136,42 +144,194 @@ find_file(UCRTBASED_DLL_PATH
     REQUIRED
 )
 
-# TODO: nabla-devel-host-env-windows image
-# I will use it to cache vulkan spirv-dis with CRTs we 
-# are configuring this cmake build with into docker layers
+# TODO: (***) ---> THIS GOES TO <NBL_ROOT_DIR>/docker to CMakeLists.txt file!
+
+set(BASE_IMAGE mcr.microsoft.com/windows/servercore:ltsc2022-amd64) # NOTE: HARDCODED CURRENTLY
+
+string(TOLOWER "dcr.devsh.eu/nabla/cmake-host-dev-env/${CMAKE_SYSTEM_NAME}/package/vulkan:latest" DOCKER_VULKAN_TAG)
+string(TOLOWER "dcr.devsh.eu/nabla/cmake-host-dev-env/${CMAKE_SYSTEM_NAME}/toolset/redist/${CMAKE_CXX_COMPILER_ID}/crt:latest" DOCKER_CRT_TAG)
+string(TOLOWER "dcr.devsh.eu/nabla/cmake-host-dev-env/${CMAKE_SYSTEM_NAME}/build/${CMAKE_CXX_COMPILER_ID}/devel-compiler-explorer-nsc:latest" DOCKER_DEVEL_TAG)
+
+cmake_path(NATIVE_PATH MSVC_REDIST_DIR NORMALIZE TOOLSET_REDIST_PATH)
+get_filename_component(REDIST_CRT_TOOLSET_VERSION "${TOOLSET_REDIST_PATH}" NAME)
+
+function(GEN_DOCKER_CONTENT _CTX_ _OUTPUT_DIRECTORY_ _EXTRA_DOCKERFILE_CONTENT_ _DOCKER_IGNORE_CONTENT_ _S_NAME_ _CT_NAME_ _IMAGE_NAME_ _WITH_BUILD_) 
+
+set(_OUTPUT_D_PATH_ "${_OUTPUT_DIRECTORY_}/Dockerfile")
+set(_OUTPUT_C_PATH_ "${_OUTPUT_DIRECTORY_}/compose.yml")
+
+string(CONFIGURE "${_EXTRA_DOCKERFILE_CONTENT_}" _EXTRA_DOCKERFILE_CONTENT_EVAL_ @ONLY)
+string(CONFIGURE "${_DOCKER_IGNORE_CONTENT_}" _DOCKER_IGNORE_CONTENT_EVAL_ @ONLY)
+
+string(APPEND DOCKER_CONTENT
+[=[
+# escape=`
+
+ARG BASE_IMAGE=@BASE_IMAGE@
+FROM ${BASE_IMAGE}
+SHELL ["cmd", "/S", "/C"]
+@_EXTRA_DOCKERFILE_CONTENT_EVAL_@
+]=]
+)
+
+string(CONFIGURE "${DOCKER_CONTENT}" DOCKER_CONTENT @ONLY)
+file(WRITE "${_OUTPUT_D_PATH_}" "${DOCKER_CONTENT}")
+
+set(_CTX_TARGET_ "${_OUTPUT_DIRECTORY_}/.ctx")
+
+if("${_CTX_}" STREQUAL "")
+
+else()
+  if(NOT EXISTS "${_CTX_}")
+    message(FATAL_ERROR "Invalid source context directory doesn't exist! _CTX_: \"${_CTX_}\"")
+  endif()
+
+  file(COPY "${_CTX_}" DESTINATION "${_CTX_TARGET_}")
+endif()
+
+set(_OUTPUT_I_PATH_ "${_CTX_TARGET_}/.dockerignore")
+
+string(APPEND COMPOSE_CONTENT
+[=[
+services:
+  @_S_NAME_@:
+    build:
+      context: ./.ctx
+      dockerfile: "@_OUTPUT_D_PATH_@"
+    image: @_IMAGE_NAME_@
+    container_name: @_CT_NAME_@
+    networks:
+      docker_default:
+
+networks:
+  docker_default:
+    external: true
+]=]
+)
+
+string(CONFIGURE "${COMPOSE_CONTENT}" COMPOSE_CONTENT @ONLY)
+file(WRITE "${_OUTPUT_C_PATH_}" "${COMPOSE_CONTENT}")
+file(WRITE "${_OUTPUT_I_PATH_}" "${_DOCKER_IGNORE_CONTENT_EVAL_}")
+
+if(_WITH_BUILD_)
+  execute_process(COMMAND "${DOCKER_EXE}" compose -f "${_OUTPUT_C_PATH_}" build)
+endif()
+endfunction()
+
+# Vulkan
+set(OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/docker/vulkan")
+set(CT_VULKAN_TARGET vulkan)
+GEN_DOCKER_CONTENT("${VULKAN_SDK_INSTALL_DIRECTORY}" "${OUTPUT_DIRECTORY}"
+[=[
+COPY ./ "@CT_VULKAN_TARGET@"
+
+ENV VULKAN_SDK="C:/@CT_VULKAN_TARGET@"
+ENV VULKAN_SDK_VERSION="@VULKAN_SDK_VERSION@"
+LABEL VULKAN_SDK="C:/@CT_VULKAN_TARGET@"
+LABEL VULKAN_SDK_VERSION="@VULKAN_SDK_VERSION@"
+]=]
+[=[
+*
+!@VULKAN_SDK_VERSION@/Bin/*.dll
+!@VULKAN_SDK_VERSION@/Bin/*spirv*.exe
+]=]
+nabla-dev-env-vulkan 
+nabla.dev.env.vulkan
+${DOCKER_VULKAN_TAG}
+ON
+)
+
+# CRT
+set(OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/docker/crt")
+set(CT_TOOLSET_REDIST_TARGET toolset_redist)
+make_directory("${OUTPUT_DIRECTORY}/.ctx")
+file(COPY "${UCRTBASED_DLL_PATH}" DESTINATION "${OUTPUT_DIRECTORY}/.ctx")
+GEN_DOCKER_CONTENT("${TOOLSET_REDIST_PATH}" "${OUTPUT_DIRECTORY}"
+[=[
+COPY ./ "/@CT_TOOLSET_REDIST_TARGET@"
+
+ENV REDIST_CRT_TOOLSET_VERSION="@REDIST_CRT_TOOLSET_VERSION@"
+ENV TOOLSET_REDIST_PATH="C:/@CT_TOOLSET_REDIST_TARGET@"
+LABEL REDIST_CRT_TOOLSET_VERSION="@REDIST_CRT_TOOLSET_VERSION@"
+LABEL TOOLSET_REDIST_PATH="C:/@CT_TOOLSET_REDIST_TARGET@"
+]=]
+[=[
+*
+!ucrtbased.dll
+!@REDIST_CRT_TOOLSET_VERSION@/vc_redist.x64.exe
+!@REDIST_CRT_TOOLSET_VERSION@/@DEBUG_CRT_RELATIVE@/*.dll
+]=]
+nabla-dev-env-crt 
+nabla.dev.env.crt
+${DOCKER_CRT_TAG}
+ON
+)
+
+# Devel, combined
+set(BASE_IMAGE dcr.devsh.eu/compiler-explorer)
+
+# NOTE to self: could be all done with single docker file & compose file but buildkit works bad with windows driver, yet need to wait for stuff to be implemented
+set(OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/docker/devel")
+set(CT_REDIST_DIR "${CT_TOOLSET_REDIST_TARGET}/${REDIST_CRT_TOOLSET_VERSION}")
+set(CT_NONREDIST_CTR_DIR "${CT_REDIST_DIR}/${DEBUG_CRT_RELATIVE}")
+cmake_path(NATIVE_PATH CT_REDIST_DIR NORMALIZE CT_REDIST_DIR)
+cmake_path(NATIVE_PATH CT_NONREDIST_CTR_DIR NORMALIZE CT_NONREDIST_CTR_DIR)
+set(DEVEL_DOCKERFILE "${OUTPUT_DIRECTORY}/Dockerfile")
+
+GEN_DOCKER_CONTENT("" "${OUTPUT_DIRECTORY}"
+[=[
+
+COPY --from=@DOCKER_VULKAN_TAG@ /@CT_VULKAN_TARGET@ /@CT_VULKAN_TARGET@
+COPY --from=@DOCKER_CRT_TAG@ /@CT_TOOLSET_REDIST_TARGET@ /@CT_TOOLSET_REDIST_TARGET@
+
+RUN .\@CT_REDIST_DIR@\vc_redist.x64.exe /quiet /install 
+RUN xcopy .\@CT_NONREDIST_CTR_DIR@\*.dll %SystemRoot%\System32 /Y
+RUN xcopy .\@CT_TOOLSET_REDIST_TARGET@\ucrtbased.dll %SystemRoot%\System32 /Y
+
+]=]
+[=[
+
+]=]
+nabla-dev-env-nsc 
+nabla.dev.env.nsc
+${DOCKER_DEVEL_TAG}
+OFF
+)
+
+# <---(***)
+
+set(NABLA_DEV_ENV_CT_NAME dev.nabla.env.${CMAKE_SYSTEM_NAME}.${CMAKE_CXX_COMPILER_ID}.base)
+string(TOLOWER "${NABLA_DEV_ENV_CT_NAME}" NABLA_DEV_ENV_CT_NAME)
+
+set(COMPOSE_NSC_DEV_SERVICE compiler-explorer-nsc-dev)
+string(TOLOWER "dcr.devsh.eu/nabla/cmake-host-dev-env/${CMAKE_SYSTEM_NAME}/build/${CMAKE_CXX_COMPILER_ID}/compiler-explorer-nsc:latest" COMPOSE_NSC_DEV_IMAGE)
 
 string(APPEND COMPOSE_CONTENT
 [=[
 services:
-  compiler-explorer-nsc:
+  @COMPOSE_NSC_DEV_SERVICE@:
+    container_name: dev.ce.nsc.dev
     extends:
         file: @NBL_DOCKER_CE_COMPOSE_BASE@
         service: compiler-explorer
-    container_name: dev.ce.nsc
+    build:
+      context: ./.ctx
+      dockerfile: @DEVEL_DOCKERFILE@
+    image: @COMPOSE_NSC_DEV_IMAGE@
     environment:
       NBL_INSTALL_DIRECTORY: "@NBL_INSTALL_DIRECTORY@"
       NBL_EXPLICIT_MODULE_LOAD_LOG: "ON"
     entrypoint:
       - "cmd"
       - "/c"
       - >
-        C:\\redist\\vc_redist.x64.exe /quiet /install
-        && xcopy C:\\nsc\\install\\.nonredist\\*.dll %SystemRoot%\\System32 /Y
-        && copy C:\\nsc\\install\\hlsl.local.properties.cmake %GIT_GODBOLT_REPOSITORY_PATH%\\etc\\config\\hlsl.local.properties
+        copy C:\\nsc\\install\\hlsl.local.properties.cmake %GIT_GODBOLT_REPOSITORY_PATH%\\etc\\config\\hlsl.local.properties
         && npm --prefix %GIT_GODBOLT_REPOSITORY_PATH% run dev -- --language hlsl
     volumes:
       - type: bind
         source: .\install
         target: @NBL_DOCKER_CT_NSC_VOLUME_TARGET@
         read_only: true
-      - type: bind
-        source: @NBL_REDIST_DIR@
-        target: C:\redist
-        read_only: true
-      - type: bind
-        source: @VULKAN_SDK_BIN_DIRECTORY@
-        target: C:\vulkan\bin
-        read_only: true
 
 networks:
   docker_default:
@@ -181,28 +341,28 @@ networks:
 
 string(CONFIGURE "${COMPOSE_CONTENT}" COMPOSE_CONTENT @ONLY)
 file(WRITE "${NBL_DOCKER_CE_COMPOSE_TARGET}" "${COMPOSE_CONTENT}")
+make_directory("${GODBOLT_BINARY_DIRECTORY}/.ctx")
+execute_process(COMMAND "${DOCKER_EXE}" compose -f "${NBL_DOCKER_CE_COMPOSE_TARGET}" build)
 
 add_custom_target(run-compiler-explorer
     COMMAND "${CMAKE_COMMAND}" -E cmake_echo_color --blue "Performing Pre-Test..."
     COMMAND "${CTEST_EXE}" -C $<CONFIG> --stop-on-failure
     COMMAND ${NBL_BUILD_INFO_POSTPROCESS_COMMAND}
-    COMMAND "${DOCKER_EXE}" compose -f "${NBL_DOCKER_CE_COMPOSE_TARGET}" stop compiler-explorer-nsc
+    COMMAND "${DOCKER_EXE}" compose -f "${NBL_DOCKER_CE_COMPOSE_TARGET}" stop ${COMPOSE_NSC_DEV_SERVICE}
     COMMAND ${NBL_CE_GENERATE_CONFIG_COMMAND}
     COMMAND "${CMAKE_COMMAND}" -E cmake_echo_color --green "OK! Performing executables hot-swap..."
-    COMMAND "${CMAKE_COMMAND}" -E copy_directory "${DEBUG_CRT_DIRECTORY_SOURCE}" "${DEBUG_CRT_DIRECTORY_TARGET}"
-    COMMAND "${CMAKE_COMMAND}" -E copy "${UCRTBASED_DLL_PATH}" "${DEBUG_CRT_DIRECTORY_TARGET}"
     COMMAND "${CMAKE_COMMAND}" -E copy_directory "${NBL_NSC_PREINSTALL_DIRECTORY}" "${NBL_DOCKER_CT_NSC_VOLUME_SOURCE}"
-    COMMAND "${DOCKER_EXE}" compose -f "${NBL_DOCKER_CE_COMPOSE_TARGET}" up --build -d compiler-explorer-nsc
+    COMMAND "${DOCKER_EXE}" compose -f "${NBL_DOCKER_CE_COMPOSE_TARGET}" up -d ${COMPOSE_NSC_DEV_SERVICE}
     COMMAND "${CMAKE_COMMAND}" -E cmake_echo_color --blue "Checking health of Compiler Explorer service..."
-    COMMAND "${DOCKER_EXE}" compose -f "${NBL_DOCKER_CE_COMPOSE_TARGET}" exec -T compiler-explorer-nsc cmd /c python ce_healthy_check.py --interval 10 --ticks 25
+    COMMAND "${_Python3_EXECUTABLE}" "${NBL_ROOT_PATH}/docker/compiler-explorer/ce_healthy_check.py" --url http://localhost:80 --interval 10 --ticks 25
     COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --green "Compiler Explorer is running, type \"localhost\" in your browser!"
     WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
     VERBATIM 
     USES_TERMINAL
 )
 
 add_custom_target(is-compiler-explorer-running
-    COMMAND "${DOCKER_EXE}" compose -f "${NBL_DOCKER_CE_COMPOSE_TARGET}" exec -T compiler-explorer-nsc cmd /c python ce_healthy_check.py --ticks 1
+    COMMAND "${_Python3_EXECUTABLE}" "${NBL_ROOT_PATH}/docker/compiler-explorer/ce_healthy_check.py" --url http://localhost:80 --ticks 1
     VERBATIM
     USES_TERMINAL
 )