debug pei

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1363 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
index 49dde8b67a84e892822a4f022c2f8281a8941ea3..fdc6aca781fe48c3e4c54f0dfd8a3953423bca24 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
@@ -60,14 +60,11 @@ public final class ModuleInfo {
        public final Set<String> ppi = new HashSet<String>();\r
 \r
        public final void enroll(String filepath) throws Exception {\r
        public final Set<String> ppi = new HashSet<String>();\r
 \r
        public final void enroll(String filepath) throws Exception {\r

-               String[] temp;\r

                if (filepath.contains(".c") || filepath.contains(".C") || filepath.contains(".h") || \r
                                filepath.contains(".H") || filepath.contains(".dxs") || filepath.contains(".uni")) {\r
                if (filepath.contains(".c") || filepath.contains(".C") || filepath.contains(".h") || \r
                                filepath.contains(".H") || filepath.contains(".dxs") || filepath.contains(".uni")) {\r

-                       temp = filepath.split("\\\\");\r
-                       localmodulesources.add(temp[temp.length - 1]);\r
+                       localmodulesources.add(filepath.replace(modulepath + "\\", ""));\r

                } else if (filepath.contains(".inf") || filepath.contains(".msa")) {\r
                } else if (filepath.contains(".inf") || filepath.contains(".msa")) {\r

-                       temp = filepath.split("\\\\");\r
-                       msaorinf.add(temp[temp.length - 1]);\r
+                       msaorinf.add(filepath.replace(modulepath + "\\", ""));\r

                }\r
        }\r
 \r
                }\r
        }\r
 \r

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
index 2dcd6d2d6150b503e7ec95562e42e198cd7eb53d..d55cf6e893931b144687a0599dc86094848daf04 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
@@ -27,9 +27,9 @@ public final class ModuleReader {
        \r
        public static final void ModuleScan(ModuleInfo m) throws Exception {\r
                mi = m;\r
        \r
        public static final void ModuleScan(ModuleInfo m) throws Exception {\r
                mi = m;\r

-               \r
+\r

                Common.toDoAll(mi.modulepath, ModuleInfo.class.getMethod("enroll", String.class), mi, null, Common.FILE);\r
                Common.toDoAll(mi.modulepath, ModuleInfo.class.getMethod("enroll", String.class), mi, null, Common.FILE);\r

-               \r
+\r

                String filename = null;\r
                if (mi.msaorinf.isEmpty()) {\r
                        ModuleInfo.ui.println("No INF nor MSA file found!");\r
                String filename = null;\r
                if (mi.msaorinf.isEmpty()) {\r
                        ModuleInfo.ui.println("No INF nor MSA file found!");\r


@@ -42,7 +42,7 @@ public final class ModuleReader {
                } else if (filename.contains(".msa")) {\r
                        readMsa(filename);\r
                }\r
                } else if (filename.contains(".msa")) {\r
                        readMsa(filename);\r
                }\r

-               \r
+\r

                CommentOutNonLocalHFile();\r
                parsePreProcessedSourceCode();\r
 \r
                CommentOutNonLocalHFile();\r
                parsePreProcessedSourceCode();\r
 \r