Do Not cleanall librarys with a module build clean or build cleanall.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1246 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
af7964350b
commit
67e7b756c8
|
@ -235,41 +235,6 @@ public class ModuleBuildFileGenerator {
|
||||||
@param root Root element for current
|
@param root Root element for current
|
||||||
**/
|
**/
|
||||||
private void applyCleanElement(Document document, Node root) {
|
private void applyCleanElement(Document document, Node root) {
|
||||||
ModuleIdentification[] libinstances = SurfaceAreaQuery.getLibraryInstance(fpdModuleId.getArch());
|
|
||||||
for (int i = 0; i < libinstances.length; i++) {
|
|
||||||
//
|
|
||||||
// Put package file path to module identification
|
|
||||||
//
|
|
||||||
PackageIdentification packageId = libinstances[i].getPackage();
|
|
||||||
|
|
||||||
//
|
|
||||||
// Generate ANT script to clean
|
|
||||||
//
|
|
||||||
Element ele = document.createElement("GenBuild");
|
|
||||||
ele.setAttribute("type", "clean");
|
|
||||||
|
|
||||||
//
|
|
||||||
// Prepare pass down information
|
|
||||||
//
|
|
||||||
Map<String, String> passDownMap = new LinkedHashMap<String, String>();
|
|
||||||
for (int j = 0; j < inheritProperties.length; j ++){
|
|
||||||
passDownMap.put(inheritProperties[j], "${" + inheritProperties[j] + "}");
|
|
||||||
}
|
|
||||||
passDownMap.put("MODULE_GUID", libinstances[i].getGuid());
|
|
||||||
passDownMap.put("MODULE_VERSION", libinstances[i].getVersion());
|
|
||||||
|
|
||||||
passDownMap.put("PACKAGE_GUID", packageId.getGuid());
|
|
||||||
passDownMap.put("PACKAGE_VERSION", packageId.getVersion());
|
|
||||||
|
|
||||||
for (int j = 0; j < inheritProperties.length; j ++){
|
|
||||||
Element property = document.createElement("property");
|
|
||||||
property.setAttribute("name", inheritProperties[j]);
|
|
||||||
property.setAttribute("value", passDownMap.get(inheritProperties[j]));
|
|
||||||
ele.appendChild(property);
|
|
||||||
}
|
|
||||||
|
|
||||||
root.appendChild(ele);
|
|
||||||
}
|
|
||||||
//
|
//
|
||||||
// <delete includeemptydirs="true">
|
// <delete includeemptydirs="true">
|
||||||
// <fileset dir="${DEST_DIR_OUTPUT}" includes="" excludes="" />
|
// <fileset dir="${DEST_DIR_OUTPUT}" includes="" excludes="" />
|
||||||
|
@ -292,42 +257,6 @@ public class ModuleBuildFileGenerator {
|
||||||
@param root Root element for current
|
@param root Root element for current
|
||||||
**/
|
**/
|
||||||
private void applyDeepcleanElement(Document document, Node root) {
|
private void applyDeepcleanElement(Document document, Node root) {
|
||||||
ModuleIdentification[] libinstances = SurfaceAreaQuery.getLibraryInstance(fpdModuleId.getArch());
|
|
||||||
for (int i = 0; i < libinstances.length; i++) {
|
|
||||||
//
|
|
||||||
// Put package file path to module identification
|
|
||||||
//
|
|
||||||
PackageIdentification packageId = libinstances[i].getPackage();
|
|
||||||
|
|
||||||
//
|
|
||||||
// Generate ANT script to clean
|
|
||||||
//
|
|
||||||
Element ele = document.createElement("GenBuild");
|
|
||||||
ele.setAttribute("type", "cleanall");
|
|
||||||
|
|
||||||
//
|
|
||||||
// Prepare pass down information
|
|
||||||
//
|
|
||||||
Map<String, String> passDownMap = new LinkedHashMap<String, String>();
|
|
||||||
for (int j = 0; j < inheritProperties.length; j ++){
|
|
||||||
passDownMap.put(inheritProperties[j], "${" + inheritProperties[j] + "}");
|
|
||||||
}
|
|
||||||
|
|
||||||
passDownMap.put("MODULE_GUID", libinstances[i].getGuid());
|
|
||||||
passDownMap.put("MODULE_VERSION", libinstances[i].getVersion());
|
|
||||||
|
|
||||||
passDownMap.put("PACKAGE_GUID", packageId.getGuid());
|
|
||||||
passDownMap.put("PACKAGE_VERSION", packageId.getVersion());
|
|
||||||
|
|
||||||
for (int j = 0; j < inheritProperties.length; j ++){
|
|
||||||
Element property = document.createElement("property");
|
|
||||||
property.setAttribute("name", inheritProperties[j]);
|
|
||||||
property.setAttribute("value", passDownMap.get(inheritProperties[j]));
|
|
||||||
ele.appendChild(property);
|
|
||||||
}
|
|
||||||
|
|
||||||
root.appendChild(ele);
|
|
||||||
}
|
|
||||||
//
|
//
|
||||||
// <delete includeemptydirs="true">
|
// <delete includeemptydirs="true">
|
||||||
// <fileset dir="${DEST_DIR_OUTPUT}" includes="" excludes="" />
|
// <fileset dir="${DEST_DIR_OUTPUT}" includes="" excludes="" />
|
||||||
|
@ -364,7 +293,6 @@ public class ModuleBuildFileGenerator {
|
||||||
**/
|
**/
|
||||||
private void applyLibraryInstance(Document document, Node root) {
|
private void applyLibraryInstance(Document document, Node root) {
|
||||||
ModuleIdentification[] libinstances = SurfaceAreaQuery.getLibraryInstance(fpdModuleId.getArch());
|
ModuleIdentification[] libinstances = SurfaceAreaQuery.getLibraryInstance(fpdModuleId.getArch());
|
||||||
// String propertyLibs = "";
|
|
||||||
for (int i = 0; i < libinstances.length; i++) {
|
for (int i = 0; i < libinstances.length; i++) {
|
||||||
//
|
//
|
||||||
// Put package file path to module identification
|
// Put package file path to module identification
|
||||||
|
@ -376,7 +304,6 @@ public class ModuleBuildFileGenerator {
|
||||||
//
|
//
|
||||||
Element ele = document.createElement("GenBuild");
|
Element ele = document.createElement("GenBuild");
|
||||||
ele.setAttribute("type", "build");
|
ele.setAttribute("type", "build");
|
||||||
// ele.setAttribute("inheritAll", "false");
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// Prepare pass down information
|
// Prepare pass down information
|
||||||
|
@ -400,9 +327,7 @@ public class ModuleBuildFileGenerator {
|
||||||
}
|
}
|
||||||
|
|
||||||
root.appendChild(ele);
|
root.appendChild(ele);
|
||||||
// propertyLibs += " " + project.getProperty("BIN_DIR") + File.separatorChar + libinstances[i].getName() + ".lib";
|
|
||||||
}
|
}
|
||||||
// project.setProperty("LIBS", propertyLibs.replaceAll("(\\\\)", "/"));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue