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

[mirror_edk2.git] / Tools / Source / GenBuild / org / tianocore / build / fpd / PlatformBuildFileGenerator.java

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