Fix the bug to make uni files of one module in the same order to be parsed.

Fix the bug to run target to run secmain in Linux

git-svn-id: https://buildtools.tianocore.org/svn/buildtools/trunk/BaseTools@1623 7335b38e-4728-0410-8992-fb3ffe349368

diff --git a/Source/Python/AutoGen/GenMake.py b/Source/Python/AutoGen/GenMake.py
index 4ea1665..3bc44e1 100755 (executable)
--- a/Source/Python/AutoGen/GenMake.py
+++ b/Source/Python/AutoGen/GenMake.py
@@ -1255,8 +1255,7 @@ ${BEGIN}\tGenFds -f ${fdf_file} -o $(BUILD_DIR) -t $(TOOLCHAIN) -b $(TARGET) -p
 # run command for emulator platform only
 #
 run:
-\tcd $(BUILD_DIR)${separator}IA32
-\t.${separator}SecMain
+\tcd $(BUILD_DIR)${separator}IA32 && ".${separator}SecMain"
 \tcd $(BUILD_DIR)
 
 #

diff --git a/Source/Python/AutoGen/UniClassObject.py b/Source/Python/AutoGen/UniClassObject.py
index 8d3fc59..ccb2eff 100644 (file)
--- a/Source/Python/AutoGen/UniClassObject.py
+++ b/Source/Python/AutoGen/UniClassObject.py
@@ -398,8 +398,16 @@ class UniFileClassObject(object):
     #\r
     def LoadUniFiles(self, FileList = []):\r
         if len(FileList) > 0:\r
-            for File in FileList:\r
-                self.LoadUniFile(File)\r
+                       if len(FileList) > 1:\r
+                               NewList = [];\r
+                               for File in FileList:\r
+                                       NewList.append (File)\r
+                               NewList.sort()\r
+                               for File in NewList:\r
+                                       self.LoadUniFile(File)\r
+                       else:\r
+                               for File in FileList:\r
+                                       self.LoadUniFile(File)\r
 \r
     #\r
     # Add a string to list\r