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 873da77..46fe580 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
@@ -153,7 +153,7 @@
// Prepare FV_DIR
//
String ffsCommonDir = getProject().getProperty("BUILD_DIR") + File.separatorChar
- + targetList[i] + File.separatorChar
+ + targetList[i] + "_"
+ toolchainList[j];
File fvDir = new File(ffsCommonDir + File.separatorChar + "FV");
fvDir.mkdirs();
diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java b/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
index ef6dc72..dd812d8 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
@@ -310,7 +310,7 @@
String[] toolchainList = GlobalData.getToolChainInfo().getTagnames();
for(int j = 0; j < toolchainList.length; j++){
String fvOutputDir = project.getProperty("BUILD_DIR") + File.separatorChar
- + targetList[i] + File.separatorChar
+ + targetList[i] + "_"
+ toolchainList[j] + File.separatorChar + "FV";
String[] validFv = SurfaceAreaQuery.getFpdValidImageNames();
for (int k = 0; k < validFv.length; k++) {
@@ -422,9 +422,12 @@
if (isUnified) {
String[] targetList = GlobalData.getToolChainInfo().getTargets();
for (int i = 0; i < targetList.length; ++i) {
- Element cleanAllEle = document.createElement("delete");
- cleanAllEle.setAttribute("dir", project.getProperty("BUILD_DIR") + File.separatorChar + targetList[i]);
- ele.appendChild(cleanAllEle);
+ String[] toolchainList = GlobalData.getToolChainInfo().getTagnames();
+ for(int j = 0; j < toolchainList.length; j++) {
+ Element cleanAllEle = document.createElement("delete");
+ cleanAllEle.setAttribute("dir", project.getProperty("BUILD_DIR") + File.separatorChar + targetList[i] + "_" + toolchainList[j]);
+ ele.appendChild(cleanAllEle);
+ }
}
} else {
Set set = outfiles.keySet();
@@ -517,7 +520,7 @@
// Prepare FV_DIR
//
String ffsCommonDir = project.getProperty("BUILD_DIR") + File.separatorChar
- + targetList[i] + File.separatorChar
+ + targetList[i] + "_"
+ toolchainList[j];
File fvDir = new File(ffsCommonDir + File.separatorChar + "FV");
Element fvEle = document.createElement("var");
@@ -561,7 +564,7 @@
// Prepare FV_DIR
//
String ffsCommonDir = project.getProperty("BUILD_DIR") + File.separatorChar
- + targetList[i] + File.separatorChar
+ + targetList[i] + "_"
+ toolchainList[j];
File fvDir = new File(ffsCommonDir + File.separatorChar + "FV");
Element fvEle = document.createElement("var");
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/OutputManager.java b/Tools/Source/GenBuild/org/tianocore/build/global/OutputManager.java
index 5022f93..52ffff4 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/global/OutputManager.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/OutputManager.java
@@ -128,11 +128,11 @@
// Define BIN_DIR and FV_DIR
//
String binDir = buildDir + File.separatorChar + project.getProperty("TARGET")
- + File.separatorChar + project.getProperty("TOOLCHAIN")
+ + "_" + project.getProperty("TOOLCHAIN")
+ File.separatorChar + project.getProperty("ARCH") ;
String fvDir = buildDir + File.separatorChar + project.getProperty("TARGET")
- + File.separatorChar + project.getProperty("TOOLCHAIN")
+ + "_" + project.getProperty("TOOLCHAIN")
+ File.separatorChar + "FV";
//