X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FMigrationTools%2Forg%2Ftianocore%2Fmigration%2FModuleInfo.java;h=72d39bbd77cef28fe9816cfc4fa3cd3e133127fe;hp=90585aeb604be996ab0ac93d050e56bea11bf3ad;hb=03af6beba5f15564ff10aa1766f224c2f25a530a;hpb=0dc8c5893276cf6638727060d31bca322eba2805;ds=sidebyside diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java index 90585aeb60..72d39bbd77 100644 --- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java +++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java @@ -1,3 +1,15 @@ +/** @file + + Copyright (c) 2006, Intel Corporation + All rights reserved. This program and the accompanying materials + are licensed and made available under the terms and conditions of the BSD License + which accompanies this distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + + **/ package org.tianocore.migration; import java.io.*; @@ -26,7 +38,6 @@ public class ModuleInfo { public String entrypoint = null; public Set localmodulesources = new HashSet(); //contains both .c and .h - public Set localmoduleheaders = new HashSet(); public Set preprocessedccodes = new HashSet(); public Set hashfuncc = new HashSet(); @@ -57,8 +68,11 @@ public class ModuleInfo { if (list[i].contains(".c") || list[i].contains(".C")) { localmodulesources.add(list[i]); } else if (list[i].contains(".h") || list[i].contains(".H")) { + localmodulesources.add(list[i]); //the case that several .inf or .msa found is not concerned + } else if (list[i].contains(".dxs")) { + localmodulesources.add(list[i]); + } else if (list[i].contains(".uni")) { localmodulesources.add(list[i]); - localmoduleheaders.add(list[i]); //the case that several .inf or .msa found is not concerned } else if (list[i].contains(".inf")) { if (ui.yesOrNo("Found .inf file : " + list[i] + "\nUse this file as this module's .inf ?")) { hasInf = true; @@ -145,7 +159,7 @@ public class ModuleInfo { while ((line = rd.readLine()) != null) { if (line.contains("#include")) { mtcinclude = ptninclude.matcher(line); - if (mtcinclude.find() && localmoduleheaders.contains(mtcinclude.group(1))) { + if (mtcinclude.find() && localmodulesources.contains(mtcinclude.group(1))) { } else { line = migrationcomment + line; }