Changeset 3552 for trunk

Timestamp:

Jan 29, 2022, 3:59:03 AM (3 years ago)

Author:

bird

Message:

/Config.kmk,kmk/Makefile.kmk: Experimental UTF-8 manifest hack for KBUILD_NEW_VCC (windows).

Location:

trunk

Files:

• Config.kmk (modified) (3 diffs)
• src/kmk/Makefile.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -299 +299 @@
   endif
  endif
+ # HACK ALERT! Using kmk_builting_redirect here to bypass some shell quoting issue.
+ ifdef KBUILD_NEW_VCC # The OLD CRT will use the codepage default to the locale rather than UTF-8, so APC and CRT ends
+                      # up using different code pages when a locale other than "C" is used.  Thus, only enable for new compiler.
+  TEMPLATE_BIN_POST_CMDS.win = \
+        $(QUIET)$(APPEND) -tn "$(out).manifest" \
+                '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' \
+                '<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">' \
+                '  <assemblyIdentity type="win32" name="$(notdir $(out))" version="$(KBUILD_VERSION_MAJOR).$(KBUILD_VERSION_MINOR).$(KBUILD_VERSION_PATCH).$(KBUILD_SVN_REV)"/>' \
+                '  <application>' \
+                '    <windowsSettings>' \
+                '      <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>' \
+                '    </windowsSettings>' \
+                '  </application>' \
+                '</assembly>' \
+        $(NLTAB)$(QUIET)$(REDIRECT) -- $(requote sh,$(PATH_SDK_$(firstword $(TEMPLATE_$($(target)_TEMPLATE)_SDKS))_BIN)/mt.exe) \
+                -nologo -manifest '$(subst /,\,$(out).manifest)' '-outputresource:$(subst /,\,$(out));$(HASH)1' \
+        $(NLTAB)$(QUIET)$(RM) -f -- "$(out).manifest"
+ endif
 
 else # !os2, !win, !nt
@@ -431 +449 @@
 # for LIB_KDEP
 TEMPLATE_LIB_TOOL    = $(TEMPLATE_BIN_TOOL)
-
+TEMPLATE_LIB_CLEAN.win     = $(NO_SUCH_VARIABLE)
+TEMPLATE_LIB_LNK_DEPS.win  = $(NO_SUCH_VARIABLE)
+TEMPLATE_LIB_POST_CMDS.win = $(NO_SUCH_VARIABLE)
 
 #
@@ -457 +477 @@
 TEMPLATE_LIB-STATIC-THREADED_EXTENDS  = BIN-STATIC-THREADED
 TEMPLATE_LIB-STATIC-THREADED_INST     = lib/
-
+TEMPLATE_LIB-STATIC-THREADED_POST_CMDS.win = $(NO_SUCH_VARIABLE)
 
 #

trunk/src/kmk/Makefile.kmk

@@ -87 +87 @@
 
 #
+# Library version of the above.
+#
+TEMPLATE_LIB-KMK = Template for src/gmake libraries
+TEMPLATE_LIB-KMK_EXTENDS = BIN-KMK
+TEMPLATE_LIB-KMK_POST_CMDS.win = $(NO_SUCH_VARIABLE)
+
+#
 # Template for building standalone built-in utilities.
 #
@@ -100 +107 @@
 #
 LIBRARIES += kmkmissing
-kmkmissing_TEMPLATE = BIN-KMK
+kmkmissing_TEMPLATE = LIB-KMK
 kmkmissing_DEFS = KMK
 kmkmissing_NOINST = 1