Change output dir layout from Target/TagName/Arch to Target_TagName/Arch.

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

diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
index 873da774e5db93ea4118de4ea311fcd569888e2a..46fe580c762d74ed2a56f3f9836ab0832a68d81b 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
@@ -153,7 +153,7 @@ public class FpdParserTask extends Task {
                 // Prepare FV_DIR\r
                 //\r
                 String ffsCommonDir = getProject().getProperty("BUILD_DIR") + File.separatorChar\r
-                                + targetList[i] + File.separatorChar\r
+                                + targetList[i] + "_"\r
                                 + toolchainList[j];\r
                 File fvDir = new File(ffsCommonDir + File.separatorChar + "FV");\r
                 fvDir.mkdirs();\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java b/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
index ef6dc7223e535a03b5596cd4b672c19926569c90..dd812d8e8ababd70067f65d43a384d515326bc45 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
@@ -310,7 +310,7 @@ public class PlatformBuildFileGenerator {
             String[] toolchainList = GlobalData.getToolChainInfo().getTagnames();\r
             for(int j = 0; j < toolchainList.length; j++){\r
                 String fvOutputDir = project.getProperty("BUILD_DIR") + File.separatorChar \r
-                                        + targetList[i] + File.separatorChar \r
+                                        + targetList[i] + "_" \r
                                         + toolchainList[j] + File.separatorChar + "FV";\r
                 String[] validFv = SurfaceAreaQuery.getFpdValidImageNames();\r
                 for (int k = 0; k < validFv.length; k++) {\r
@@ -422,9 +422,12 @@ public class PlatformBuildFileGenerator {
         if (isUnified) {\r
             String[] targetList = GlobalData.getToolChainInfo().getTargets();\r
             for (int i = 0; i < targetList.length; ++i) {\r
-                Element cleanAllEle = document.createElement("delete");\r
-                cleanAllEle.setAttribute("dir", project.getProperty("BUILD_DIR") + File.separatorChar + targetList[i]);\r
-                ele.appendChild(cleanAllEle);\r
+                String[] toolchainList = GlobalData.getToolChainInfo().getTagnames();\r
+                for(int j = 0; j < toolchainList.length; j++) {\r
+                    Element cleanAllEle = document.createElement("delete");\r
+                    cleanAllEle.setAttribute("dir", project.getProperty("BUILD_DIR") + File.separatorChar + targetList[i] + "_" + toolchainList[j]);\r
+                    ele.appendChild(cleanAllEle);\r
+                }\r
             }\r
         } else {\r
             Set set = outfiles.keySet();\r
@@ -517,7 +520,7 @@ public class PlatformBuildFileGenerator {
                     // Prepare FV_DIR\r
                     //\r
                     String ffsCommonDir = project.getProperty("BUILD_DIR") + File.separatorChar \r
-                                    + targetList[i] + File.separatorChar \r
+                                    + targetList[i] + "_" \r
                                     + toolchainList[j];\r
                     File fvDir = new File(ffsCommonDir + File.separatorChar + "FV");\r
                     Element fvEle = document.createElement("var");\r
@@ -561,7 +564,7 @@ public class PlatformBuildFileGenerator {
                     // Prepare FV_DIR\r
                     //\r
                     String ffsCommonDir = project.getProperty("BUILD_DIR") + File.separatorChar \r
-                                    + targetList[i] + File.separatorChar \r
+                                    + targetList[i] + "_" \r
                                     + toolchainList[j];\r
                     File fvDir = new File(ffsCommonDir + File.separatorChar + "FV");\r
                     Element fvEle = document.createElement("var");\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/OutputManager.java b/Tools/Source/GenBuild/org/tianocore/build/global/OutputManager.java
index 5022f932bf59ad97f74a93c8127af5a3647cc235..52ffff4b6a8c32f6ed0d2bf88c61e9a833719118 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/global/OutputManager.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/OutputManager.java
@@ -128,11 +128,11 @@ public class OutputManager {
         // Define BIN_DIR and FV_DIR\r
         //\r
         String binDir = buildDir + File.separatorChar + project.getProperty("TARGET")\r
-                                 + File.separatorChar + project.getProperty("TOOLCHAIN") \r
+                                 + "_" + project.getProperty("TOOLCHAIN") \r
                                  + File.separatorChar + project.getProperty("ARCH") ;\r
         \r
         String fvDir = buildDir + File.separatorChar + project.getProperty("TARGET")\r
-                                + File.separatorChar + project.getProperty("TOOLCHAIN") \r
+                                + "_" + project.getProperty("TOOLCHAIN") \r
                                 + File.separatorChar + "FV";\r
         \r
         //\r