From e5d3db39cb679f0b7f4e786e32df031b90c964f9 Mon Sep 17 00:00:00 2001 From: vanjeff Date: Mon, 20 Nov 2006 08:59:18 +0000 Subject: [PATCH] fixed bug occurred when new msa file and spd file are in the same directory. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1985 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Merge/src/org/tianocore/Merge/CombineMsa.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Tools/Java/Source/Merge/src/org/tianocore/Merge/CombineMsa.java b/Tools/Java/Source/Merge/src/org/tianocore/Merge/CombineMsa.java index ea86bef84f..4d4b215267 100644 --- a/Tools/Java/Source/Merge/src/org/tianocore/Merge/CombineMsa.java +++ b/Tools/Java/Source/Merge/src/org/tianocore/Merge/CombineMsa.java @@ -1829,8 +1829,17 @@ public class CombineMsa { System.out.println("Please use the FrameworkWizard to add this MSA file to the package."); System.exit(FAIL); } - path2Msa = Cwd.replace(path2Spd, ""); - path2Msa = path2Msa + "/" + msaFn; + if (path2Spd.equals(Cwd + "/")) + { + // .msa file and .spd in the same directory + path2Msa = msaFn; + } + else + { + path2Msa = Cwd.replace(path2Spd, ""); + path2Msa = path2Msa + "/" + msaFn; + } + return path2Msa; } -- 2.39.2