Changed the way of using precompiled header in the build process. Now the use of precompiled header is controlled by tools_def.txt.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1690 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 10 insertions, 0 deletions

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
index 99767ab4f2..d614e67865 100644
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
@@ -480,6 +480,9 @@ public class GenBuildTask extends Ant {
             String cmdPath = GlobalData.getCommandSetting(key, fpdModuleId);

             key[4] = ToolDefinitions.TOOLS_DEF_ATTRIBUTE_NAME;

             String cmdName = GlobalData.getCommandSetting(key, fpdModuleId);

+            if (cmdName.length() == 0) {

+                continue;

+            }

             File cmdFile = new File(cmdPath + File.separatorChar + cmdName);

             getProject().setProperty(cmd[m], cmdFile.getPath().replaceAll("(\\\\)", "/"));

 

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java b/Tools/Java/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java
index c02bc1fce8..195ffdef71 100644
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java
@@ -374,6 +374,13 @@ public class ModuleBuildFileGenerator {
         // Initialize some properties by user

         //

         Element initEle = document.createElement("Build_Init");

+        Element initIncEle = document.createElement("EXTRA.INC");

+        for (int i = 0; i < includes.length; i++) {

+            Element includeEle = document.createElement("includepath");

+            includeEle.setAttribute("path", includes[i]);

+            initIncEle.appendChild(includeEle);

+        }

+        initEle.appendChild(initIncEle);

         root.appendChild(initEle);

 

         String moduleDir = project.getProperty("MODULE_DIR");