Fixed EDKT118

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

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
index 7797b7adfdc673b35f6f7f910258d8431b08b392..446bf0d0120de5d6b9823ab5344ffc86a485d4a8 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
@@ -195,16 +195,10 @@ public class MakeDeps extends Task {
     /// Remove any duplicated path separator or inconsistent path separator\r
     ///\r
     private String cleanupPathName(String path) {\r
-        try {\r
-            path = (new File(path)).getCanonicalPath();\r
-        } catch (IOException e) {\r
-            String separator = "\\" + File.separator;\r
-            String duplicateSeparator = separator + "{2}";\r
-            path = Path.translateFile(path);\r
-            path = path.replaceAll(duplicateSeparator, separator);\r
-            return path;\r
-        }\r
-\r
+        String separator = "\\" + File.separator;\r
+        String duplicateSeparator = separator + "{2}";\r
+        path = Path.translateFile(path);\r
+        path = path.replaceAll(duplicateSeparator, separator);\r
         return path;\r
     }\r
 \r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java b/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java
index 641234e1e977015327ba924d412136d99bb0856d..9371c7e6d5de8c9493d8b97aaa3dc270e0df4ba6 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java
@@ -248,7 +248,7 @@ public class FfsProcess {
         outofdateEle.appendChild(sourceEle);\r
         Element targetEle = document.createElement("targetfiles");\r
         Element fileEle = document.createElement("file");\r
-        fileEle.setAttribute("name", "${BIN_DIR}\\" + targetFilename);\r
+        fileEle.setAttribute("name", "${BIN_DIR}" + File.separatorChar + targetFilename);\r
         targetEle.appendChild(fileEle);\r
         outofdateEle.appendChild(targetEle);\r
         Element sequentialEle = document.createElement("sequential");\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java b/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
index 1f020b3cc15df0b17b2d66dd247f1901a25b8f4c..e968fce041ab36cf4eca61daa75e1fc8e9221367 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
@@ -242,7 +242,7 @@ public class GenBuildTask extends Ant {
             //\r
             if ((moduleId.isLibrary() == false && GlobalData.hasFpdModuleSA(fpdModuleId) == false) \r
                 || GlobalData.isModuleBuilt(fpdModuleId)) {\r
-                continue;\r
+                return;\r
             }\r
             else {\r
                 GlobalData.registerBuiltModule(fpdModuleId);\r

diff --git a/Tools/Source/TianoTools/MakeDeps/MakeDeps.c b/Tools/Source/TianoTools/MakeDeps/MakeDeps.c
index de1afea62f04c60f5f43d33ef45b1425a237f17b..e4206251e6b10ecc631e2ede080c0342e9cd772a 100755 (executable)
--- a/Tools/Source/TianoTools/MakeDeps/MakeDeps.c
+++ b/Tools/Source/TianoTools/MakeDeps/MakeDeps.c
@@ -47,10 +47,10 @@ typedef struct _STRING_LIST {
 //\r
 // Define the relative paths used by the special #include macros\r
 //\r
-#define PROTOCOL_DIR_PATH       "Protocol\\"\r
-#define GUID_DIR_PATH           "Guid\\"\r
-#define ARCH_PROTOCOL_DIR_PATH  "ArchProtocol\\"\r
-#define PPI_PROTOCOL_DIR_PATH   "Ppi\\"\r
+#define PROTOCOL_DIR_PATH       "Protocol/"\r
+#define GUID_DIR_PATH           "Guid/"\r
+#define ARCH_PROTOCOL_DIR_PATH  "ArchProtocol/"\r
+#define PPI_PROTOCOL_DIR_PATH   "Ppi/"\r
 \r
 //\r
 // Use this structure to keep track of all the special #include forms\r
@@ -240,7 +240,7 @@ Returns:
       // Find the .extension\r
       //\r
       for (Cptr = TargetFileName + strlen (TargetFileName) - 1;\r
-           (*Cptr != '\\') && (Cptr > TargetFileName) && (*Cptr != '.');\r
+           (*Cptr != '\\' && *Cptr != '/') && (Cptr > TargetFileName) && (*Cptr != '.');\r
            Cptr--\r
           )\r
         ;\r
@@ -362,7 +362,7 @@ Returns:
     strcpy (SumDepsFile, mGlobals.SumDepsPath);\r
     strcat (SumDepsFile, FileName);\r
     for (Cptr = SumDepsFile + strlen (SumDepsFile) - 1;\r
-         (*Cptr != '\\') && (Cptr > SumDepsFile) && (*Cptr != '.');\r
+         (*Cptr != '\\' && *Cptr != '/') && (Cptr > SumDepsFile) && (*Cptr != '.');\r
          Cptr--\r
         )\r
       ;\r
@@ -550,7 +550,7 @@ Returns:
                 //\r
                 strcpy (MacroIncludeFileName, mMacroConversion[Index].PathName);\r
                 strcat (MacroIncludeFileName, Cptr);\r
-                strcat (MacroIncludeFileName, "\\");\r
+                strcat (MacroIncludeFileName, "/");\r
                 strcat (MacroIncludeFileName, Cptr);\r
                 strcat (MacroIncludeFileName, ".h");\r
                 //\r
@@ -867,8 +867,8 @@ ProcessArgs (
         }\r
 \r
         strcpy (NewList->Str, Argv[1]);\r
-        if (NewList->Str[strlen (NewList->Str) - 1] != '\\') {\r
-          strcat (NewList->Str, "\\");\r
+        if (NewList->Str[strlen (NewList->Str) - 1] != '\\' && NewList->Str[strlen (NewList->Str) - 1] != '/') {\r
+          strcat (NewList->Str, "/");\r
         }\r
         //\r
         // Add it to the end of the our list of include paths\r
@@ -953,10 +953,10 @@ ProcessArgs (
       //\r
       // Back up in the source file name to the last backslash and terminate after it.\r
       //\r
-      for (Index = strlen (NewList->Str) - 1; (Index > 0) && (NewList->Str[Index] != '\\'); Index--)\r
+      for (Index = strlen (NewList->Str) - 1; (Index > 0) && (NewList->Str[Index] != '\\' && NewList->Str[Index] != '/'); Index--)\r
         ;\r
       if (Index < 0) {\r
-        strcpy (NewList->Str, ".\\");\r
+        strcpy (NewList->Str, "./");\r
       } else {\r
         NewList->Str[Index + 1] = 0;\r
       }\r
@@ -1001,8 +1001,8 @@ ProcessArgs (
         }\r
 \r
         strcpy (NewList->Str, Argv[1]);\r
-        if (NewList->Str[strlen (NewList->Str) - 1] != '\\') {\r
-          strcat (NewList->Str, "\\");\r
+        if (NewList->Str[strlen (NewList->Str) - 1] != '\\' && NewList->Str[strlen (NewList->Str) - 1] != '/') {\r
+          strcat (NewList->Str, "/");\r
         }\r
 \r
         NewList->Next     = mGlobals.SubDirs;\r
@@ -1100,8 +1100,8 @@ ProcessArgs (
         //\r
         // Add slash on end if not there\r
         //\r
-        if (mGlobals.SumDepsPath[strlen (mGlobals.SumDepsPath) - 1] != '\\') {\r
-          strcat (mGlobals.SumDepsPath, "\\");\r
+        if (mGlobals.SumDepsPath[strlen (mGlobals.SumDepsPath) - 1] != '\\' && mGlobals.SumDepsPath[strlen (mGlobals.SumDepsPath) - 1] != '/') {\r
+          strcat (mGlobals.SumDepsPath, "/");\r
         }\r
       } else {\r
         Error (NULL, 0, 0, Argv[0], "option requires path to summary dependency files");\r