add fpd2dsc.py to fpd2dsc.exe build in toolsetup.bat and fix a bug in StoreDsc.py...

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

diff --git a/Source/Python/fpd2dsc/StoreDsc.py b/Source/Python/fpd2dsc/StoreDsc.py
index 6b31119..11920d8 100644 (file)
--- a/Source/Python/fpd2dsc/StoreDsc.py
+++ b/Source/Python/fpd2dsc/StoreDsc.py
@@ -313,7 +313,7 @@ def GetLibraryClassesSection(SectionName, Method, ObjectList):
     SectionX64Dict = {}\r
     SectionIPFDict = {}\r
     SectionEBCDict = {}\r
-    ObjectList = list(set(ObjectList)) # delete the same element in the list\r
+    #ObjectList = list(set(ObjectList)) # delete the same element in the list\r
     for Object in ObjectList:\r
         if Object == None:\r
             continue\r
@@ -375,12 +375,12 @@ def GetLibraryClassesSection(SectionName, Method, ObjectList):
                             AddToLibraryClassSection(SectionEBCDict, SupModuleList, Item)\r
 \r
     Section = ""\r
-    for ModuleType in Object.SupModuleList:\r
+    for ModuleType in ModuleTypes:\r
         SectionCommonModule = "\n".join(SectionCommonDict.get(ModuleType, []))\r
         if SectionCommonModule != "":\r
             Section += "[%s.Common.%s]\n%s\n" % (SectionName, ModuleType, SectionCommonModule)\r
             Section += "\n"\r
-    for ModuleType in Object.SupModuleList:\r
+    for ModuleType in ModuleTypes:\r
         ListIA32 = SectionIA32Dict.get(ModuleType, [])\r
         if ListIA32 != []:\r
             SectionIA32Module = "\n".join(SectionIA32Dict.get(ModuleType, []))\r

diff --git a/toolsetup.bat b/toolsetup.bat
index 8cc3b8a..325159a 100755 (executable)
--- a/toolsetup.bat
+++ b/toolsetup.bat
@@ -73,6 +73,7 @@ IF NOT EXIST "%EDK_TOOLS_PATH%\Bin\Win32\TargetTool.exe" goto build
 IF NOT EXIST "%EDK_TOOLS_PATH%\Bin\Win32\TianoCompress.exe" goto build\r
 IF NOT EXIST "%EDK_TOOLS_PATH%\Bin\Win32\Trim.exe" goto build\r
 IF NOT EXIST "%EDK_TOOLS_PATH%\Bin\Win32\VfrCompile.exe" goto build\r
+IF NOT EXIST "%EDK_TOOLS_PATH%\Bin\Win32\Fpd2Dsc.exe" goto build\r
 \r
 :skipbuild\r
 goto end\r
@@ -121,6 +122,10 @@ echo Generating MigrationMsa2Inf.exe
 cd %BASE_TOOLS_PATH%\Source\Python\MigrationMsa2Inf\r
 %PYTHON_FREEZER_PATH%\FreezePython.exe --include-modules=encodings.cp437,encodings.gbk,encodings.utf_16,encodings.utf_8 --install-dir=%EDK_TOOLS_PATH%\Bin\Win32 MigrationMsa2Inf.py > NUL\r
 \r
+echo Generating Fpd2Dsc.exe\r
+cd %BASE_TOOLS_PATH%\Source\Python\Fpd2Dsc\r
+%PYTHON_FREEZER_PATH%\FreezePython.exe --include-modules=encodings.cp437,encodings.gbk,encodings.utf_16,encodings.utf_8 --install-dir=%EDK_TOOLS_PATH%\Bin\Win32 Fpd2Dsc.py > NUL\r
+\r
 popd\r
 echo Done!\r
 goto end\r