Changeset 3329 for trunk/kBuild/tools

Timestamp:

Apr 20, 2020, 12:26:17 AM (5 years ago)

Author:

bird

Message:

tools/VCC141*: Redist DLLs and stuff.

Location:

trunk/kBuild/tools

Files:

• VCC141.kmk (modified) (1 diff)
• VCC141AMD64.kmk (modified) (1 diff)
• VCC141X86.kmk (modified) (1 diff)

trunk/kBuild/tools/VCC141.kmk

@@ -154 +154 @@
 # @param    $(2)        The extension.
 TOOL_VCC141_PDB = $(dir $(1))$(tolower $(notdir $(1))).$(2)
+
+#
+# Try find the redist directory.  A little complicated as the build number
+# doesn't necessarily match that of the compiler.
+#
+ifeq ($(tolower $(substr $(qdir u,$(PATH_TOOL_VCC141)), -12)),/tools/msvc/)
+PATH_TOOL_VCC141_REDIST ?= $(firstfile $(qwildcard ,$(substr $(qdir ,$(PATH_TOOL_VCC141)), 1, -12)/Redist/MSVC/14.1*))
+else
+PATH_TOOL_VCC141_REDIST ?= $(PATH_TOOL_VCC141)/Redist
+endif
+PATH_TOOL_VCC141_REDIST_DEBUG ?= $(PATH_TOOL_VCC141_REDIST)/debug_nonredist
+
+# Updates may add more msvcp140_[0-9].dll images as the product matures.
+# ASSUMES all platforms end up with the same number of DLLs.
+TOOL_VCC141_REDIST_CRT_SUBDIR       := Microsoft.VC141.CRT
+TOOL_VCC141_REDIST_DEBUG_CRT_SUBDIR := Microsoft.VC141.DebugCRT
+TOOL_VCC141_REDIST_CRT_DLLS    = vcruntime140.dll \
+        $(sortfiles $(qnotdir ,$(qwildcard ,$(qaddprefix ,$(requote unq,$(PATH_TOOL_VCC141_REDIST)/),\
+                $(addsuffix /$(TOOL_VCC141_REDIST_CRT_SUBDIR)/vcruntime140_*.dll, x86 x64 arm arm64)))))
+TOOL_VCC141_REDIST_CONCRT_DLLS = concrt140.dll \
+        $(sortfiles $(qnotdir ,$(qwildcard ,$(qaddprefix ,$(requote unq,$(PATH_TOOL_VCC141_REDIST)/),\
+                $(addsuffix /$(TOOL_VCC141_REDIST_CRT_SUBDIR)/concrt140_*.dll, x86 x64 arm arm64)))))
+TOOL_VCC141_REDIST_CPP_DLLS    = msvcp140.dll \
+        $(sortfiles $(qnotdir ,$(qwildcard ,$(qaddprefix ,$(requote unq,$(PATH_TOOL_VCC141_REDIST)/),\
+                $(addsuffix /$(TOOL_VCC141_REDIST_CRT_SUBDIR)/msvcp140_*.dll, x86 x64 arm arm64)))))
+TOOL_VCC141_REDIST_WINRT_DLLS  = vccorlib140.dll \
+        $(sortfiles $(qnotdir ,$(qwildcard ,$(qaddprefix ,$(requote unq,$(PATH_TOOL_VCC141_REDIST)/),\
+                $(addsuffix /$(TOOL_VCC141_REDIST_CRT_SUBDIR)/concrt140_*.dll, x86 x64 arm arm64)))))
+
+TOOL_VCC141_REDIST_CXXAMP_SUBDIR := Microsoft.VC141.CXXAMP
+TOOL_VCC141_REDIST_MFC_SUBDIR    := Microsoft.VC141.MFC
+TOOL_VCC141_REDIST_MFCLOC_SUBDIR := Microsoft.VC141.MFCLOC
+TOOL_VCC141_REDIST_OPENMP_SUBDIR := Microsoft.VC141.OpenMP
 
 

trunk/kBuild/tools/VCC141AMD64.kmk

@@ -97 +97 @@
  endif
 endif
+
+# Redist (more stuff in VCC141.kmk).
+PATH_TOOL_VCC141AMD64_REDIST           ?= $(PATH_TOOL_VCC141_REDIST)/x64
+PATH_TOOL_VCC141AMD64_REDIST_CRT        = $(PATH_TOOL_VCC141AMD64_REDIST)/$(TOOL_VCC141_REDIST_CRT_SUBDIR)
+PATH_TOOL_VCC141AMD64_REDIST_DEBUG     ?= $(PATH_TOOL_VCC141_REDIST_DEBUG)/x64
+PATH_TOOL_VCC141AMD64_REDIST_DEBUG_CRT  = $(PATH_TOOL_VCC141AMD64_REDIST_DEBUG)/$(TOOL_VCC141_REDIST_CRT_SUBDIR)
 
 

trunk/kBuild/tools/VCC141X86.kmk

@@ -113 +113 @@
 endif
 
+# Redist (more stuff in VCC141.kmk).
+PATH_TOOL_VCC141X86_REDIST           ?= $(PATH_TOOL_VCC141_REDIST)/x86
+PATH_TOOL_VCC141X86_REDIST_CRT        = $(PATH_TOOL_VCC141X86_REDIST)/$(TOOL_VCC141_REDIST_CRT_SUBDIR)
+PATH_TOOL_VCC141X86_REDIST_DEBUG     ?= $(PATH_TOOL_VCC141_REDIST_DEBUG)/x86
+PATH_TOOL_VCC141X86_REDIST_DEBUG_CRT  = $(PATH_TOOL_VCC141X86_REDIST_DEBUG)/$(TOOL_VCC141_REDIST_CRT_SUBDIR)
 
 #