tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-27 07:34:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove build warning.

Browse Source 
Fixed bug:
EdkT81,
EdkT83,
EdkT77,
EdkT84.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@810 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qouyang 2006-07-07 01:53:47 +00:00
parent 0e0e9d3d98
commit a84091c4be
9 changed files with 54 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
View File

@ -264,29 +264,6 @@ public class AutoGen {
// moduleType. // moduleType.
// //
moduleType = SurfaceAreaQuery.getModuleType(); moduleType = SurfaceAreaQuery.getModuleType();
// switch (CommonDefinition.getModuleType(moduleType)) {
// case CommonDefinition.ModuleTypeDxeCore:
// case CommonDefinition.ModuleTypeDxeDriver:
// case CommonDefinition.ModuleTypeDxeRuntimeDriver:
// case CommonDefinition.ModuleTypeDxeSmmDriver:
// case CommonDefinition.ModuleTypeDxeSalDriver:
// case CommonDefinition.ModuleTypeUefiDriver:
// case CommonDefinition.ModuleTypeUefiApplication:
// fileBuffer.append(CommonDefinition.autoGenHLine1);
// break;
// default:
// fileBuffer.append(CommonDefinition.autoGenHVersionDefault);
// break;
// }
// switch (CommonDefinition.getModuleType(moduleType)) {
// case CommonDefinition.ModuleTypeUefiDriver:
// case CommonDefinition.ModuleTypeUefiApplication:
// fileBuffer.append(CommonDefinition.autoGenHReleaseDefault);
// break;
// default:
// fileBuffer.append(CommonDefinition.autoGenHLine2);
// break;
// }
// //
// Add "extern int __make_me_compile_correctly;" at begin of // Add "extern int __make_me_compile_correctly;" at begin of
@ -308,7 +285,7 @@ public class AutoGen {
// PackageIdentification[] consumedPkgIdList = SurfaceAreaQuery // PackageIdentification[] consumedPkgIdList = SurfaceAreaQuery
// .getDependencePkg(this.arch); // .getDependencePkg(this.arch);
PackageIdentification[] consumedPkgIdList = SurfaceAreaQuery PackageIdentification[] consumedPkgIdList = SurfaceAreaQuery
.getDependencePkg(null); .getDependencePkg(this.arch);
if (consumedPkgIdList != null) { if (consumedPkgIdList != null) {
headerFileList = depPkgToAutogenH(consumedPkgIdList, moduleType); headerFileList = depPkgToAutogenH(consumedPkgIdList, moduleType);
item = headerFileList.iterator(); item = headerFileList.iterator();
@ -891,10 +868,9 @@ public class AutoGen {
fileBuffer.append("{\r\n"); fileBuffer.append("{\r\n");
fileBuffer.append(" return EFI_SUCCESS;\r\n"); fileBuffer.append(" return EFI_SUCCESS;\r\n");
fileBuffer.append("}\r\n\r\n"); fileBuffer.append("}\r\n\r\n");
break;
} else { } else {
for (int i = 0; i < entryPointList.length; i++) { for (int i = 0; i < entryPointList.length; i++) {
if (!entryPointList[i].equals("")) {
fileBuffer.append("EFI_STATUS\r\n"); fileBuffer.append("EFI_STATUS\r\n");
fileBuffer.append("EFIAPI\r\n"); fileBuffer.append("EFIAPI\r\n");
fileBuffer.append(entryPointList[i]); fileBuffer.append(entryPointList[i]);
@ -903,9 +879,6 @@ public class AutoGen {
fileBuffer.append(" IN EFI_SYSTEM_TABLE *SystemTable\r\n"); fileBuffer.append(" IN EFI_SYSTEM_TABLE *SystemTable\r\n");
fileBuffer.append(" );\r\n"); fileBuffer.append(" );\r\n");
entryPointCount++; entryPointCount++;
} else {
break;
}
} }
fileBuffer fileBuffer
.append("GLOBAL_REMOVE_IF_UNREFERENCED const UINT8 _gDriverEntryPointCount = "); .append("GLOBAL_REMOVE_IF_UNREFERENCED const UINT8 _gDriverEntryPointCount = ");
@ -962,14 +935,8 @@ public class AutoGen {
entryPointList = CommonDefinition.remDupString(entryPointList); entryPointList = CommonDefinition.remDupString(entryPointList);
entryPointCount = 0; entryPointCount = 0;
fileBuffer
.append("GLOBAL_REMOVE_IF_UNREFERENCED const UINT8 _gDriverUnloadImageCount = ");
fileBuffer.append(Integer.toString(entryPointCount));
fileBuffer.append(";\r\n\r\n");
if (entryPointList != null) { if (entryPointList != null) {
for (int i = 0; i < entryPointList.length; i++) { for (int i = 0; i < entryPointList.length; i++) {
if (!entryPointList[i].equals("")) {
fileBuffer.append("EFI_STATUS\r\n"); fileBuffer.append("EFI_STATUS\r\n");
fileBuffer.append("EFIAPI\r\n"); fileBuffer.append("EFIAPI\r\n");
fileBuffer.append(entryPointList[i]); fileBuffer.append(entryPointList[i]);
@ -977,12 +944,15 @@ public class AutoGen {
fileBuffer fileBuffer
.append(" IN EFI_HANDLE ImageHandle\r\n"); .append(" IN EFI_HANDLE ImageHandle\r\n");
fileBuffer.append(" );\r\n"); fileBuffer.append(" );\r\n");
} else { entryPointCount++;
break;
}
} }
} }
fileBuffer
.append("GLOBAL_REMOVE_IF_UNREFERENCED const UINT8 _gDriverUnloadImageCount = ");
fileBuffer.append(Integer.toString(entryPointCount));
fileBuffer.append(";\r\n\r\n");
fileBuffer.append("EFI_STATUS\r\n"); fileBuffer.append("EFI_STATUS\r\n");
fileBuffer.append("EFIAPI\r\n"); fileBuffer.append("EFIAPI\r\n");
fileBuffer.append("ProcessModuleUnloadList (\r\n"); fileBuffer.append("ProcessModuleUnloadList (\r\n");
@ -1135,7 +1105,6 @@ public class AutoGen {
entryPointCount = 0; entryPointCount = 0;
if (entryPointList != null) { if (entryPointList != null) {
for (int i = 0; i < entryPointList.length; i++) { for (int i = 0; i < entryPointList.length; i++) {
if (!entryPointList[i].equals("")) {
fileBuffer.append("EFI_STATUS\r\n"); fileBuffer.append("EFI_STATUS\r\n");
fileBuffer.append("EFIAPI\r\n"); fileBuffer.append("EFIAPI\r\n");
fileBuffer.append(entryPointList[i]); fileBuffer.append(entryPointList[i]);
@ -1144,9 +1113,6 @@ public class AutoGen {
.append(" IN EFI_HANDLE ImageHandle\r\n"); .append(" IN EFI_HANDLE ImageHandle\r\n");
fileBuffer.append(" );\r\n"); fileBuffer.append(" );\r\n");
entryPointCount++; entryPointCount++;
} else {
break;
}
} }
} }
@ -1155,22 +1121,6 @@ public class AutoGen {
fileBuffer.append(Integer.toString(entryPointCount)); fileBuffer.append(Integer.toString(entryPointCount));
fileBuffer.append(";\r\n\r\n"); fileBuffer.append(";\r\n\r\n");
if (entryPointList != null) {
for (int i = 0; i < entryPointList.length; i++) {
if (!entryPointList[i].equals("")) {
fileBuffer.append("EFI_STATUS\r\n");
fileBuffer.append("EFIAPI\r\n");
fileBuffer.append(entryPointList[i]);
fileBuffer.append(" (\r\n");
fileBuffer
.append(" IN EFI_HANDLE ImageHandle\r\n");
fileBuffer.append(" );\r\n");
} else {
break;
}
}
}
fileBuffer.append("EFI_STATUS\n"); fileBuffer.append("EFI_STATUS\n");
fileBuffer.append("EFIAPI\r\n"); fileBuffer.append("EFIAPI\r\n");
fileBuffer.append("ProcessModuleUnloadList (\r\n"); fileBuffer.append("ProcessModuleUnloadList (\r\n");

2
Tools/Source/GenBuild/org/tianocore/build/exception/AutoGenException.java
View File

@ -20,7 +20,7 @@ package org.tianocore.build.exception;
The class handle the exception throwed by entity class. The class handle the exception throwed by entity class.
**/ **/
public class AutoGenException extends GenBuildException { public class AutoGenException extends GenBuildException {
//static final long serialVersionUID = -8034897190740066939L; static final long serialVersionUID = -8034897190740066939L;
/** /**
Constructure function Constructure function

2
Tools/Source/GenBuild/org/tianocore/build/exception/EdkException.java
View File

@ -19,7 +19,7 @@ package org.tianocore.build.exception;
The class handle the exception throwed by entity class. The class handle the exception throwed by entity class.
**/ **/
public class EdkException extends Exception { public class EdkException extends Exception {
//static final long serialVersionUID = -8034897190740066939L; static final long serialVersionUID = -8034897190740066938L;
/** /**
Constructure function Constructure function

2
Tools/Source/GenBuild/org/tianocore/build/exception/GenBuildException.java
View File

@ -21,7 +21,7 @@ import org.tianocore.exception.EdkException;
The class handle the exception throwed by entity class. The class handle the exception throwed by entity class.
**/ **/
public class GenBuildException extends EdkException { public class GenBuildException extends EdkException {
//static final long serialVersionUID = -8034897190740066939L; static final long serialVersionUID = -8034897190740066937L;
/** /**
Constructure function Constructure function

2
Tools/Source/GenBuild/org/tianocore/build/exception/PcdAutogenException.java
View File

@ -19,7 +19,7 @@ package org.tianocore.build.exception;
The class handle the exception throwed by entity class. The class handle the exception throwed by entity class.
**/ **/
public class PcdAutogenException extends AutoGenException { public class PcdAutogenException extends AutoGenException {
//static final long serialVersionUID = -8034897190740066939L; static final long serialVersionUID = -8034897190740066936L;
/** /**
Constructure function Constructure function

2
Tools/Source/GenBuild/org/tianocore/build/exception/TianoToolsException.java
View File

@ -21,7 +21,7 @@ import org.tianocore.exception.EdkException;
The class handle the exception throwed by entity class. The class handle the exception throwed by entity class.
**/ **/
public class TianoToolsException extends EdkException { public class TianoToolsException extends EdkException {
//static final long serialVersionUID = -8034897190740066939L; static final long serialVersionUID = -8034897190740066935L;
/** /**
Constructure function Constructure function

2
Tools/Source/GenBuild/org/tianocore/build/exception/XmlParseException.java
View File

@ -19,7 +19,7 @@ package org.tianocore.build.exception;
The class handle the exception throwed by entity class. The class handle the exception throwed by entity class.
**/ **/
public class XmlParseException extends GenBuildException { public class XmlParseException extends GenBuildException {
//static final long serialVersionUID = -8034897190740066939L; static final long serialVersionUID = -8034897190740066934L;
/** /**
Constructure function Constructure function

18
Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
View File

@ -567,7 +567,11 @@ public class SurfaceAreaQuery {
if (returns == null) { if (returns == null) {
return new PackageIdentification[0]; return new PackageIdentification[0];
} }
PackageIdentification[] packageIdList = new PackageIdentification[returns.length];
//
// Get packageIdentification
//
List<PackageIdentification> packageIdList = new ArrayList<PackageIdentification>();
for (int i = 0; i < returns.length; i++) { for (int i = 0; i < returns.length; i++) {
PackageDependenciesDocument.PackageDependencies.Package item = (PackageDependenciesDocument.PackageDependencies.Package) returns[i]; PackageDependenciesDocument.PackageDependencies.Package item = (PackageDependenciesDocument.PackageDependencies.Package) returns[i];
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@ -575,11 +579,19 @@ public class SurfaceAreaQuery {
if (arch == null || archList == null || archList.contains(arch)) { if (arch == null || archList == null || archList.contains(arch)) {
packageGuid = item.getPackageGuid(); packageGuid = item.getPackageGuid();
packageVersion = item.getPackageVersion(); packageVersion = item.getPackageVersion();
packageIdList[i] = (new PackageIdentification(null, packageGuid, packageIdList.add(new PackageIdentification(null, packageGuid,
packageVersion)); packageVersion));
} }
} }
return packageIdList;
//
// transfer packageIdentification list to array.
//
PackageIdentification[] packageIdArray = new PackageIdentification[packageIdList.size()];
for (int i = 0; i < packageIdList.size(); i++) {
packageIdArray[i] = new PackageIdentification(null, packageIdList.get(i).getGuid(),packageIdList.get(i).getVersion());
}
return packageIdArray;
} }
/** /**

2
Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainKey.java
View File

@ -27,7 +27,7 @@ import java.util.TreeMap;
import org.tianocore.exception.EdkException; import org.tianocore.exception.EdkException;
public class ToolChainKey implements java.io.Serializable, Comparable<ToolChainKey> { public class ToolChainKey implements java.io.Serializable, Comparable<ToolChainKey> {
static final long serialVersionUID = -8034897190740066933L;
private String delimiter = "_"; private String delimiter = "_";
public final static int keyLength = 5; public final static int keyLength = 5;