tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
vanjeff 2006-11-20 08:59:18 +00:00
parent 8cc715257a
commit e5d3db39cb
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Tools/Java/Source/Merge/src/org/tianocore/Merge/CombineMsa.java
View File

@ -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;
}