tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add one more platform level common property "TARGET_DIR". Take Nt32 for example: TARGET_DIR=${BUILD_DIR}/${TARGET}_${TAGNAME} 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1458 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
wuyizhong 2006-09-05 06:37:04 +00:00
parent e5a487d784
commit 4250be6c84
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -531,6 +531,11 @@ public class PlatformBuildFileGenerator {
fvEle.setAttribute("value", fvDir.getPath().replaceAll("(\\\\)", "/")); fvEle.setAttribute("value", fvDir.getPath().replaceAll("(\\\\)", "/"));
ele.appendChild(fvEle); ele.appendChild(fvEle);
Element targetDirEle = document.createElement("var");
targetDirEle.setAttribute("name", "TARGET_DIR");
targetDirEle.setAttribute("value", ffsCommonDir.replaceAll("(\\\\)", "/"));
ele.appendChild(targetDirEle);
NodeList childNodes = node.getChildNodes(); NodeList childNodes = node.getChildNodes();
for (int k = 0; k < childNodes.getLength(); k++) { for (int k = 0; k < childNodes.getLength(); k++) {
Node childItem = childNodes.item(k); Node childItem = childNodes.item(k);
@ -538,7 +543,6 @@ public class PlatformBuildFileGenerator {
ele.appendChild(recursiveNode(childItem, document)); ele.appendChild(recursiveNode(childItem, document));
} }
} }
} }
} }
} }
@ -575,6 +579,11 @@ public class PlatformBuildFileGenerator {
fvEle.setAttribute("value", fvDir.getPath().replaceAll("(\\\\)", "/")); fvEle.setAttribute("value", fvDir.getPath().replaceAll("(\\\\)", "/"));
ele.appendChild(fvEle); ele.appendChild(fvEle);
Element targetDirEle = document.createElement("var");
targetDirEle.setAttribute("name", "TARGET_DIR");
targetDirEle.setAttribute("value", ffsCommonDir.replaceAll("(\\\\)", "/"));
ele.appendChild(targetDirEle);
NodeList childNodes = node.getChildNodes(); NodeList childNodes = node.getChildNodes();
for (int k = 0; k < childNodes.getLength(); k++) { for (int k = 0; k < childNodes.getLength(); k++) {
Node childItem = childNodes.item(k); Node childItem = childNodes.item(k);

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

@ -123,16 +123,18 @@ public class OutputManager {
} }
} }
//
// Define TARGET_DIR
//
String targetDir = buildDir + File.separatorChar + project.getProperty("TARGET")
+ "_" + project.getProperty("TOOLCHAIN");
// //
// Define BIN_DIR and FV_DIR // Define BIN_DIR and FV_DIR
// //
String binDir = buildDir + File.separatorChar + project.getProperty("TARGET") String binDir = targetDir + File.separatorChar + project.getProperty("ARCH") ;
+ "_" + project.getProperty("TOOLCHAIN")
+ File.separatorChar + project.getProperty("ARCH") ;
String fvDir = buildDir + File.separatorChar + project.getProperty("TARGET") String fvDir = targetDir + File.separatorChar + "FV";
+ "_" + project.getProperty("TOOLCHAIN")
+ File.separatorChar + "FV";
// //
// Define DEST_DIR_OUTPUT and DEST_DIR_DEBUG // Define DEST_DIR_OUTPUT and DEST_DIR_DEBUG
@ -144,6 +146,7 @@ public class OutputManager {
// Set properties // Set properties
// //
project.setProperty("BUILD_DIR", buildDir.replaceAll("(\\\\)", "/")); project.setProperty("BUILD_DIR", buildDir.replaceAll("(\\\\)", "/"));
project.setProperty("TARGET_DIR", targetDir.replaceAll("(\\\\)", "/"));
project.setProperty("FV_DIR", fvDir.replaceAll("(\\\\)", "/")); project.setProperty("FV_DIR", fvDir.replaceAll("(\\\\)", "/"));
project.setProperty("BIN_DIR", binDir.replaceAll("(\\\\)", "/")); project.setProperty("BIN_DIR", binDir.replaceAll("(\\\\)", "/"));
project.setProperty("DEST_DIR_DEBUG", (destDir + File.separatorChar + "DEBUG").replaceAll("(\\\\)", "/")); project.setProperty("DEST_DIR_DEBUG", (destDir + File.separatorChar + "DEBUG").replaceAll("(\\\\)", "/"));