///\r
private MemoryDatabaseManager pcdDbManager;\r
\r
+ ///\r
+ /// Errors string when perform preprocess \r
+ /// \r
+ private String errorString;\r
+\r
+ ///\r
+ /// the count of errors when perform preprocess\r
+ /// \r
+ private int errorCount;\r
+\r
+ /**\r
+ Default contructor function \r
+ **/\r
+ public PlatformPcdPreprocessAction() {\r
+ pcdDbManager = null;\r
+ errorString = null;\r
+ }\r
+\r
/**\r
Set parameter pcdDbManager\r
\r
\r
@param guidCName the CName of GUID\r
\r
- @return String[] Guid information from SPD file.\r
+ @return String Guid information from SPD file.\r
@throws PlatformPcdPreprocessException\r
Fail to get Guid information from SPD file.\r
**/\r
- public abstract String[] getGuidInfoFromSpd(String guidCName)\r
+ public abstract String getGuidInfoFromSpd(String guidCName)\r
throws PlatformPcdPreprocessException;\r
\r
/**\r
getAllDynamicPcdInfoFromFpd()\r
throws PlatformPcdPreprocessException;\r
\r
+ /**\r
+ Return the error string after preprocess \r
+\r
+ @return String error string\r
+ **/\r
+ public String getErrorString() {\r
+ return errorString;\r
+ }\r
+\r
+ public void putError(String error) {\r
+ if (errorString == null) {\r
+ errorString = "### ERROR[" + errorCount + "] ###\r\n" + error + "\r\n";\r
+ } else {\r
+ errorString += "### ERROR[" + errorCount + "] ###\r\n" + error + "\r\n";\r
+ }\r
+\r
+ errorCount++;\r
+ }\r
+\r
/**\r
Collect all PCD information from FPD file into PCD memory database.\r
\r
String moduleName = null;\r
String datum = null;\r
int maxDatumSize = 0;\r
- String[] tokenSpaceStrRet = null;\r
+ String tokenSpaceStrRet = null;\r
\r
//\r
// ----------------------------------------------\r
\r
if (modules == null) {\r
throw new PlatformPcdPreprocessException(\r
- "No modules in FPD file, Please check whether there are elements in <FrameworkModules> in FPD file!");\r
+ "No modules found in the FPD file.\nPlease check whether there are elements in <FrameworkModules> in the FPD file!");\r
}\r
\r
//\r
tokenSpaceStrRet = getGuidInfoFromSpd(pcdBuildData.getTokenSpaceGuidCName());\r
\r
if (tokenSpaceStrRet == null) {\r
- throw new PlatformPcdPreprocessException(\r
- "Fail to get Token space guid for token" + pcdBuildData.getCName() +\r
- " from all SPD files. You must have an <GuidDeclaration> for this token space Guid");\r
+ putError("Failed to get Token Space Guid for token " + pcdBuildData.getCName() +\r
+ " from any SPD file. You must have an <GuidDeclaration> for this Token Space Guid!");\r
+ //\r
+ // Do not break preprocess, continues to analysis.\r
+ // All errors will be summary to be shown.\r
+ // \r
+ continue;\r
}\r
\r
- primaryKey = Token.getPrimaryKeyString(pcdBuildData.getCName(), tokenSpaceStrRet[1]);\r
+ primaryKey = Token.getPrimaryKeyString(pcdBuildData.getCName(), tokenSpaceStrRet);\r
pcdType = Token.getPcdTypeFromString(pcdBuildData.getItemType().toString());\r
datumType = Token.getdatumTypeFromString(pcdBuildData.getDatumType().toString());\r
tokenNumber = Long.decode(pcdBuildData.getToken().toString());\r
\r
if ((pcdType == Token.PCD_TYPE.FEATURE_FLAG) &&\r
(datumType != Token.DATUM_TYPE.BOOLEAN)){\r
- exceptionString = String.format("In FPD file, for PCD %s in module %s, the PCD type is FEATRUE_FLAG but "+\r
- "datum type of this PCD entry is not BOOLEAN!",\r
+ exceptionString = String.format("In FPD file, for PCD %s in module %s, the PCD type is FEATURE_FLAG but "+\r
+ "datum type for this PCD entry is not BOOLEAN!",\r
pcdBuildData.getCName(),\r
moduleName);\r
- throw new PlatformPcdPreprocessException(exceptionString);\r
+ putError(exceptionString);\r
+ //\r
+ // Do not break preprocess, continues to analysis.\r
+ // All errors will be summary to be shown.\r
+ // \r
+ continue;\r
}\r
\r
//\r
// Value is required.\r
//\r
if (datum == null) {\r
- exceptionString = String.format("In FPD file, there is no value for PCD entry %s in module %s!",\r
+ exceptionString = String.format("In the FPD file, there is no value for PCD entry %s in module %s!",\r
pcdBuildData.getCName(),\r
moduleName);\r
- throw new PlatformPcdPreprocessException(exceptionString);\r
+ putError(exceptionString);\r
+ //\r
+ // Do not break preprocess, continues to analysis.\r
+ // All errors will be summary to be shown.\r
+ // \r
+ continue;\r
}\r
\r
//\r
datum,\r
datumType,\r
maxDatumSize)) != null) {\r
- throw new PlatformPcdPreprocessException(exceptionString);\r
+ putError(exceptionString);\r
+ //\r
+ // Do not break preprocess, continues to analysis.\r
+ // All errors will be summary to be shown.\r
+ // \r
+ continue;\r
}\r
}\r
\r
// modules.\r
//\r
if (token.datumType != datumType) {\r
- exceptionString = String.format("In FPD file, the datum type of PCD entry %s is %s, which is different with %s defined in before!",\r
+ exceptionString = String.format("In the FPD file, the datum type of the PCD entry %s is %s, which is different from %s which was previously defined!",\r
pcdBuildData.getCName(),\r
pcdBuildData.getDatumType().toString(),\r
Token.getStringOfdatumType(token.datumType));\r
- throw new PlatformPcdPreprocessException(exceptionString);\r
+ putError(exceptionString);\r
+ //\r
+ // Do not break preprocess, continues to analysis.\r
+ // All errors will be summary to be shown.\r
+ // \r
+ continue;\r
}\r
\r
//\r
// Check token number is valid\r
//\r
if (tokenNumber != token.tokenNumber) {\r
- exceptionString = String.format("In FPD file, the token number of PCD entry %s in module %s is different with same PCD entry in other modules!",\r
+ exceptionString = String.format("In the FPD file, the token number of PCD entry %s in module %s is different from the same PCD entry in other modules!",\r
pcdBuildData.getCName(),\r
moduleName);\r
- throw new PlatformPcdPreprocessException(exceptionString);\r
+ putError(exceptionString);\r
+ //\r
+ // Do not break preprocess, continues to analysis.\r
+ // All errors will be summary to be shown.\r
+ // \r
+ continue;\r
}\r
\r
//\r
// For same PCD used in different modules, the PCD type should all be dynamic or non-dynamic.\r
//\r
if (token.isDynamicPCD != Token.isDynamic(pcdType)) {\r
- exceptionString = String.format("In FPD file, for PCD entry %s in module %s, you define dynamic or non-dynamic PCD type which"+\r
- " is different with others module's",\r
+ exceptionString = String.format("In the FPD file, for PCD entry %s in module %s, you defined dynamic or non-dynamic PCD type which"+\r
+ " is different from other module's definition.",\r
token.cName,\r
moduleName);\r
- throw new PlatformPcdPreprocessException(exceptionString);\r
+ putError(exceptionString);\r
+ //\r
+ // Do not break preprocess, continues to analysis.\r
+ // All errors will be summary to be shown.\r
+ // \r
+ continue;\r
}\r
\r
if (token.isDynamicPCD) {\r
- //\r
- // Check datum is equal the datum in dynamic information.\r
- // For dynamic PCD, you can do not write <Value> in sperated every <PcdBuildDefinition> in different <ModuleSA>,\r
- // But if you write, the <Value> must be same as the value in <DynamicPcdBuildDefinitions>.\r
- //\r
- if (!token.isSkuEnable() &&\r
- (token.getDefaultSku().type == DynamicTokenValue.VALUE_TYPE.DEFAULT_TYPE) &&\r
- (datum != null)) {\r
- if (!datum.equalsIgnoreCase(token.getDefaultSku().value)) {\r
- exceptionString = String.format("In FPD file, for dynamic PCD %s in module %s, the datum in <ModuleSA> is "+\r
- "not equal to the datum in <DynamicPcdBuildDefinitions>, it is "+\r
- "illega! You could no set <Value> in <ModuleSA> for a dynamic PCD!",\r
- token.cName,\r
- moduleName);\r
- throw new PlatformPcdPreprocessException(exceptionString);\r
- }\r
- }\r
-\r
if ((maxDatumSize != 0) &&\r
(maxDatumSize != token.datumSize)){\r
- exceptionString = String.format("In FPD file, for dynamic PCD %s in module %s, the max datum size is %d which "+\r
- "is different with <MaxDatumSize> %d defined in <DynamicPcdBuildDefinitions>!",\r
+ exceptionString = String.format("In the FPD file, for dynamic PCD %s in module %s, the max datum size is %d which "+\r
+ "is different than <MaxDatumSize> %d defined in <DynamicPcdBuildDefinitions>!",\r
token.cName,\r
moduleName,\r
maxDatumSize,\r
token.datumSize);\r
- throw new PlatformPcdPreprocessException(exceptionString);\r
+ putError(exceptionString);\r
+ //\r
+ // Do not break preprocess, continues to analysis.\r
+ // All errors will be summary to be shown.\r
+ // \r
+ continue;\r
}\r
}\r
\r
// If the token is not in database, create a new token instance and add\r
// a usage instance into this token in database.\r
//\r
- tokenSpaceStrRet = this.getGuidInfoFromSpd(pcdBuildData.getTokenSpaceGuidCName());\r
+ tokenSpaceStrRet = getGuidInfoFromSpd(pcdBuildData.getTokenSpaceGuidCName());\r
\r
if (tokenSpaceStrRet == null) {\r
- throw new PlatformPcdPreprocessException(\r
- "Fail to get Token space guid for token" + token.cName +\r
- " from all SPD files. You must have an <GuidDeclaration> for this token space Guid");\r
-\r
+ putError("Failed to get the Token Space Guid for token" + token.cName +\r
+ " from any SPD file. You must have a <GuidDeclaration> for this Token Space Guid!");\r
+ //\r
+ // Do not break preprocess, continues to analysis.\r
+ // All errors will be summary to be shown.\r
+ // \r
+ continue;\r
}\r
\r
- token = new Token(pcdBuildData.getCName(), tokenSpaceStrRet[1]);\r
+ token = new Token(pcdBuildData.getCName(), tokenSpaceStrRet);\r
\r
token.datumType = datumType;\r
token.tokenNumber = tokenNumber;\r
// For Dynamic and Dynamic Ex type, need find the dynamic information\r
// in <DynamicPcdBuildDefinition> section in FPD file.\r
//\r
- updateDynamicInformation(moduleName,\r
- token,\r
- datum,\r
- maxDatumSize);\r
+ if (null == updateDynamicInformation(moduleName,\r
+ token,\r
+ datum,\r
+ maxDatumSize)) {\r
+ continue;\r
+ }\r
}\r
\r
pcdDbManager.addTokenToDatabase(primaryKey, token);\r
datum,\r
maxDatumSize);\r
if (!token.addUsageInstance(usageInstance)) {\r
- throw new PlatformPcdPreprocessException(\r
- String.format("PCD %s for module %s has already exist in database, Please check all PCD build entries "+\r
- "in modules %s in <ModuleSA> to make sure no duplicated definitions in FPD file!",\r
- token.cName,\r
- moduleName,\r
- moduleName));\r
+ putError(String.format("PCD %s for module %s(%s) already exists in the database.\nPlease check all PCD build entries "+\r
+ "in the %s module's <ModuleSA> section to make sure there are no duplicated definitions in the FPD file!",\r
+ token.cName,\r
+ modules.get(index).usageId.moduleGuid,\r
+ moduleName,\r
+ moduleName));\r
+ continue;\r
}\r
}\r
}\r
boolean hasSkuId0 = false;\r
long tokenNumber = 0;\r
String hiiDefaultValue = null;\r
- String[] variableGuidString = null;\r
+ String variableGuidString = null;\r
\r
List<DynamicPcdBuildDefinitions.PcdBuildData.SkuInfo> skuInfoList = null;\r
DynamicPcdBuildDefinitions.PcdBuildData dynamicInfo = null;\r
\r
dynamicInfo = getDynamicInfoFromFpd(token, moduleName);\r
if (dynamicInfo == null) {\r
- exceptionString = String.format("In FPD file, for Dynamic PCD %s used by module %s, "+\r
- "there is no dynamic information in <DynamicPcdBuildDefinitions> "+\r
- "in FPD file, but it is required!",\r
+ exceptionString = String.format("In the FPD file, the Dynamic PCD %s is used by module %s.\n" +\r
+ "However, there is no dynamic information in the <DynamicPcdBuildDefinitions> " +\r
+ "section of the FPD file. This section is required!",\r
token.cName,\r
moduleName);\r
- throw new PlatformPcdPreprocessException(exceptionString);\r
+ putError(exceptionString);\r
+ return null;\r
}\r
\r
token.datumSize = dynamicInfo.getMaxDatumSize();\r
\r
if ((maxDatumSize != 0) &&\r
(maxDatumSize != token.datumSize)) {\r
- exceptionString = String.format("In FPD file, for dynamic PCD %s, the datum size in module %s is %d, but "+\r
- "the datum size in <DynamicPcdBuildDefinitions> is %d, they are not match!",\r
+ exceptionString = String.format("In the FPD file, for dynamic PCD %s, the datum size in module %s is %d, but "+\r
+ "the datum size in <DynamicPcdBuildDefinitions> is %d, they do not match!",\r
token.cName,\r
moduleName,\r
maxDatumSize,\r
dynamicInfo.getMaxDatumSize());\r
- throw new PlatformPcdPreprocessException(exceptionString);\r
+ putError(exceptionString);\r
+ return null;\r
}\r
tokenNumber = Long.decode(dynamicInfo.getToken().toString());\r
if (tokenNumber != token.tokenNumber) {\r
- exceptionString = String.format("In FPD file, for dynamic PCD %s, the token number in module %s is 0x%x, but"+\r
- "in <DynamicPcdBuildDefinictions>, the token number is 0x%x, they are not match!",\r
+ exceptionString = String.format("In the FPD file, for dynamic PCD %s, the token number in module %s is 0x%x, but "+\r
+ "in the <DynamicPcdBuildDefinictions> section, the token number is 0x%x, they do not match!",\r
token.cName,\r
moduleName,\r
token.tokenNumber,\r
tokenNumber);\r
- throw new PlatformPcdPreprocessException(exceptionString);\r
+ putError(exceptionString);\r
+ return null;\r
}\r
\r
token.dynamicExTokenNumber = tokenNumber;\r
skuInfoList.get(index).getValue().toString(),\r
token.datumType,\r
token.datumSize)) != null) {\r
- throw new PlatformPcdPreprocessException(exceptionString);\r
+ putError(exceptionString);\r
+ return null;\r
}\r
\r
token.skuData.add(skuInstance);\r
\r
- //\r
- // Judege wether is same of datum between module's information\r
- // and dynamic information.\r
- //\r
- if (datum != null) {\r
- if ((skuInstance.id == 0) &&\r
- !datum.toString().equalsIgnoreCase(skuInfoList.get(index).getValue().toString())) {\r
- exceptionString = "In FPD file, for dynamic PCD " + token.cName + ", the value in module " + moduleName + " is " + datum.toString() + " but the "+\r
- "value of sku 0 data in <DynamicPcdBuildDefinition> is " + skuInstance.value.value + ". They are must be same!"+\r
- " or you could not define value for a dynamic PCD in every <ModuleSA>!";\r
- throw new PlatformPcdPreprocessException(exceptionString);\r
- }\r
- }\r
continue;\r
}\r
\r
if (skuInfoList.get(index).getVariableName() != null) {\r
exceptionString = null;\r
if (skuInfoList.get(index).getVariableGuid() == null) {\r
- exceptionString = String.format("In FPD file, for dynamic PCD %s in <DynamicPcdBuildDefinitions> section in FPD "+\r
- "file, who use HII, but there is no <VariableGuid> defined for Sku %d data!",\r
+ exceptionString = String.format("In the FPD file, for dynamic PCD %s in <DynamicPcdBuildDefinitions> section in FPD "+\r
+ "file, use of HII was defined, but there is no <VariableGuid> defined for SKU %d data!",\r
token.cName,\r
index);\r
- if (exceptionString != null) {\r
- throw new PlatformPcdPreprocessException(exceptionString);\r
- }\r
+ putError(exceptionString);\r
+ return null;\r
}\r
\r
if (skuInfoList.get(index).getVariableOffset() == null) {\r
- exceptionString = String.format("In FPD file, for dynamic PCD %s in <DynamicPcdBuildDefinitions> section in FPD "+\r
- "file, who use HII, but there is no <VariableOffset> defined for Sku %d data!",\r
+ exceptionString = String.format("In the FPD file, for dynamic PCD %s in <DynamicPcdBuildDefinitions> section in FPD "+\r
+ "file, use of HII was defined, but there is no <VariableOffset> defined for SKU %d data!",\r
token.cName,\r
index);\r
- if (exceptionString != null) {\r
- throw new PlatformPcdPreprocessException(exceptionString);\r
- }\r
+ putError(exceptionString);\r
+ return null;\r
}\r
\r
if (skuInfoList.get(index).getHiiDefaultValue() == null) {\r
- exceptionString = String.format("In FPD file, for dynamic PCD %s in <DynamicPcdBuildDefinitions> section in FPD "+\r
- "file, who use HII, but there is no <HiiDefaultValue> defined for Sku %d data!",\r
+ exceptionString = String.format("In the FPD file, for dynamic PCD %s in <DynamicPcdBuildDefinitions> section in FPD "+\r
+ "file, use of HII was defined, but there is no <HiiDefaultValue> defined for SKU %d data!",\r
token.cName,\r
index);\r
- if (exceptionString != null) {\r
- throw new PlatformPcdPreprocessException(exceptionString);\r
- }\r
+ putError(exceptionString);\r
+ return null;\r
}\r
\r
if (skuInfoList.get(index).getHiiDefaultValue() != null) {\r
\r
offset = Integer.decode(skuInfoList.get(index).getVariableOffset());\r
if (offset > 0xFFFF) {\r
- throw new PlatformPcdPreprocessException(\r
- String.format("In FPD file, for dynamic PCD %s , the variable offset defined in sku %d data "+\r
- "exceed 64K, it is not allowed!",\r
- token.cName,\r
- index));\r
+ putError(String.format("In the FPD file, for dynamic PCD %s, the variable offset defined in SKU %d data "+\r
+ "exceeds 64K, which is not allowed!",\r
+ token.cName,\r
+ index));\r
+ return null;\r
}\r
\r
//\r
//\r
variableGuidString = getGuidInfoFromSpd(skuInfoList.get(index).getVariableGuid().toString());\r
if (variableGuidString == null) {\r
- throw new PlatformPcdPreprocessException(\r
- String.format("In FPD file, for dynamic PCD %s, the variable guid %s can be found in all SPD file!",\r
- token.cName,\r
- skuInfoList.get(index).getVariableGuid().toString()));\r
+ putError(String.format("In the FPD file, for dynamic PCD %s, the variable guid: %s cannot be found in any SPD file!",\r
+ token.cName,\r
+ skuInfoList.get(index).getVariableGuid().toString()));\r
+ return null;\r
}\r
String variableStr = skuInfoList.get(index).getVariableName();\r
Pattern pattern = Pattern.compile("0x([a-fA-F0-9]){4}");\r
}\r
\r
skuInstance.value.setHiiData(varNameList,\r
- translateSchemaStringToUUID(variableGuidString[1]),\r
+ translateSchemaStringToUUID(variableGuidString),\r
skuInfoList.get(index).getVariableOffset(),\r
skuInfoList.get(index).getHiiDefaultValue().toString());\r
token.skuData.add(skuInstance);\r
continue;\r
}\r
\r
- exceptionString = String.format("In FPD file, for dynamic PCD %s, the dynamic info must "+\r
- "be one of 'DefaultGroup', 'HIIGroup', 'VpdGroup'.",\r
+ exceptionString = String.format("In the FPD file, for dynamic PCD %s, the dynamic info must "+\r
+ "be one of: 'DefaultGroup', 'HIIGroup', 'VpdGroup'.",\r
token.cName);\r
- throw new PlatformPcdPreprocessException(exceptionString);\r
+ putError(exceptionString);\r
+ return null;\r
}\r
\r
if (!hasSkuId0) {\r
- exceptionString = String.format("In FPD file, for dynamic PCD %s in <DynamicPcdBuildDefinitions>, there are "+\r
- "no sku id = 0 data, which is required for every dynamic PCD",\r
+ exceptionString = String.format("In the FPD file, for dynamic PCD %s in <DynamicPcdBuildDefinitions>, there is "+\r
+ "no SKU ID = 0 data, which is required for every dynamic PCD",\r
token.cName);\r
- throw new PlatformPcdPreprocessException(exceptionString);\r
+ putError(exceptionString);\r
+ return null;\r
}\r
\r
return token;\r
String temp;\r
String exceptionString;\r
String hiiDefaultValue;\r
- String tokenSpaceStrRet[];\r
- String variableGuidString[];\r
+ String tokenSpaceStrRet;\r
+ String variableGuidString;\r
\r
dynamicPcdBuildDataArray = getAllDynamicPcdInfoFromFpd();\r
if (dynamicPcdBuildDataArray == null) {\r
\r
for (index2 = 0; index2 < dynamicPcdBuildDataArray.size(); index2++) {\r
pcdBuildData = dynamicPcdBuildDataArray.get(index2);\r
- tokenSpaceStrRet = this.getGuidInfoFromSpd(pcdBuildData.getTokenSpaceGuidCName());\r
+ tokenSpaceStrRet = getGuidInfoFromSpd(pcdBuildData.getTokenSpaceGuidCName());\r
\r
if (tokenSpaceStrRet == null) {\r
- throw new PlatformPcdPreprocessException("Fail to get Token space guid for token" + pcdBuildData.getCName());\r
+ putError("Failed to get the Token Space Guid for token" + pcdBuildData.getCName());\r
+ continue;\r
}\r
\r
primaryKey = Token.getPrimaryKeyString(pcdBuildData.getCName(),\r
- tokenSpaceStrRet[1]);\r
+ tokenSpaceStrRet);\r
\r
if (pcdDbManager.isTokenInDatabase(primaryKey)) {\r
continue;\r
\r
pcdType = Token.getPcdTypeFromString(pcdBuildData.getItemType().toString());\r
if (pcdType != Token.PCD_TYPE.DYNAMIC_EX) {\r
- throw new PlatformPcdPreprocessException(\r
- String.format("In FPD file, it not allowed for DYNAMIC PCD %s who is no used by any module",\r
- pcdBuildData.getCName()));\r
+ putError(String.format("In the FPD file, it not allowed to define DYNAMIC PCD %s that is not used by any module",\r
+ pcdBuildData.getCName()));\r
+ continue;\r
}\r
\r
//\r
// Create new token for unreference dynamic PCD token\r
//\r
- token = new Token(pcdBuildData.getCName(), tokenSpaceStrRet[1]);\r
+ token = new Token(pcdBuildData.getCName(), tokenSpaceStrRet);\r
token.datumSize = pcdBuildData.getMaxDatumSize();\r
\r
\r
token.datumType,\r
token.datumSize);\r
if (exceptionString != null) {\r
- throw new PlatformPcdPreprocessException(exceptionString);\r
+ putError(exceptionString);\r
+ continue;\r
}\r
\r
skuInfoList = pcdBuildData.getSkuInfoList();\r
skuInfoList.get(index).getValue().toString(),\r
token.datumType,\r
token.datumSize)) != null) {\r
- throw new PlatformPcdPreprocessException(exceptionString);\r
+ putError(exceptionString);\r
+ continue;\r
}\r
\r
token.skuData.add(skuInstance);\r
if (skuInfoList.get(index).getVariableName() != null) {\r
exceptionString = null;\r
if (skuInfoList.get(index).getVariableGuid() == null) {\r
- exceptionString = String.format("In FPD file, for dynamic PCD %s in <DynamicPcdBuildDefinitions> section in FPD "+\r
- "file, who use HII, but there is no <VariableGuid> defined for Sku %d data!",\r
+ exceptionString = String.format("In the FPD file, for dynamic PCD %s in the <DynamicPcdBuildDefinitions> section of the FPD "+\r
+ "file, use of HII is defined, but there is no <VariableGuid> defined for SKU %d data!",\r
token.cName,\r
index);\r
- if (exceptionString != null) {\r
- throw new PlatformPcdPreprocessException(exceptionString);\r
- }\r
+ putError(exceptionString);\r
+ continue;\r
}\r
\r
if (skuInfoList.get(index).getVariableOffset() == null) {\r
- exceptionString = String.format("In FPD file, for dynamic PCD %s in <DynamicPcdBuildDefinitions> section in FPD "+\r
- "file, who use HII, but there is no <VariableOffset> defined for Sku %d data!",\r
+ exceptionString = String.format("In the FPD file, for dynamic PCD %s in the <DynamicPcdBuildDefinitions> section of the FPD "+\r
+ "file, use of HII is defined, but there is no <VariableOffset> defined for SKU %d data!",\r
token.cName,\r
index);\r
- if (exceptionString != null) {\r
- throw new PlatformPcdPreprocessException(exceptionString);\r
- }\r
+ putError(exceptionString);\r
+ continue;\r
}\r
\r
if (skuInfoList.get(index).getHiiDefaultValue() == null) {\r
- exceptionString = String.format("In FPD file, for dynamic PCD %s in <DynamicPcdBuildDefinitions> section in FPD "+\r
- "file, who use HII, but there is no <HiiDefaultValue> defined for Sku %d data!",\r
+ exceptionString = String.format("In the FPD file, for dynamic PCD %s in the <DynamicPcdBuildDefinitions> section of the FPD "+\r
+ "file, use of HII is defined, but there is no <HiiDefaultValue> defined for SKU %d data!",\r
token.cName,\r
index);\r
- if (exceptionString != null) {\r
- throw new PlatformPcdPreprocessException(exceptionString);\r
- }\r
+ putError(exceptionString);\r
+ continue;\r
}\r
\r
if (skuInfoList.get(index).getHiiDefaultValue() != null) {\r
hiiDefaultValue,\r
token.datumType,\r
token.datumSize)) != null) {\r
- throw new PlatformPcdPreprocessException(exceptionString);\r
+ putError(exceptionString);\r
+ continue;\r
}\r
\r
offset = Integer.decode(skuInfoList.get(index).getVariableOffset());\r
if (offset > 0xFFFF) {\r
- throw new PlatformPcdPreprocessException(\r
- String.format("In FPD file, for dynamic PCD %s , the variable offset defined in sku %d data "+\r
- "exceed 64K, it is not allowed!",\r
+ exceptionString = String.format("In the FPD file, for dynamic PCD %s, the variable offset defined in SKU %d data "+\r
+ "exceeds 64K, which is not allowed!",\r
token.cName,\r
- index));\r
+ index);\r
+ putError(exceptionString);\r
+ continue;\r
}\r
\r
//\r
// Get variable guid string according to the name of guid which will be mapped into a GUID in SPD file.\r
//\r
- variableGuidString = this.getGuidInfoFromSpd(skuInfoList.get(index).getVariableGuid().toString());\r
+ variableGuidString = getGuidInfoFromSpd(skuInfoList.get(index).getVariableGuid().toString());\r
if (variableGuidString == null) {\r
- throw new PlatformPcdPreprocessException(\r
- String.format("In FPD file, for dynamic PCD %s, the variable guid %s can be found in all SPD file!",\r
- token.cName,\r
- skuInfoList.get(index).getVariableGuid().toString()));\r
+ exceptionString = String.format("In the FPD file, for dynamic PCD %s, the variable guid %s cannot be found in any SPD file!",\r
+ token.cName,\r
+ skuInfoList.get(index).getVariableGuid().toString());\r
+ putError(exceptionString);\r
+ continue;\r
}\r
String variableStr = skuInfoList.get(index).getVariableName();\r
Pattern pattern = Pattern.compile("0x([a-fA-F0-9]){4}");\r
}\r
\r
skuInstance.value.setHiiData(varNameList,\r
- translateSchemaStringToUUID(variableGuidString[1]),\r
+ translateSchemaStringToUUID(variableGuidString),\r
skuInfoList.get(index).getVariableOffset(),\r
skuInfoList.get(index).getHiiDefaultValue().toString());\r
token.skuData.add(skuInstance);\r
continue;\r
}\r
\r
- exceptionString = String.format("In FPD file, for dynamic PCD %s, the dynamic info must "+\r
+ exceptionString = String.format("In the FPD file, for dynamic PCD %s, the dynamic info must "+\r
"be one of 'DefaultGroup', 'HIIGroup', 'VpdGroup'.",\r
token.cName);\r
- throw new PlatformPcdPreprocessException(exceptionString);\r
+ putError(exceptionString);\r
}\r
\r
if (!hasSkuId0) {\r
- exceptionString = String.format("In FPD file, for dynamic PCD %s in <DynamicPcdBuildDefinitions>, there are "+\r
- "no sku id = 0 data, which is required for every dynamic PCD",\r
+ exceptionString = String.format("In the FPD file, for dynamic PCD %s in <DynamicPcdBuildDefinitions>, there is "+\r
+ "no SKU ID = 0 data, which is required for every dynamic PCD",\r
token.cName);\r
- throw new PlatformPcdPreprocessException(exceptionString);\r
+ putError(exceptionString);\r
+ continue;\r
}\r
\r
tokenArray.add(token);\r
if ((uuidString.charAt(0) == '0') && ((uuidString.charAt(1) == 'x') || (uuidString.charAt(1) == 'X'))) {\r
splitStringArray = uuidString.split("," );\r
if (splitStringArray.length != 11) {\r
- throw new PlatformPcdPreprocessException ("Wrong format for UUID string: " + uuidString);\r
+ throw new PlatformPcdPreprocessException ("Wrong format for GUID string: " + uuidString);\r
}\r
\r
//\r
projects / mirror_edk2.git / blobdiff