From 47412835e579350c720736e9a51e8b883ab3bf61 Mon Sep 17 00:00:00 2001 From: wuyizhong Date: Tue, 10 Oct 2006 02:40:59 +0000 Subject: [PATCH] 1. Update to just keep several line JAVA related msg; 2. Remove file PropertyManager.java. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1698 6f19259b-4bc3-4df7-8a09-765794883524 --- .../tianocore/build/FrameworkBuildTask.java | 5 + .../org/tianocore/build/GenBuildTask.java | 35 ++-- .../build/global/PropertyManager.java | 196 ------------------ ...latformPcdPreprocessActionForBuilding.java | 5 - 4 files changed, 20 insertions(+), 221 deletions(-) delete mode 100644 Tools/Java/Source/GenBuild/org/tianocore/build/global/PropertyManager.java diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java index fce5108024..53d5cea8bb 100644 --- a/Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java +++ b/Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java @@ -115,6 +115,11 @@ public class FrameworkBuildTask extends Task{ try { processFrameworkBuild(); + }catch (BuildException e) { + // + // Add more logic process here + // + throw new BuildException(e.getMessage()); } catch (PcdAutogenException e) { // // Add more logic process here diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java index d614e67865..b047fab425 100644 --- a/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java +++ b/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java @@ -134,30 +134,25 @@ public class GenBuildTask extends Ant { try { processGenBuild(); } catch (PcdAutogenException e) { - // - // Add more logic process here - // - throw new BuildException(e.getMessage()); + BuildException buildException = new BuildException(e.getMessage()); + buildException.setStackTrace(e.getStackTrace()); + throw buildException; } catch (AutoGenException e) { - // - // Add more logic process here - // - throw new BuildException(e.getMessage()); + BuildException buildException = new BuildException(e.getMessage()); + buildException.setStackTrace(e.getStackTrace()); + throw buildException; } catch (PlatformPcdPreprocessBuildException e) { - // - // Add more logic process here - // - throw new BuildException(e.getMessage()); + BuildException buildException = new BuildException(e.getMessage()); + buildException.setStackTrace(e.getStackTrace()); + throw buildException; } catch (GenBuildException e) { - // - // Add more logic process here - // - throw new BuildException(e.getMessage()); + BuildException buildException = new BuildException(e.getMessage()); + buildException.setStackTrace(e.getStackTrace()); + throw buildException; } catch (EdkException e) { - // - // Add more logic process here - // - throw new BuildException(e.getMessage()); + BuildException buildException = new BuildException(e.getMessage()); + buildException.setStackTrace(e.getStackTrace()); + throw buildException; } } diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/global/PropertyManager.java b/Tools/Java/Source/GenBuild/org/tianocore/build/global/PropertyManager.java deleted file mode 100644 index 1bd7cf97da..0000000000 --- a/Tools/Java/Source/GenBuild/org/tianocore/build/global/PropertyManager.java +++ /dev/null @@ -1,196 +0,0 @@ -/** @file - PropertyManager class. - - PropertyManager class wraps Project.setProperty and tracks overrided properties. - -Copyright (c) 2006, Intel Corporation -All rights reserved. This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -**/ -package org.tianocore.build.global; - -import java.util.HashMap; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.Set; -import java.util.Stack; - -import org.apache.tools.ant.Project; -import org.apache.tools.ant.PropertyHelper; - -/** - PropertyManager uses a incremental way to to track overrided properties when - setProperty. This is useful for property recovery in nestly calling build files. - Another functionality of this class is to prevent warning message printed when - building with "verbose" mode. - **/ -public class PropertyManager { - // - // Property table stack, keeps track the history of properties changes - // - private static Stack> propertyTableStack = new Stack>(); - // - // The very original properties - // - private static HashMap orgPropertyTable = null; - // - // The last changes of properties - // - private static HashMap oldPropertyTable = null; - // - // The current changes of properties - // - private static HashMap bakPropertyTable = null; - // - // The Project of tracking properties - // - private static Project prj = null; - // - // PropertyHelper of this project for setting property quietly - // - private static PropertyHelper ph = null; - - /** - Backup properties that have been overrided onto the stack for later recovery. - **/ - public static void save() { - // - // If this is the first time to save properties changes, keep all properties - // of this project as the original property table. - // - if (orgPropertyTable == null) { - Hashtable prjProperties = prj.getProperties(); - orgPropertyTable = new HashMap(); - - Set keys = prjProperties.keySet(); - Iterator iter = keys.iterator(); - while (iter.hasNext()) { - String item = (String)iter.next(); - orgPropertyTable.put(item, (String)prjProperties.get(item)); - } - } - - // - // If there're already overrided properties, push it onto stack; otherwise - // prepare taking new overrided property by allocating space for it. - // - if (bakPropertyTable != null) { - propertyTableStack.push(bakPropertyTable); - oldPropertyTable = bakPropertyTable; - } else { - oldPropertyTable = orgPropertyTable; - } - bakPropertyTable = new HashMap(); - } - - /** - Restore the properties backup - **/ - public static void restore() { - if (bakPropertyTable == null) { - // - // No properties backup, do nothing - // - return; - } - Set keys = bakPropertyTable.keySet(); - - // - // Re-set properties in backup - // - Iterator iter = keys.iterator(); - while (iter.hasNext()) { - String name = (String)iter.next(); - String value = (String)bakPropertyTable.get(name); - ph.setProperty(null, name, value, false); - } - - // - // If there's backup history, get top one for next recovery - // - if (propertyTableStack.size() > 0) { - bakPropertyTable = (HashMap)propertyTableStack.pop(); - } else { - bakPropertyTable = null; // no recovery any more - } - - // - // Determine last overrided properties for incremental judgement - // - if (propertyTableStack.size() == 0) { - oldPropertyTable = orgPropertyTable; - } else { - oldPropertyTable = (HashMap)propertyTableStack.peek(); - } - } - - /** - Set current Project for save() and restore() use. - - @param prj - **/ - public static void setProject(Project prj) { - PropertyManager.prj = prj; - PropertyManager.ph = PropertyHelper.getPropertyHelper(prj); - } - - /** - Set a property for current project. It will also be put into property - history record if the record table has been setup. - - @param name Property name - @param value Property value - **/ - public static void setProperty(String name, String value) { - if (prj == null) { - return; - } - - setProperty(prj, name, value); - } - - /** - Set a property for current project. It will also be put into property - history record if the record table has been setup. - - @param project The Project for which the property will be set - @param name Property name - @param value Property value - **/ - public static void setProperty(Project project, String name, String value) { - if (project == null) { - if (prj == null) { - return; // a Project must be given; otherwise nothing can be set - } - project = prj; - } - - // - // Using PropertyHelper to set a property can be quiet (no override - // warning preset). - // - PropertyHelper.getPropertyHelper(project).setProperty(null, name, value, false); - - // - // If no property override history record is found, do nothing further - // - if (oldPropertyTable == null || bakPropertyTable == null) { - return; - } - - // - // Put a copy of given property in history record. - // - String oldValue = oldPropertyTable.get(name); - if (oldValue == null) { - oldValue = value; - } - bakPropertyTable.put(name, oldValue); - } -} - diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/pcd/action/PlatformPcdPreprocessActionForBuilding.java b/Tools/Java/Source/GenBuild/org/tianocore/build/pcd/action/PlatformPcdPreprocessActionForBuilding.java index 6d71dd3b37..5ce11c546a 100644 --- a/Tools/Java/Source/GenBuild/org/tianocore/build/pcd/action/PlatformPcdPreprocessActionForBuilding.java +++ b/Tools/Java/Source/GenBuild/org/tianocore/build/pcd/action/PlatformPcdPreprocessActionForBuilding.java @@ -51,11 +51,6 @@ public class PlatformPcdPreprocessActionForBuilding extends PlatformPcdPreproces /// private String fpdFilePath; - /// - /// Message level for CollectPCDAction. - /// - private int originalMessageLevel; - /// /// Cache the fpd docment instance for private usage. /// -- 2.39.2