From a33f3dd1783f7d8d824ef858b18573f9f0ccdd78 Mon Sep 17 00:00:00 2001 From: bbahnsen Date: Fri, 14 Jul 2006 05:33:55 +0000 Subject: [PATCH] Fixes for Linux builds. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@995 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Dxe/{ia32 => Ia32}/AsmFuncs.S | 0 .../Dxe/{ia32 => Ia32}/AsmFuncs.asm | 0 .../Dxe/{ia32 => Ia32}/plDebugSupport.c | 0 .../Dxe/{ia32 => Ia32}/plDebugSupport.h | 0 .../org/tianocore/build/FfsProcess.java | 2 +- .../build/ModuleBuildFileGenerator.java | 23 +++++++++++++++---- 6 files changed, 20 insertions(+), 5 deletions(-) rename EdkModulePkg/Universal/DebugSupport/Dxe/{ia32 => Ia32}/AsmFuncs.S (100%) rename EdkModulePkg/Universal/DebugSupport/Dxe/{ia32 => Ia32}/AsmFuncs.asm (100%) rename EdkModulePkg/Universal/DebugSupport/Dxe/{ia32 => Ia32}/plDebugSupport.c (100%) rename EdkModulePkg/Universal/DebugSupport/Dxe/{ia32 => Ia32}/plDebugSupport.h (100%) diff --git a/EdkModulePkg/Universal/DebugSupport/Dxe/ia32/AsmFuncs.S b/EdkModulePkg/Universal/DebugSupport/Dxe/Ia32/AsmFuncs.S similarity index 100% rename from EdkModulePkg/Universal/DebugSupport/Dxe/ia32/AsmFuncs.S rename to EdkModulePkg/Universal/DebugSupport/Dxe/Ia32/AsmFuncs.S diff --git a/EdkModulePkg/Universal/DebugSupport/Dxe/ia32/AsmFuncs.asm b/EdkModulePkg/Universal/DebugSupport/Dxe/Ia32/AsmFuncs.asm similarity index 100% rename from EdkModulePkg/Universal/DebugSupport/Dxe/ia32/AsmFuncs.asm rename to EdkModulePkg/Universal/DebugSupport/Dxe/Ia32/AsmFuncs.asm diff --git a/EdkModulePkg/Universal/DebugSupport/Dxe/ia32/plDebugSupport.c b/EdkModulePkg/Universal/DebugSupport/Dxe/Ia32/plDebugSupport.c similarity index 100% rename from EdkModulePkg/Universal/DebugSupport/Dxe/ia32/plDebugSupport.c rename to EdkModulePkg/Universal/DebugSupport/Dxe/Ia32/plDebugSupport.c diff --git a/EdkModulePkg/Universal/DebugSupport/Dxe/ia32/plDebugSupport.h b/EdkModulePkg/Universal/DebugSupport/Dxe/Ia32/plDebugSupport.h similarity index 100% rename from EdkModulePkg/Universal/DebugSupport/Dxe/ia32/plDebugSupport.h rename to EdkModulePkg/Universal/DebugSupport/Dxe/Ia32/plDebugSupport.h diff --git a/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java b/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java index 02eca2abef..6660382e64 100644 --- a/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java +++ b/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java @@ -349,7 +349,7 @@ public class FfsProcess { // outputPath = "${DEST_DIR_OUTPUT}"> // 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"); ele.setAttribute("outputPath", "${DEST_DIR_OUTPUT}"); } diff --git a/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java b/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java index b4f34f762a..08f49478ae 100644 --- a/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java +++ b/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java @@ -402,6 +402,20 @@ public class ModuleBuildFileGenerator { // 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. @@ -413,6 +427,7 @@ public class ModuleBuildFileGenerator { // Prepare the includes: PackageDependencies and Output debug direactory // Set includes = new LinkedHashSet(); + String arch = project.getProperty("ARCH"); // // WORKSPACE @@ -423,7 +438,7 @@ public class ModuleBuildFileGenerator { // Module iteself // includes.add("${MODULE_DIR}"); - includes.add("${MODULE_DIR}" + File.separatorChar + "${ARCH}"); + includes.add("${MODULE_DIR}" + File.separatorChar + archDir(arch)); // // Packages in PackageDenpendencies @@ -433,7 +448,7 @@ public class ModuleBuildFileGenerator { GlobalData.refreshPackageIdentification(packageDependencies[i]); File packageFile = packageDependencies[i].getSpdFile(); 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]); File packageFile = libraryPackageDependencies[j].getSpdFile(); 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(); } @@ -457,7 +472,7 @@ public class ModuleBuildFileGenerator { // The package which the module belongs to // TBD 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 -- 2.39.2