sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Report error messages more precise.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1323 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
wuyizhong
2006-08-18 09:39:01 +00:00
parent 6e028650e7
commit e485bb4bff
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
View File

@@ -412,7 +412,7 @@ public class GlobalData {
return msaMap; return msaMap;
} }
catch (Exception ex){ catch (Exception ex){
throw new BuildException(ex.getMessage()); throw new BuildException("Parsing MSA file [" + msaFile.getPath() + "] error. \n" + ex.getMessage() );
} }
} }
@@ -598,7 +598,7 @@ public class GlobalData {
return packageId; return packageId;
} }
} }
throw new BuildException("Can't find package GUID value " + packageId.getGuid() + " in the current workspace!"); throw new BuildException("Can't find package GUID value " + packageId.toGuidString() + " in the current workspace!");
} }
public synchronized static ModuleIdentification refreshModuleIdentification(ModuleIdentification moduleId) throws BuildException { public synchronized static ModuleIdentification refreshModuleIdentification(ModuleIdentification moduleId) throws BuildException {
@@ -606,7 +606,7 @@ public class GlobalData {
moduleId.setPackage(packageId); moduleId.setPackage(packageId);
Spd spd = spdTable.get(packageId); Spd spd = spdTable.get(packageId);
if (spd == null) { if (spd == null) {
throw new BuildException("Can't find package GUID value " + packageId.getGuid() + " in the current workspace!"); throw new BuildException("Can't find package GUID value " + packageId.toGuidString() + " in the current workspace!");
} }
Set<ModuleIdentification> modules = spd.getModules(); Set<ModuleIdentification> modules = spd.getModules();
Iterator<ModuleIdentification> iter = modules.iterator(); Iterator<ModuleIdentification> iter = modules.iterator();
@@ -619,7 +619,7 @@ public class GlobalData {
return moduleId; return moduleId;
} }
} }
throw new BuildException("Can't find module GUID value " + moduleId.getGuid() + " in package, " + packageId + ", in the current workspace!"); throw new BuildException("Can't find module GUID value " + moduleId.toGuidString() + " in " + packageId + " under the current workspace!");
} }
public synchronized static Set<PackageIdentification> getPackageList(){ public synchronized static Set<PackageIdentification> getPackageList(){

3
Tools/Source/GenBuild/org/tianocore/build/global/Spd.java
View File

@@ -198,8 +198,7 @@ public class Spd {
} }
} }
catch (Exception e) { catch (Exception e) {
e.setStackTrace(e.getStackTrace()); throw new BuildException("Parse of the package description file [" + packageFile.getPath() + "] failed!\n"
throw new BuildException("Parse of the package description file [" + packageId.getSpdFile() + "] failed!\n"
+ e.getMessage()); + e.getMessage());
} }
} }

9
Tools/Source/GenBuild/org/tianocore/build/id/Identification.java
View File

@@ -110,6 +110,15 @@ public class Identification {
return version; return version;
} }
public String toGuidString() {
if (version == null || version.trim().equalsIgnoreCase("")) {
return "[" + guid + "]";
}
else {
return "[" + guid + "] and version [" + version + "]";
}
}
/* (non-Javadoc) /* (non-Javadoc)
@see java.lang.Object#hashCode() @see java.lang.Object#hashCode()
**/ **/