BaseTools: remove unnecessary calls of os.exist

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / GenC.py

diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Python/AutoGen/GenC.py
index 910c8fe3706c1fe97231e87862e37bfad6ee3652..5e0d11e165a3a85b358e886cba381b3e7303482a 100755 (executable)
--- a/BaseTools/Source/Python/AutoGen/GenC.py
+++ b/BaseTools/Source/Python/AutoGen/GenC.py
@@ -1748,59 +1748,60 @@ def CreateIdfFileCode(Info, AutoGenC, StringH, IdfGenCFlag, IdfGenBinBuffer):
                     for FileObj in ImageFiles.ImageFilesDict[Idf]:\r
                         ID = FileObj.ImageID\r
                         File = FileObj.File\r
-                        if not os.path.exists(File.Path) or not os.path.isfile(File.Path):\r
-                            EdkLogger.error("build", FILE_NOT_FOUND, ExtraData=File.Path)\r
-                        SearchImageID (FileObj, FileList)\r
-                        if FileObj.Referenced:\r
-                            if (ValueStartPtr - len(DEFINE_STR + ID)) <= 0:\r
-                                Line = DEFINE_STR + ' ' + ID + ' ' + DecToHexStr(Index, 4) + '\n'\r
-                            else:\r
-                                Line = DEFINE_STR + ' ' + ID + ' ' * (ValueStartPtr - len(DEFINE_STR + ID)) + DecToHexStr(Index, 4) + '\n'\r
-\r
-                            if File not in FileDict:\r
-                                FileDict[File] = Index\r
-                            else:\r
-                                DuplicateBlock = pack('B', EFI_HII_IIBT_DUPLICATE)\r
-                                DuplicateBlock += pack('H', FileDict[File])\r
-                                ImageBuffer += DuplicateBlock\r
+                        try:\r
+                            SearchImageID (FileObj, FileList)\r
+                            if FileObj.Referenced:\r
+                                if (ValueStartPtr - len(DEFINE_STR + ID)) <= 0:\r
+                                    Line = DEFINE_STR + ' ' + ID + ' ' + DecToHexStr(Index, 4) + '\n'\r
+                                else:\r
+                                    Line = DEFINE_STR + ' ' + ID + ' ' * (ValueStartPtr - len(DEFINE_STR + ID)) + DecToHexStr(Index, 4) + '\n'\r
+\r
+                                if File not in FileDict:\r
+                                    FileDict[File] = Index\r
+                                else:\r
+                                    DuplicateBlock = pack('B', EFI_HII_IIBT_DUPLICATE)\r
+                                    DuplicateBlock += pack('H', FileDict[File])\r
+                                    ImageBuffer += DuplicateBlock\r
+                                    BufferStr = WriteLine(BufferStr, '// %s: %s: %s' % (DecToHexStr(Index, 4), ID, DecToHexStr(Index, 4)))\r
+                                    TempBufferList = AscToHexList(DuplicateBlock)\r
+                                    BufferStr = WriteLine(BufferStr, CreateArrayItem(TempBufferList, 16) + '\n')\r
+                                    StringH.Append(Line)\r
+                                    Index += 1\r
+                                    continue\r
+\r
+                                TmpFile = open(File.Path, 'rb')\r
+                                Buffer = TmpFile.read()\r
+                                TmpFile.close()\r
+                                if File.Ext.upper() == '.PNG':\r
+                                    TempBuffer = pack('B', EFI_HII_IIBT_IMAGE_PNG)\r
+                                    TempBuffer += pack('I', len(Buffer))\r
+                                    TempBuffer += Buffer\r
+                                elif File.Ext.upper() == '.JPG':\r
+                                    ImageType, = struct.unpack('4s', Buffer[6:10])\r
+                                    if ImageType != b'JFIF':\r
+                                        EdkLogger.error("build", FILE_TYPE_MISMATCH, "The file %s is not a standard JPG file." % File.Path)\r
+                                    TempBuffer = pack('B', EFI_HII_IIBT_IMAGE_JPEG)\r
+                                    TempBuffer += pack('I', len(Buffer))\r
+                                    TempBuffer += Buffer\r
+                                elif File.Ext.upper() == '.BMP':\r
+                                    TempBuffer, TempPalette = BmpImageDecoder(File, Buffer, PaletteIndex, FileObj.TransParent)\r
+                                    if len(TempPalette) > 1:\r
+                                        PaletteIndex += 1\r
+                                        NewPalette = pack('H', len(TempPalette))\r
+                                        NewPalette += TempPalette\r
+                                        PaletteBuffer += NewPalette\r
+                                        PaletteStr = WriteLine(PaletteStr, '// %s: %s: %s' % (DecToHexStr(PaletteIndex - 1, 4), ID, DecToHexStr(PaletteIndex - 1, 4)))\r
+                                        TempPaletteList = AscToHexList(NewPalette)\r
+                                        PaletteStr = WriteLine(PaletteStr, CreateArrayItem(TempPaletteList, 16) + '\n')\r
+                                ImageBuffer += TempBuffer\r
                                 BufferStr = WriteLine(BufferStr, '// %s: %s: %s' % (DecToHexStr(Index, 4), ID, DecToHexStr(Index, 4)))\r
