Changeset 21937 for trunk/Config.kmk

Timestamp:

Jan 12, 2012, 7:47:58 PM (14 years ago)

Author:

dmik

Message:

Add bldlevel info to all Odin DLLs and EXEs.

File:

• trunk/Config.kmk (modified) (5 diffs)

trunk/Config.kmk

@@ -156 +156 @@
 PROPS_ACCUMULATE_R += $(if $(TOOL_$(tool)_COMPILE_MASM_CMDS),MASM,AS)FLAGS
 
+#
+# Handler for .def files to add bldlevel info to them
+#
+define def_src_handler_def
+local type := DEF
+ $(kb-src-one 2)
+#.NOTPARALLEL: $(obj) # BldLevelInf.cmd can't open files in parallel
+endef
+
 #------------------------------------------------------------------------------
 # Tools
@@ -199 +208 @@
 endef
 
+#
+# Add support for DEF file bldlevel info generator to the GCC compiler
+#
+TOOL_GXX3OMF_DEF                    = $(PATH_ROOT)/tools/bin/BldLevelInf.cmd
+TOOL_GXX3OMF_DEFOBJSUFF             = .bldlevel.def
+TOOL_GXX3OMF_COMPILE_DEF_OUTPUT     =
+TOOL_GXX3OMF_COMPILE_DEF_DEPEND     = $(PATH_ROOT)/include/odinbuild.h
+TOOL_GXX3OMF_COMPILE_DEF_DEPORD     =
+define TOOL_GXX3OMF_COMPILE_DEF_CMDS
+        $(QUIET)cmd /c 'set BUILD_QUIET=1 && $(TOOL_GXX3OMF_DEF)\
+                $(source) $(outbase).bldlevel.def\
+                -R"$(source)"\
+                -V"#define=ODIN32_VERSION,$(subst /,/,$(PATH_ROOT)/include/odinbuild.h)"\
+                -M"#define=ODIN32_BUILD_NR,$(subst /,/,$(PATH_ROOT)/include/odinbuild.h)"'
+endef
+
 #------------------------------------------------------------------------------
 # Common libraries referenced by components
@@ -222 +247 @@
 TEMPLATE_OdinCxx_DEBUG_STAGE    = nul
 
+TEMPLATE_OdinBin                = Odin DLL or EXE
+TEMPLATE_OdinBin_EXTENDS        = OdinCxx
+
+# Override DEF handler to add bldlevel info to .DEF files
+TEMPLATE_OdinBin_SRC_HANDLERS   = .def:def_src_handler_def
+
 TEMPLATE_OdinDLL            = Odin DLL
-TEMPLATE_OdinDLL_EXTENDS    = OdinCxx
+TEMPLATE_OdinDLL_EXTENDS    = OdinBin
 TEMPLATE_OdinDLL_EXTENDS_BY = appending
 TEMPLATE_OdinDLL_DEFS       = $(TEMPLATE_OdinCxx_DEFS) __WINE__ COMCTL32UNDOC TCPV40HDRS __USE_LIBC_TCPIP
@@ -238 +269 @@
 
 TEMPLATE_OdinCRT            = OdinCRT DLL
-TEMPLATE_OdinCRT_EXTENDS    = OdinCxx
+TEMPLATE_OdinCRT_EXTENDS    = OdinBin
 TEMPLATE_OdinCRT_EXTENDS_BY = appending
 TEMPLATE_OdinCRT_DEFS       = __WINE__
@@ -244 +275 @@
 
 TEMPLATE_OdinApp            = Odin application
-TEMPLATE_OdinApp_EXTENDS    = OdinCxx
+TEMPLATE_OdinApp_EXTENDS    = OdinBin
 
 TEMPLATE_OdinTestApp        = Odin application