diff options
| author | wuyizhong <wuyizhong@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-08-30 03:57:57 +0000 |
|---|---|---|
| committer | wuyizhong <wuyizhong@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-08-30 03:57:57 +0000 |
| commit | 6ae1510e527a79a6958f0ada17c9ef6a4dfba5af (patch) | |
| tree | b8ccd3d1a5570bd86c083855f7403ec5ccb2e8f3 /Tools/Source/GenBuild/org | |
| parent | 96c9ae450779b0d87510ddae647cc621553017b8 (diff) | |
| download | edk2-6ae1510e527a79a6958f0ada17c9ef6a4dfba5af.zip edk2-6ae1510e527a79a6958f0ada17c9ef6a4dfba5af.tar.gz edk2-6ae1510e527a79a6958f0ada17c9ef6a4dfba5af.tar.bz2 | |
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
Diffstat (limited to 'Tools/Source/GenBuild/org')
3 files changed, 12 insertions, 9 deletions
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 @@ public class FpdParserTask extends Task { // 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 @@ public class PlatformBuildFileGenerator { 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 @@ public class PlatformBuildFileGenerator { 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 @@ public class PlatformBuildFileGenerator { // 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 @@ public class PlatformBuildFileGenerator { // 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 @@ public class OutputManager { // 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";
//
|