SF.net SVN: edk2-buildtools:[2229] trunk/BaseTools

[<js...@us...>]

Revision: 2229
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2229&view=rev
Author:   jsu1
Date:     2011-08-05 01:58:35 +0000 (Fri, 05 Aug 2011)

Log Message:
-----------
Add support for PCD usage in ASM16 code and update autogen to automatically include <Library/PcdLib.h> when PcdLib is listed in inf [LibraryClasses] section.

Signed-off-by: jsu1
Reviewed-by: lhauch

Modified Paths:
--------------
    trunk/BaseTools/Conf/build_rule.template
    trunk/BaseTools/Source/Python/AutoGen/GenC.py

Modified: trunk/BaseTools/Conf/build_rule.template
===================================================================
--- trunk/BaseTools/Conf/build_rule.template	2011-08-05 01:51:13 UTC (rev 2228)
+++ trunk/BaseTools/Conf/build_rule.template	2011-08-05 01:58:35 UTC (rev 2229)
@@ -417,6 +417,8 @@
         $(OUTPUT_DIR)(+)${s_base}.com
 
     <Command.MSFT, Command.INTEL>
+        "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
+        Trim --source-code --convert-hex -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
         cd $(OUTPUT_DIR)(+)${s_dir}
         "$(ASM16)" /nologo /c /omf $(INC) /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj ${src}
         "$(ASMLINK)" $(ASMLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj,${dst},,,,

Modified: trunk/BaseTools/Source/Python/AutoGen/GenC.py
===================================================================
--- trunk/BaseTools/Source/Python/AutoGen/GenC.py	2011-08-05 01:51:13 UTC (rev 2228)
+++ trunk/BaseTools/Source/Python/AutoGen/GenC.py	2011-08-05 01:58:35 UTC (rev 2229)
@@ -1959,6 +1959,9 @@
         if Info.ModuleType in gModuleTypeHeaderFile \
            and gModuleTypeHeaderFile[Info.ModuleType][0] != gBasicHeaderFile:
             AutoGenH.Append("#include <%s>\n" % gModuleTypeHeaderFile[Info.ModuleType][0])
+        if 'PcdLib' in Info.Module.LibraryClasses:
+            AutoGenH.Append("#include <Library/PcdLib.h>\n")
+
         AutoGenH.Append('\nextern GUID  gEfiCallerIdGuid;\n\n')
 
         if Info.IsLibrary:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.