Move ant-related code from ParserFpd function to enable single module debug for PCD tools.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@747 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
klu2 2006-07-04 14:32:27 +00:00
parent 25832ed337
commit 7629edbc44
2 changed files with 14 additions and 9 deletions

View File

@ -148,6 +148,10 @@ public class FpdParserTask extends Task {
// //
parseFpdFile(); parseFpdFile();
getProject().setProperty("PLATFORM", platformId.getName());
getProject().setProperty("PLATFORM_DIR", platformId.getFpdFile().getParent().replaceAll("(\\\\)", "/"));
getProject().setProperty("PLATFORM_RELATIVE_DIR", platformId.getPlatformRelativeDir().replaceAll("(\\\\)", "/"));
// //
// Pcd Collection. Call CollectPCDAction to collect pcd info. // Pcd Collection. Call CollectPCDAction to collect pcd info.
// //
@ -361,9 +365,6 @@ public class FpdParserTask extends Task {
// //
platformId = SurfaceAreaQuery.getFpdHeader(); platformId = SurfaceAreaQuery.getFpdHeader();
platformId.setFpdFile(fpdFile); platformId.setFpdFile(fpdFile);
getProject().setProperty("PLATFORM", platformId.getName());
getProject().setProperty("PLATFORM_DIR", platformId.getFpdFile().getParent().replaceAll("(\\\\)", "/"));
getProject().setProperty("PLATFORM_RELATIVE_DIR", platformId.getPlatformRelativeDir().replaceAll("(\\\\)", "/"));
// //
// Build mode. User-defined output dir. // Build mode. User-defined output dir.

View File

@ -42,6 +42,7 @@ import org.tianocore.PcdBuildDefinitionDocument;
import org.tianocore.ModuleSADocument; import org.tianocore.ModuleSADocument;
import org.tianocore.PcdBuildDefinitionDocument.PcdBuildDefinition; import org.tianocore.PcdBuildDefinitionDocument.PcdBuildDefinition;
import org.tianocore.build.autogen.CommonDefinition; import org.tianocore.build.autogen.CommonDefinition;
import org.tianocore.build.fpd.FpdParserTask;
import org.tianocore.build.global.GlobalData; import org.tianocore.build.global.GlobalData;
import org.tianocore.build.id.FpdModuleIdentification; import org.tianocore.build.id.FpdModuleIdentification;
import org.tianocore.build.pcd.action.ActionMessage; import org.tianocore.build.pcd.action.ActionMessage;
@ -2768,11 +2769,14 @@ public class CollectPCDAction {
**/ **/
public static void main(String argv[]) throws EntityException { public static void main(String argv[]) throws EntityException {
CollectPCDAction ca = new CollectPCDAction(); CollectPCDAction ca = new CollectPCDAction();
ca.setWorkspacePath("m:/tianocore/edk2"); ca.setWorkspacePath("f:/tianocore/edk2");
ca.setFPDFilePath("m:/tianocore/edk2/EdkNt32Pkg/Nt32.fpd"); ca.setFPDFilePath("f:/tianocore/edk2/EdkNt32Pkg/Nt32.fpd");
ca.setActionMessageLevel(ActionMessage.MAX_MESSAGE_LEVEL); ca.setActionMessageLevel(ActionMessage.MAX_MESSAGE_LEVEL);
// GlobalData.initInfo("Tools" + File.separator + "Conf" + File.separator + "FrameworkDatabase.db", GlobalData.initInfo("Tools" + File.separator + "Conf" + File.separator + "FrameworkDatabase.db",
// "m:/tianocore/edk2"); "f:/tianocore/edk2",
// ca.execute(); "tools_def.txt");
FpdParserTask fpt = new FpdParserTask();
fpt.parseFpdFile(new File("f:/tianocore/edk2/EdkNt32Pkg/Nt32.fpd"));
ca.execute();
} }
} }