Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
wuyizhong 2006-08-30 03:57:57 +00:00
parent 96c9ae4507
commit 6ae1510e52
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
View File

@ -153,7 +153,7 @@ public class FpdParserTask extends Task {
// Prepare FV_DIR // Prepare FV_DIR
// //
String ffsCommonDir = getProject().getProperty("BUILD_DIR") + File.separatorChar String ffsCommonDir = getProject().getProperty("BUILD_DIR") + File.separatorChar
+ targetList[i] + File.separatorChar + targetList[i] + "_"
+ toolchainList[j]; + toolchainList[j];
File fvDir = new File(ffsCommonDir + File.separatorChar + "FV"); File fvDir = new File(ffsCommonDir + File.separatorChar + "FV");
fvDir.mkdirs(); fvDir.mkdirs();

15
Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
View File

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

4
Tools/Source/GenBuild/org/tianocore/build/global/OutputManager.java
View File

@ -128,11 +128,11 @@ public class OutputManager {
// Define BIN_DIR and FV_DIR // Define BIN_DIR and FV_DIR
// //
String binDir = buildDir + File.separatorChar + project.getProperty("TARGET") String binDir = buildDir + File.separatorChar + project.getProperty("TARGET")
+ File.separatorChar + project.getProperty("TOOLCHAIN") + "_" + project.getProperty("TOOLCHAIN")
+ File.separatorChar + project.getProperty("ARCH") ; + File.separatorChar + project.getProperty("ARCH") ;
String fvDir = buildDir + File.separatorChar + project.getProperty("TARGET") String fvDir = buildDir + File.separatorChar + project.getProperty("TARGET")
+ File.separatorChar + project.getProperty("TOOLCHAIN") + "_" + project.getProperty("TOOLCHAIN")
+ File.separatorChar + "FV"; + File.separatorChar + "FV";
// //