From: wuyizhong Date: Mon, 14 Aug 2006 03:47:59 +0000 (+0000) Subject: Do Not cleanall librarys with a module build clean or build cleanall. X-Git-Tag: edk2-stable201903~24627 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=67e7b756c86a608ee22204a991cb4226ef7e284d;hp=af7964350bd8f7cfe6b2f7ff1293c4645c650259 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 --- diff --git a/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java b/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java index e9e2770957..49628af5d2 100644 --- a/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java +++ b/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java @@ -235,41 +235,6 @@ public class ModuleBuildFileGenerator { @param root Root element for current **/ 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 passDownMap = new LinkedHashMap(); - 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); - } // // // @@ -292,42 +257,6 @@ public class ModuleBuildFileGenerator { @param root Root element for current **/ 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 passDownMap = new LinkedHashMap(); - 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); - } // // // @@ -364,7 +293,6 @@ public class ModuleBuildFileGenerator { **/ private void applyLibraryInstance(Document document, Node root) { ModuleIdentification[] libinstances = SurfaceAreaQuery.getLibraryInstance(fpdModuleId.getArch()); -// String propertyLibs = ""; for (int i = 0; i < libinstances.length; i++) { // // Put package file path to module identification @@ -376,7 +304,6 @@ public class ModuleBuildFileGenerator { // Element ele = document.createElement("GenBuild"); ele.setAttribute("type", "build"); -// ele.setAttribute("inheritAll", "false"); // // Prepare pass down information @@ -400,9 +327,7 @@ public class ModuleBuildFileGenerator { } root.appendChild(ele); -// propertyLibs += " " + project.getProperty("BIN_DIR") + File.separatorChar + libinstances[i].getName() + ".lib"; } -// project.setProperty("LIBS", propertyLibs.replaceAll("(\\\\)", "/")); } /**