GuidGuidToAutogenC(fileBuffer);\r
\r
//\r
- // Call pcd autogen. PCDAutoGenAction tool only need module name and\r
- // isPcdEmulatedDriver as parameter. Library inherits PCD and module's\r
- // PCD information has been collected in FPDParser task by\r
- // CollectPCDAction.\r
- // Note : when PCD image tool ready,\r
- // isPCDEmulatedDriver parameter will be removed.\r
- //\r
- try {\r
-// this.myPcdAutogen = new PCDAutoGenAction(moduleId.getName(),\r
-// moduleId.getGuid(), moduleId.getPackage().getName(), moduleId.getPackage().getGuid(),this.arch,moduleId.getVersion(),false, null);\r
- this.myPcdAutogen = new PCDAutoGenAction(moduleId.getName(),null,null,null, this.arch,null,false, null);\r
- this.myPcdAutogen.execute();\r
- } catch (Exception e) {\r
- throw new BuildException("PCD Autogen failed:" + e.getMessage());\r
- }\r
+ // Call pcd autogen. \r
+ //\r
+ this.myPcdAutogen = new PCDAutoGenAction(moduleId, this.arch, false, null);\r
+ try {\r
+ this.myPcdAutogen.execute();\r
+ } catch (Exception exp) {\r
+ throw new BuildException (exp.getMessage());\r
+ }\r
\r
if (this.myPcdAutogen != null) {\r
- fileBuffer.append("\r\n");\r
- fileBuffer.append(this.myPcdAutogen.OutputC());\r
+ fileBuffer.append("\r\n");\r
+ fileBuffer.append(this.myPcdAutogen.OutputC());\r
}\r
\r
if (!saveFile(outputPath + File.separatorChar + "AutoGen.c", fileBuffer)) {\r
fileBuffer.append("\r\n");\r
\r
//\r
- // Call pcd autogen. PCDAutoGenAction tool only need module name and\r
- // isPcdEmulatedDriver as parameter. Library inherit PCD and module's\r
- // PCD information has been collected in FPDParser task by\r
- // CollectPCDAction.\r
- // Note : when PCD image tool ready,\r
- // isPCDEmulatedDriver parameter will be removed.\r
+ // Call pcd autogen. \r
//\r
+ this.myPcdAutogen = new PCDAutoGenAction(this.moduleId,\r
+ this.arch,\r
+ true, \r
+ SurfaceAreaQuery.getModulePcdEntryNameArray());\r
try {\r
-// this.myPcdAutogen = new PCDAutoGenAction(this.moduleId.getName(),\r
-// this.moduleId.getGuid(),moduleId.getPackage().getName(),moduleId.getPackage().getGuid(), this.arch, moduleId.getVersion(),true, SurfaceAreaQuery.getModulePcdEntryNameArray());\r
- this.myPcdAutogen = new PCDAutoGenAction(this.moduleId.getName(),\r
- null,\r
- null,\r
- null,\r
- this.arch,\r
- null,\r
- true, \r
- SurfaceAreaQuery.getModulePcdEntryNameArray());\r
- \r
- this.myPcdAutogen.execute();\r
+ this.myPcdAutogen.execute();\r
} catch (Exception e) {\r
- throw new BuildException(e.getMessage());\r
+ throw new BuildException(e.getMessage());\r
}\r
\r
if (this.myPcdAutogen != null) {\r
- fileBuffer.append("\r\n");\r
- fileBuffer.append(this.myPcdAutogen.OutputC());\r
+ fileBuffer.append("\r\n");\r
+ fileBuffer.append(this.myPcdAutogen.OutputC());\r
}\r
\r
if (!saveFile(outputPath + File.separatorChar + "AutoGen.c", fileBuffer)) {\r
switch (CommonDefinition.getModuleType(moduleType)) {\r
case CommonDefinition.ModuleTypeBase:\r
fileBuffer.append("RETURN_STATUS\r\n");\r
+ fileBuffer.append("EFIAPI\r\n");\r
fileBuffer.append(libInstanceList.get(i));\r
fileBuffer.append(" (\r\n");\r
fileBuffer.append(" VOID\r\n");\r
case CommonDefinition.ModuleTypePeiCore:\r
case CommonDefinition.ModuleTypePeim:\r
fileBuffer.append("EFI_STATUS\r\n");\r
+ fileBuffer.append("EFIAPI\r\n");\r
fileBuffer.append(libInstanceList.get(i));\r
fileBuffer.append(" (\r\n");\r
fileBuffer\r
case CommonDefinition.ModuleTypeUefiDriver:\r
case CommonDefinition.ModuleTypeUefiApplication:\r
fileBuffer.append("EFI_STATUS\r\n");\r
+ fileBuffer.append("EFIAPI\r\n");\r
fileBuffer.append(libInstanceList.get(i));\r
fileBuffer.append(" (\r\n");\r
fileBuffer.append(" IN EFI_HANDLE ImageHandle,\r\n");\r
// Add ProcessLibraryConstructorList in AutoGen.c\r
//\r
fileBuffer.append("VOID\r\n");\r
+ fileBuffer.append("EFIAPI\r\n");\r
fileBuffer.append("ProcessLibraryConstructorList (\r\n");\r
switch (CommonDefinition.getModuleType(moduleType)) {\r
case CommonDefinition.ModuleTypeBase:\r
for (int i = 0; i < libInstanceList.size(); i++) {\r
switch (CommonDefinition.getModuleType(moduleType)) {\r
case CommonDefinition.ModuleTypeBase:\r
- fileBuffer.append("RETURN_STATUS\n");\r
+ fileBuffer.append("RETURN_STATUS\r\n");\r
+ fileBuffer.append("EFIAPI\r\n");\r
fileBuffer.append(libInstanceList.get(i));\r
fileBuffer.append(" (\r\n");\r
fileBuffer.append(" VOID\r\n");\r
case CommonDefinition.ModuleTypePeiCore:\r
case CommonDefinition.ModuleTypePeim:\r
fileBuffer.append("EFI_STATUS\r\n");\r
+ fileBuffer.append("EFIAPI\r\n");\r
fileBuffer.append(libInstanceList.get(i));\r
fileBuffer.append(" (\r\n");\r
fileBuffer\r
case CommonDefinition.ModuleTypeUefiDriver:\r
case CommonDefinition.ModuleTypeUefiApplication:\r
fileBuffer.append("EFI_STATUS\r\n");\r
+ fileBuffer.append("EFIAPI\r\n");\r
fileBuffer.append(libInstanceList.get(i));\r
fileBuffer.append(" (\r\n");\r
fileBuffer.append(" IN EFI_HANDLE ImageHandle,\r\n");\r
case CommonDefinition.ModuleTypeUefiDriver:\r
case CommonDefinition.ModuleTypeUefiApplication:\r
fileBuffer.append("VOID\r\n");\r
+ fileBuffer.append("EFIAPI\r\n");\r
fileBuffer.append("ProcessLibraryDestructorList (\r\n");\r
fileBuffer.append(" IN EFI_HANDLE ImageHandle,\r\n");\r
fileBuffer.append(" IN EFI_SYSTEM_TABLE *SystemTable\r\n");\r