git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1253 6f19259b...

[mirror_edk2.git] / Tools / Source / MigrationTools / org / tianocore / migration / ModuleInfo.java

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
index 90585aeb604be996ab0ac93d050e56bea11bf3ad..72d39bbd77cef28fe9816cfc4fa3cd3e133127fe 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
@@ -1,3 +1,15 @@
+/** @file\r
+ \r
+ Copyright (c) 2006, Intel Corporation\r
+ All rights reserved. This program and the accompanying materials\r
+ are licensed and made available under the terms and conditions of the BSD License\r
+ which accompanies this distribution.  The full text of the license may be found at\r
+ http://opensource.org/licenses/bsd-license.php\r
+ \r
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+ \r
+ **/\r

 package org.tianocore.migration;\r
 \r
 import java.io.*;\r
 package org.tianocore.migration;\r
 \r
 import java.io.*;\r


@@ -26,7 +38,6 @@ public class ModuleInfo {
        public String entrypoint = null;\r
        \r
        public Set<String> localmodulesources = new HashSet<String>();          //contains both .c and .h\r
        public String entrypoint = null;\r
        \r
        public Set<String> localmodulesources = new HashSet<String>();          //contains both .c and .h\r

-       public Set<String> localmoduleheaders = new HashSet<String>();\r

        public Set<String> preprocessedccodes = new HashSet<String>();\r
        \r
        public Set<String> hashfuncc = new HashSet<String>();\r
        public Set<String> preprocessedccodes = new HashSet<String>();\r
        \r
        public Set<String> hashfuncc = new HashSet<String>();\r


@@ -57,8 +68,11 @@ public class ModuleInfo {
                                if (list[i].contains(".c") || list[i].contains(".C")) {\r
                                        localmodulesources.add(list[i]);\r
                                } else if (list[i].contains(".h") || list[i].contains(".H")) {\r
                                if (list[i].contains(".c") || list[i].contains(".C")) {\r
                                        localmodulesources.add(list[i]);\r
                                } else if (list[i].contains(".h") || list[i].contains(".H")) {\r

+                                       localmodulesources.add(list[i]);        //the case that several .inf or .msa found is not concerned\r
+                               } else if (list[i].contains(".dxs")) {\r
+                                       localmodulesources.add(list[i]);\r
+                               } else if (list[i].contains(".uni")) {\r

                                        localmodulesources.add(list[i]);\r
                                        localmodulesources.add(list[i]);\r

-                                       localmoduleheaders.add(list[i]);        //the case that several .inf or .msa found is not concerned\r

                                } else if (list[i].contains(".inf")) {\r
                                        if (ui.yesOrNo("Found .inf file : " + list[i] + "\nUse this file as this module's .inf ?")) {\r
                                                hasInf = true;\r
                                } else if (list[i].contains(".inf")) {\r
                                        if (ui.yesOrNo("Found .inf file : " + list[i] + "\nUse this file as this module's .inf ?")) {\r
                                                hasInf = true;\r


@@ -145,7 +159,7 @@ public class ModuleInfo {
                        while ((line = rd.readLine()) != null) {\r
                                if (line.contains("#include")) {\r
                                        mtcinclude = ptninclude.matcher(line);\r
                        while ((line = rd.readLine()) != null) {\r
                                if (line.contains("#include")) {\r
                                        mtcinclude = ptninclude.matcher(line);\r

-                                       if (mtcinclude.find() && localmoduleheaders.contains(mtcinclude.group(1))) {\r
+                                       if (mtcinclude.find() && localmodulesources.contains(mtcinclude.group(1))) {\r

                                        } else {\r
                                                line = migrationcomment + line;\r
                                        }\r
                                        } else {\r
                                                line = migrationcomment + line;\r
                                        }\r