fixed bug occurred when new msa file and spd file are in the same directory.
authorvanjeff <vanjeff@de2fecce-e211-0410-80a6-f3fac2684e05>
Mon, 20 Nov 2006 08:59:18 +0000 (08:59 +0000)
committervanjeff <vanjeff@de2fecce-e211-0410-80a6-f3fac2684e05>
Mon, 20 Nov 2006 08:59:18 +0000 (08:59 +0000)
git-svn-id: https://edk2.tianocore.org/svn/edk2/trunk@1985 de2fecce-e211-0410-80a6-f3fac2684e05

edk2/Tools/Java/Source/Merge/src/org/tianocore/Merge/CombineMsa.java

index ea86bef..4d4b215 100644 (file)
@@ -1829,8 +1829,17 @@ public class CombineMsa {
             System.out.println("Please use the FrameworkWizard to add this MSA file to the package.");\r
             System.exit(FAIL);\r
         }\r
-        path2Msa = Cwd.replace(path2Spd, "");\r
-        path2Msa = path2Msa + "/" + msaFn;\r
+               if (path2Spd.equals(Cwd + "/")) \r
+               {\r
+                       //  .msa file and .spd in the same directory\r
+                       path2Msa = msaFn;\r
+               } \r
+               else \r
+               {\r
+                       path2Msa = Cwd.replace(path2Spd, "");\r
+                       path2Msa = path2Msa + "/" + msaFn;\r
+               }\r
+\r
         return path2Msa;\r
     }\r
 \r