# Get value for Header\r
#\r
ModuleHeader.InfVersion = Defines.DefinesDictionary[TAB_INF_DEFINES_INF_VERSION][0]\r
- ModuleHeader.Name = Defines.DefinesDictionary[TAB_INF_DEFINES_BASE_NAME][0]\r
+ # R8 modules may use macro in base name\r
+ ModuleHeader.Name = ReplaceMacro(Defines.DefinesDictionary[TAB_INF_DEFINES_BASE_NAME][0], ModuleHeader.MacroDefines)\r
ModuleHeader.Guid = Defines.DefinesDictionary[TAB_INF_DEFINES_FILE_GUID][0]\r
\r
ModuleHeader.FileName = self.Identification.FileName\r
MergeArches(Libraries, Item, Arch)\r
for Key in Libraries.keys():\r
Library = ModuleLibraryClass()\r
- Library.Library = ReplaceMacro(Key, self._Macro)\r
+ # replace macro and remove file extension\r
+ Library.Library = ReplaceMacro(Key, self._Macro).rsplit('.', 1)[0]\r
Library.SupArchList = Libraries[Key]\r
self.Module.Libraries.append(Library)\r
\r
for Tab in TabList:\r
if Tab.upper().find(TAB_INF_DEFINES.upper()) > -1:\r
self.ParseDefines(Filename, Tab, Sect)\r
- # GetSingleValueOfKeyFromLines(Sect, self.Defines.DefinesDictionary, TAB_COMMENT_SPLIT, TAB_EQUAL_SPLIT, False, None)\r
continue\r
if Tab.upper().find(DataType.TAB_USER_EXTENSIONS.upper()) > -1:\r
self.UserExtensions = Sect\r