Fix a bug on GenBuild and have a minor update on BuildMacro.xml
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@35 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -40,11 +40,13 @@ public class ExpandTask extends Task {
|
||||
Set <code>LIBS</code> for further build usage.
|
||||
**/
|
||||
public void execute() throws BuildException {
|
||||
|
||||
String[] libraries = GlobalData.getModuleLibrary(getProject().getProperty("BASE_NAME"));
|
||||
String basename = getProject().getProperty("BASE_NAME");
|
||||
String arch = getProject().getProperty("ARCH");
|
||||
arch = arch.toUpperCase();
|
||||
String[] libraries = GlobalData.getModuleLibrary(basename, arch);
|
||||
String str = "";
|
||||
for (int i = 0; i < libraries.length; i ++){
|
||||
str += " " + GlobalData.getLibrary(libraries[i]);
|
||||
str += " " + GlobalData.getLibrary(libraries[i], arch);
|
||||
}
|
||||
getProject().setProperty("LIBS", str);
|
||||
|
||||
|
@@ -237,8 +237,8 @@ public class GenBuildTask extends Task {
|
||||
// Update flags like CC_FLAGS, LIB_FLAGS etc.
|
||||
//
|
||||
flagsSetup();
|
||||
GlobalData.addLibrary(baseName, getProject().getProperty("BIN_DIR") + File.separatorChar + baseName + ".lib");
|
||||
GlobalData.addModuleLibrary(baseName, libraries);
|
||||
GlobalData.addLibrary(baseName, arch, getProject().getProperty("BIN_DIR") + File.separatorChar + baseName + ".lib");
|
||||
GlobalData.addModuleLibrary(baseName, arch, libraries);
|
||||
//
|
||||
// If ComponentType is USER_DEFINED,
|
||||
// then call the exist BaseName_build.xml directly.
|
||||
|
@@ -326,8 +326,8 @@ public class GlobalData {
|
||||
@param moduleName the base name of the module
|
||||
@return the libraries which the module depends on
|
||||
**/
|
||||
public synchronized static String[] getModuleLibrary(String moduleName) {
|
||||
Set<String> set = moduleLibraryMap.get(moduleName);
|
||||
public synchronized static String[] getModuleLibrary(String moduleName, String arch) {
|
||||
Set<String> set = moduleLibraryMap.get(moduleName + "-" + arch);
|
||||
return set.toArray(new String[set.size()]);
|
||||
}
|
||||
|
||||
@@ -337,8 +337,8 @@ public class GlobalData {
|
||||
@param moduleName the base name of the module
|
||||
@param libraryList the libraries which the module depends on
|
||||
**/
|
||||
public synchronized static void addModuleLibrary(String moduleName, Set<String> libraryList) {
|
||||
moduleLibraryMap.put(moduleName, libraryList);
|
||||
public synchronized static void addModuleLibrary(String moduleName, String arch, Set<String> libraryList) {
|
||||
moduleLibraryMap.put(moduleName + "-" + arch, libraryList);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -347,8 +347,8 @@ public class GlobalData {
|
||||
@param library the base name of the library
|
||||
@return the library absolute file name
|
||||
**/
|
||||
public synchronized static String getLibrary(String library) {
|
||||
return libraries.get(library);
|
||||
public synchronized static String getLibrary(String library, String arch) {
|
||||
return libraries.get(library + "-" + arch);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -357,8 +357,8 @@ public class GlobalData {
|
||||
@param library the base name of the library
|
||||
@param resultPath the library absolute file name
|
||||
**/
|
||||
public synchronized static void addLibrary(String library, String resultPath) {
|
||||
libraries.put(library, resultPath);
|
||||
public synchronized static void addLibrary(String library, String arch, String resultPath) {
|
||||
libraries.put(library + "-" + arch, resultPath);
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user