git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1323
6f19259b-4bc3-4df7-8a09-
765794883524
return msaMap;\r
}\r
catch (Exception ex){\r
return msaMap;\r
}\r
catch (Exception ex){\r
- throw new BuildException(ex.getMessage());\r
+ throw new BuildException("Parsing MSA file [" + msaFile.getPath() + "] error. \n" + ex.getMessage() );\r
return packageId;\r
}\r
}\r
return packageId;\r
}\r
}\r
- throw new BuildException("Can't find package GUID value " + packageId.getGuid() + " in the current workspace!");\r
+ throw new BuildException("Can't find package GUID value " + packageId.toGuidString() + " in the current workspace!");\r
}\r
\r
public synchronized static ModuleIdentification refreshModuleIdentification(ModuleIdentification moduleId) throws BuildException {\r
}\r
\r
public synchronized static ModuleIdentification refreshModuleIdentification(ModuleIdentification moduleId) throws BuildException {\r
moduleId.setPackage(packageId);\r
Spd spd = spdTable.get(packageId);\r
if (spd == null) {\r
moduleId.setPackage(packageId);\r
Spd spd = spdTable.get(packageId);\r
if (spd == null) {\r
- throw new BuildException("Can't find package GUID value " + packageId.getGuid() + " in the current workspace!");\r
+ throw new BuildException("Can't find package GUID value " + packageId.toGuidString() + " in the current workspace!");\r
}\r
Set<ModuleIdentification> modules = spd.getModules();\r
Iterator<ModuleIdentification> iter = modules.iterator();\r
}\r
Set<ModuleIdentification> modules = spd.getModules();\r
Iterator<ModuleIdentification> iter = modules.iterator();\r
return moduleId;\r
}\r
}\r
return moduleId;\r
}\r
}\r
- throw new BuildException("Can't find module GUID value " + moduleId.getGuid() + " in package, " + packageId + ", in the current workspace!");\r
+ throw new BuildException("Can't find module GUID value " + moduleId.toGuidString() + " in " + packageId + " under the current workspace!");\r
}\r
\r
public synchronized static Set<PackageIdentification> getPackageList(){\r
}\r
\r
public synchronized static Set<PackageIdentification> getPackageList(){\r
}\r
}\r
catch (Exception e) {\r
}\r
}\r
catch (Exception e) {\r
- e.setStackTrace(e.getStackTrace());\r
- throw new BuildException("Parse of the package description file [" + packageId.getSpdFile() + "] failed!\n"\r
+ throw new BuildException("Parse of the package description file [" + packageFile.getPath() + "] failed!\n"\r
+ e.getMessage());\r
}\r
}\r
+ e.getMessage());\r
}\r
}\r
+ public String toGuidString() {\r
+ if (version == null || version.trim().equalsIgnoreCase("")) {\r
+ return "[" + guid + "]";\r
+ }\r
+ else {\r
+ return "[" + guid + "] and version [" + version + "]"; \r
+ }\r
+ }\r
+ \r
/* (non-Javadoc)\r
@see java.lang.Object#hashCode()\r
**/\r
/* (non-Javadoc)\r
@see java.lang.Object#hashCode()\r
**/\r