From 86f3fef093a21e9174e3e89691daa106b9eefea7 Mon Sep 17 00:00:00 2001 From: jwang36 Date: Mon, 11 Dec 2006 14:54:44 +0000 Subject: [PATCH 1/1] Used the msa file name instead of module name as intermediate directory name git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2082 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Source/GenBuild/org/tianocore/build/GenBuildTask.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java index 249ca8328d..79eeb2757f 100644 --- a/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java +++ b/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java @@ -425,8 +425,11 @@ public class GenBuildTask extends Ant { getProject().setProperty("FILE_GUID", moduleId.getGuid()); getProject().setProperty("VERSION", moduleId.getVersion()); getProject().setProperty("MODULE_TYPE", moduleId.getModuleType()); - getProject().setProperty("MODULE_DIR", moduleId.getMsaFile().getParent().replaceAll("(\\\\)", "/")); - getProject().setProperty("MODULE_RELATIVE_DIR", moduleId.getModuleRelativePath().replaceAll("(\\\\)", "/") + File.separatorChar + moduleId.getName()); + File msaFile = moduleId.getMsaFile(); + String msaFileName = msaFile.getName(); + getProject().setProperty("MODULE_DIR", msaFile.getParent().replaceAll("(\\\\)", "/")); + getProject().setProperty("MODULE_RELATIVE_DIR", moduleId.getModuleRelativePath().replaceAll("(\\\\)", "/") + + File.separatorChar + msaFileName.substring(0, msaFileName.length() - 3)); // // SUBSYSTEM -- 2.39.2