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

Fix EDKT138. And add active_platform file info for stand alone module build.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1032 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
wuyizhong 2006-07-17 07:43:21 +00:00
parent 7cd6b97fc7
commit fa2da5b1c1
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,6 +153,8 @@ public class FrameworkBuildTask extends Task{
// Build every MSA files (SINGLE MODULE BUILD) // Build every MSA files (SINGLE MODULE BUILD)
// //
else if (buildFile.getName().endsWith(".msa")) { else if (buildFile.getName().endsWith(".msa")) {
File tmpFile = new File(GlobalData.getWorkspacePath() + File.separatorChar + activePlatform);
System.out.println("Using FPD file [" + tmpFile.getPath() + "] as active platform. ");
System.out.println("Start to build MSA file [" + buildFile.getPath() + "] ..>> "); System.out.println("Start to build MSA file [" + buildFile.getPath() + "] ..>> ");
GenBuildTask genBuildTask = new GenBuildTask(); GenBuildTask genBuildTask = new GenBuildTask();
genBuildTask.setSingleModuleBuild(true); genBuildTask.setSingleModuleBuild(true);

3
Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
View File

@ -500,6 +500,9 @@ public class FpdParserTask extends Task {
@param moduleName current module identification @param moduleName current module identification
**/ **/
private void updateFvs(String fvSequence, String fvName, FpdModuleIdentification fpdModuleId) { private void updateFvs(String fvSequence, String fvName, FpdModuleIdentification fpdModuleId) {
if (fvName == null || fvName.trim().length() == 0) {
fvName = "NULL";
}
String upcaseFvName = fvName.toUpperCase(); String upcaseFvName = fvName.toUpperCase();
String[] fvNameArray = upcaseFvName.split("[, \t]+"); String[] fvNameArray = upcaseFvName.split("[, \t]+");
for (int i = 0; i < fvNameArray.length; i++) { for (int i = 0; i < fvNameArray.length; i++) {

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

@ -26,13 +26,11 @@ import java.util.Set;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.apache.tools.ant.BuildException; import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.xmlbeans.XmlObject; import org.apache.xmlbeans.XmlObject;
import org.tianocore.DbPathAndFilename; import org.tianocore.DbPathAndFilename;
import org.tianocore.FrameworkDatabaseDocument; import org.tianocore.FrameworkDatabaseDocument;
import org.tianocore.ModuleSurfaceAreaDocument; import org.tianocore.ModuleSurfaceAreaDocument;
import org.tianocore.ModuleSurfaceAreaDocument.ModuleSurfaceArea; import org.tianocore.ModuleSurfaceAreaDocument.ModuleSurfaceArea;
import org.tianocore.PcdBuildDefinitionDocument;
import org.tianocore.build.id.FpdModuleIdentification; import org.tianocore.build.id.FpdModuleIdentification;
import org.tianocore.build.id.ModuleIdentification; import org.tianocore.build.id.ModuleIdentification;
import org.tianocore.build.id.PackageIdentification; import org.tianocore.build.id.PackageIdentification;

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

@ -1924,9 +1924,6 @@ public class SurfaceAreaQuery {
} }
public static boolean isHaveTianoR8FlashMap(){ public static boolean isHaveTianoR8FlashMap(){
PcdCodedDocument.PcdCoded.PcdEntry[] pcdEntries = null;
String[] results;
int index;
String[] xPath = new String[] {"/"}; String[] xPath = new String[] {"/"};
Object[] returns = get ("Externs", xPath); Object[] returns = get ("Externs", xPath);