-                                TempBufferList = AscToHexList(DuplicateBlock)\r
+                                TempBufferList = AscToHexList(TempBuffer)\r
                                 BufferStr = WriteLine(BufferStr, CreateArrayItem(TempBufferList, 16) + '\n')\r
+\r
                                 StringH.Append(Line)\r
                                 Index += 1\r
-                                continue\r
-\r
-                            TmpFile = open(File.Path, 'rb')\r
-                            Buffer = TmpFile.read()\r
-                            TmpFile.close()\r
-                            if File.Ext.upper() == '.PNG':\r
-                                TempBuffer = pack('B', EFI_HII_IIBT_IMAGE_PNG)\r
-                                TempBuffer += pack('I', len(Buffer))\r
-                                TempBuffer += Buffer\r
-                            elif File.Ext.upper() == '.JPG':\r
-                                ImageType, = struct.unpack('4s', Buffer[6:10])\r
-                                if ImageType != b'JFIF':\r
-                                    EdkLogger.error("build", FILE_TYPE_MISMATCH, "The file %s is not a standard JPG file." % File.Path)\r
-                                TempBuffer = pack('B', EFI_HII_IIBT_IMAGE_JPEG)\r
-                                TempBuffer += pack('I', len(Buffer))\r
-                                TempBuffer += Buffer\r
-                            elif File.Ext.upper() == '.BMP':\r
-                                TempBuffer, TempPalette = BmpImageDecoder(File, Buffer, PaletteIndex, FileObj.TransParent)\r
-                                if len(TempPalette) > 1:\r
-                                    PaletteIndex += 1\r
-                                    NewPalette = pack('H', len(TempPalette))\r
-                                    NewPalette += TempPalette\r
-                                    PaletteBuffer += NewPalette\r
-                                    PaletteStr = WriteLine(PaletteStr, '// %s: %s: %s' % (DecToHexStr(PaletteIndex - 1, 4), ID, DecToHexStr(PaletteIndex - 1, 4)))\r
-                                    TempPaletteList = AscToHexList(NewPalette)\r
-                                    PaletteStr = WriteLine(PaletteStr, CreateArrayItem(TempPaletteList, 16) + '\n')\r
-                            ImageBuffer += TempBuffer\r
-                            BufferStr = WriteLine(BufferStr, '// %s: %s: %s' % (DecToHexStr(Index, 4), ID, DecToHexStr(Index, 4)))\r
-                            TempBufferList = AscToHexList(TempBuffer)\r
-                            BufferStr = WriteLine(BufferStr, CreateArrayItem(TempBufferList, 16) + '\n')\r
-\r
-                            StringH.Append(Line)\r
-                            Index += 1\r
+                        except IOError:\r
+                            EdkLogger.error("build", FILE_NOT_FOUND, ExtraData=File.Path)\r
 \r
             BufferStr = WriteLine(BufferStr, '// End of the Image Info')\r
             BufferStr = WriteLine(BufferStr, CreateArrayItem(DecToHexList(EFI_HII_IIBT_END, 2)) + '\n')\r