X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2FFrameworkBuildTask.java;fp=Tools%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2FFrameworkBuildTask.java;h=dc12f6e23ed5e48cfb98d328544bcd6950efa817;hp=b8d92ed33e9c4bdbe61a6661eb886e372c42e5dc;hb=1fa1cb752a62f624ff8e7d81c89b89b56c44dc13;hpb=e485bb4bff9dbd617d73f2b93b840c4e2c54d6db diff --git a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java index b8d92ed33e..dc12f6e23e 100644 --- a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java +++ b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java @@ -25,6 +25,7 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; import org.tianocore.build.fpd.FpdParserTask; import org.tianocore.build.global.GlobalData; +import org.tianocore.build.global.PropertyManager; import org.tianocore.build.toolchain.ConfigReader; import org.tianocore.build.toolchain.ToolChainInfo; import org.tianocore.common.definitions.ToolDefinitions; @@ -135,7 +136,7 @@ public class FrameworkBuildTask extends Task{ // Global Data initialization // File workspacePath = new File(getProject().getProperty("WORKSPACE")); - getProject().setProperty("WORKSPACE_DIR", workspacePath.getPath().replaceAll("(\\\\)", "/")); + PropertyManager.setProperty(getProject(), "WORKSPACE_DIR", workspacePath.getPath().replaceAll("(\\\\)", "/")); GlobalData.initInfo(dbFilename, workspacePath.getPath(), toolsDefFilename); // @@ -203,7 +204,7 @@ public class FrameworkBuildTask extends Task{ GenBuildTask genBuildTask = new GenBuildTask(); genBuildTask.setSingleModuleBuild(true); genBuildTask.setType(type); - getProject().setProperty("PLATFORM_FILE", activePlatform); + PropertyManager.setProperty(getProject(), "PLATFORM_FILE", activePlatform); genBuildTask.setProject(getProject()); genBuildTask.setMsaFile(buildFile); genBuildTask.execute(); @@ -226,7 +227,7 @@ public class FrameworkBuildTask extends Task{ // If system environment variable is not in ANT properties, add it // if (getProject().getProperty(name) == null) { - getProject().setProperty(name, sysProperties.get(name)); + PropertyManager.setProperty(getProject(), name, sysProperties.get(name)); } } }