diff options
| author | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-11-20 08:59:18 +0000 |
|---|---|---|
| committer | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-11-20 08:59:18 +0000 |
| commit | e5d3db39cb679f0b7f4e786e32df031b90c964f9 (patch) | |
| tree | 98c1a3809e241b94ac8562b08749a1ad19b75156 | |
| parent | 8cc715257a4ff625a9db7c51b051a3c36c194598 (diff) | |
| download | edk2-e5d3db39cb679f0b7f4e786e32df031b90c964f9.zip edk2-e5d3db39cb679f0b7f4e786e32df031b90c964f9.tar.gz edk2-e5d3db39cb679f0b7f4e786e32df031b90c964f9.tar.bz2 | |
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
| -rw-r--r-- | Tools/Java/Source/Merge/src/org/tianocore/Merge/CombineMsa.java | 13 |
1 files 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 ea86bef..4d4b215 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;
}
|