X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Tools%2FSource%2FMigrationTools%2Forg%2Ftianocore%2Fmigration%2FSourceFileReplacer.java;h=9d4c85cb045fe82a8226908fd847def2ea180665;hb=e8c0c170fa983c73cab1ad6eea7333efbec74ffb;hp=4ff8ebe52494f6ee3267c2622165d991f47b363b;hpb=10e4f9901cf50906166832d0195ef84be8f56c9b;p=mirror_edk2.git diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java index 4ff8ebe524..9d4c85cb04 100644 --- a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java +++ b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java @@ -104,7 +104,6 @@ public final class SourceFileReplacer implements Common.ForDoAll { private class CLaplace extends Common.Laplace { public String operation(String wholeline) { - boolean addr8 = false; // remove EFI_DRIVER_ENTRY_POINT wholeline = wholeline.replaceAll("(EFI_[A-Z]+_ENTRY_POINT\\s*\\(\\s*" + mi.entrypoint + "\\s*\\)\\s*;)", MigrationTool.MIGRATIONCOMMENT + " $1"); // redefine module entry point for some self-relocated modules @@ -390,8 +389,8 @@ public final class SourceFileReplacer implements Common.ForDoAll { //-----------------------------------ForDoAll-----------------------------------// public void run(String filepath) throws Exception { - String inname = filepath.replace(mi.modulepath + File.separator, ""); - String tempinpath = mi.modulepath + File.separator + "temp" + File.separator; + String inname = filepath.replace(mi.temppath + File.separator, ""); + String tempinpath = mi.temppath + File.separator; String tempoutpath = MigrationTool.ModuleInfoMap.get(mi) + File.separator + "Migration_" + mi.modulename + File.separator; Iterator itLaplace = Laplaces.iterator(); @@ -418,7 +417,7 @@ public final class SourceFileReplacer implements Common.ForDoAll { Laplaces.add(new CLaplace()); Laplaces.add(new IdleLaplace()); - Common.toDoAll(mi.localmodulesources, this); + Common.toDoAll(mi.temppath, this, Common.FILE); if (!mi.hashr8only.isEmpty()) { addr8only();