Add one more platform level common property "TARGET_DIR". Take Nt32 for example:...

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

diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java b/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
index 017c4e378c8dabd306c38c01b98638b942067589..375122483f7e04f4f9f458c0f939c45d1222ba4e 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
@@ -531,6 +531,11 @@ public class PlatformBuildFileGenerator {
                     fvEle.setAttribute("value", fvDir.getPath().replaceAll("(\\\\)", "/"));\r
                     ele.appendChild(fvEle);\r
                     \r
+                    Element targetDirEle = document.createElement("var");\r
+                    targetDirEle.setAttribute("name", "TARGET_DIR");\r
+                    targetDirEle.setAttribute("value", ffsCommonDir.replaceAll("(\\\\)", "/"));\r
+                    ele.appendChild(targetDirEle);\r
+                    \r
                     NodeList childNodes = node.getChildNodes();\r
                     for (int k = 0; k < childNodes.getLength(); k++) {\r
                         Node childItem = childNodes.item(k);\r
@@ -538,7 +543,6 @@ public class PlatformBuildFileGenerator {
                             ele.appendChild(recursiveNode(childItem, document));\r
                         }\r
                     }\r
-                \r
                 }\r
             }\r
         }\r
@@ -575,6 +579,11 @@ public class PlatformBuildFileGenerator {
                     fvEle.setAttribute("value", fvDir.getPath().replaceAll("(\\\\)", "/"));\r
                     ele.appendChild(fvEle);\r
                     \r
+                    Element targetDirEle = document.createElement("var");\r
+                    targetDirEle.setAttribute("name", "TARGET_DIR");\r
+                    targetDirEle.setAttribute("value", ffsCommonDir.replaceAll("(\\\\)", "/"));\r
+                    ele.appendChild(targetDirEle);\r
+                    \r
                     NodeList childNodes = node.getChildNodes();\r
                     for (int k = 0; k < childNodes.getLength(); k++) {\r
                         Node childItem = childNodes.item(k);\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/OutputManager.java b/Tools/Source/GenBuild/org/tianocore/build/global/OutputManager.java
index 3aa736d4003e0b5e086a8560f85544424d08be31..2c70326202fdabf164573ff5ff5300d3fded99fd 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/global/OutputManager.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/OutputManager.java
@@ -123,16 +123,18 @@ public class OutputManager {
             }\r
         }\r
         \r
+        //\r
+        // Define TARGET_DIR\r
+        //\r
+        String targetDir = buildDir + File.separatorChar + project.getProperty("TARGET")\r
+                                    + "_" + project.getProperty("TOOLCHAIN");\r
+        \r
         //\r
         // Define BIN_DIR and FV_DIR\r
         //\r
-        String binDir = buildDir + File.separatorChar + project.getProperty("TARGET")\r
-                                 + "_" + project.getProperty("TOOLCHAIN") \r
-                                 + File.separatorChar + project.getProperty("ARCH") ;\r
+        String binDir = targetDir + File.separatorChar + project.getProperty("ARCH") ;\r
         \r
-        String fvDir = buildDir + File.separatorChar + project.getProperty("TARGET")\r
-                                + "_" + project.getProperty("TOOLCHAIN") \r
-                                + File.separatorChar + "FV";\r
+        String fvDir = targetDir + File.separatorChar + "FV";\r
         \r
         //\r
         // Define DEST_DIR_OUTPUT and DEST_DIR_DEBUG\r
@@ -144,6 +146,7 @@ public class OutputManager {
         // Set properties\r
         //\r
         project.setProperty("BUILD_DIR", buildDir.replaceAll("(\\\\)", "/"));\r
+        project.setProperty("TARGET_DIR", targetDir.replaceAll("(\\\\)", "/"));\r
         project.setProperty("FV_DIR", fvDir.replaceAll("(\\\\)", "/"));\r
         project.setProperty("BIN_DIR", binDir.replaceAll("(\\\\)", "/"));\r
         project.setProperty("DEST_DIR_DEBUG", (destDir + File.separatorChar + "DEBUG").replaceAll("(\\\\)", "/"));\r