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

Fixes for Linux builds.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@995 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
bbahnsen 2006-07-14 05:33:55 +00:00
parent a7bbc1eb5a
commit a33f3dd178
6 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
EdkModulePkg/Universal/DebugSupport/Dxe/ia32/AsmFuncs.S → EdkModulePkg/Universal/DebugSupport/Dxe/Ia32/AsmFuncs.S
View File

0
EdkModulePkg/Universal/DebugSupport/Dxe/ia32/AsmFuncs.asm → EdkModulePkg/Universal/DebugSupport/Dxe/Ia32/AsmFuncs.asm
View File

0
EdkModulePkg/Universal/DebugSupport/Dxe/ia32/plDebugSupport.c → EdkModulePkg/Universal/DebugSupport/Dxe/Ia32/plDebugSupport.c
View File

0
EdkModulePkg/Universal/DebugSupport/Dxe/ia32/plDebugSupport.h → EdkModulePkg/Universal/DebugSupport/Dxe/Ia32/plDebugSupport.h
View File

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

@ -349,7 +349,7 @@ public class FfsProcess {
// outputPath = "${DEST_DIR_OUTPUT}"> // outputPath = "${DEST_DIR_OUTPUT}">
// //
ele = doc.createElement("tool"); ele = doc.createElement("tool");
ele.setAttribute("toolName", "${WORKSPACE_DIR}" + File.separatorChar + "Tools" + File.separatorChar + "Bin" ele.setAttribute("toolName", "${WORKSPACE_DIR}" + File.separatorChar + "Tools" + File.separatorChar + "bin"
+ File.separatorChar + "GenCRC32Section"); + File.separatorChar + "GenCRC32Section");
ele.setAttribute("outputPath", "${DEST_DIR_OUTPUT}"); ele.setAttribute("outputPath", "${DEST_DIR_OUTPUT}");
} }

23
Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java
View File

@ -402,6 +402,20 @@ public class ModuleBuildFileGenerator {
// project.setProperty("LIBS", propertyLibs.replaceAll("(\\\\)", "/")); // project.setProperty("LIBS", propertyLibs.replaceAll("(\\\\)", "/"));
} }
/**
Return the name of the directory that corresponds to the architecture.
This is a translation from the XML Schema tag to a directory that
corresponds to our directory name coding convention.
**/
private String archDir(String arch) {
return arch.replaceFirst("X64", "x64")
.replaceFirst("IPF", "Ipf")
.replaceFirst("IA32", "Ia32")
.replaceFirst("ARM", "Arm")
.replaceFirst("EBC", "Ebc");
}
/** /**
Generate the build source files elements for BaseName_build.xml. Generate the build source files elements for BaseName_build.xml.
@ -413,6 +427,7 @@ public class ModuleBuildFileGenerator {
// Prepare the includes: PackageDependencies and Output debug direactory // Prepare the includes: PackageDependencies and Output debug direactory
// //
Set<String> includes = new LinkedHashSet<String>(); Set<String> includes = new LinkedHashSet<String>();
String arch = project.getProperty("ARCH");
// //
// WORKSPACE // WORKSPACE
@ -423,7 +438,7 @@ public class ModuleBuildFileGenerator {
// Module iteself // Module iteself
// //
includes.add("${MODULE_DIR}"); includes.add("${MODULE_DIR}");
includes.add("${MODULE_DIR}" + File.separatorChar + "${ARCH}"); includes.add("${MODULE_DIR}" + File.separatorChar + archDir(arch));
// //
// Packages in PackageDenpendencies // Packages in PackageDenpendencies
@ -433,7 +448,7 @@ public class ModuleBuildFileGenerator {
GlobalData.refreshPackageIdentification(packageDependencies[i]); GlobalData.refreshPackageIdentification(packageDependencies[i]);
File packageFile = packageDependencies[i].getSpdFile(); File packageFile = packageDependencies[i].getSpdFile();
includes.add(packageFile.getParent() + File.separatorChar + "Include"); includes.add(packageFile.getParent() + File.separatorChar + "Include");
includes.add(packageFile.getParent() + File.separatorChar + "Include" + File.separatorChar + "${ARCH}"); includes.add(packageFile.getParent() + File.separatorChar + "Include" + File.separatorChar + archDir(arch));
} }
// //
@ -447,7 +462,7 @@ public class ModuleBuildFileGenerator {
GlobalData.refreshPackageIdentification(libraryPackageDependencies[j]); GlobalData.refreshPackageIdentification(libraryPackageDependencies[j]);
File packageFile = libraryPackageDependencies[j].getSpdFile(); File packageFile = libraryPackageDependencies[j].getSpdFile();
includes.add(packageFile.getParent() + File.separatorChar + "Include"); includes.add(packageFile.getParent() + File.separatorChar + "Include");
includes.add(packageFile.getParent() + File.separatorChar + "Include" + File.separatorChar + "${ARCH}"); includes.add(packageFile.getParent() + File.separatorChar + "Include" + File.separatorChar + archDir(arch));
} }
SurfaceAreaQuery.pop(); SurfaceAreaQuery.pop();
} }
@ -457,7 +472,7 @@ public class ModuleBuildFileGenerator {
// The package which the module belongs to // The package which the module belongs to
// TBD // TBD
includes.add(fpdModuleId.getModule().getPackage().getPackageDir() + File.separatorChar + "Include"); includes.add(fpdModuleId.getModule().getPackage().getPackageDir() + File.separatorChar + "Include");
includes.add(fpdModuleId.getModule().getPackage().getPackageDir() + File.separatorChar + "Include" + File.separatorChar + "${ARCH}"); includes.add(fpdModuleId.getModule().getPackage().getPackageDir() + File.separatorChar + "Include" + File.separatorChar + archDir(arch));
// //
// Debug files output directory // Debug files output directory