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

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
index 249ca8328dc84730a18a06fd70b0d5e32ffd5a74..79eeb2757fcc4b5962df7e7e7e1debc4701a1398 100644 (file)
--- 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());\r
         getProject().setProperty("VERSION", moduleId.getVersion());\r
         getProject().setProperty("MODULE_TYPE", moduleId.getModuleType());\r
-        getProject().setProperty("MODULE_DIR", moduleId.getMsaFile().getParent().replaceAll("(\\\\)", "/"));\r
-        getProject().setProperty("MODULE_RELATIVE_DIR", moduleId.getModuleRelativePath().replaceAll("(\\\\)", "/") + File.separatorChar + moduleId.getName());\r
+        File msaFile = moduleId.getMsaFile();\r
+        String msaFileName = msaFile.getName();\r
+        getProject().setProperty("MODULE_DIR", msaFile.getParent().replaceAll("(\\\\)", "/"));\r
+        getProject().setProperty("MODULE_RELATIVE_DIR", moduleId.getModuleRelativePath().replaceAll("(\\\\)", "/") \r
+            + File.separatorChar + msaFileName.substring(0, msaFileName.length() - 3));\r
 \r
         //\r
         // SUBSYSTEM\r