Revert BaseTools: PYTHON3 migration
This reverts commit 6693f359b3c213513c5096a06c6f67244a44dc52..
678f851312
.
Python3 migration is the fundamental change. It requires every developer
to install Python3. Before this migration, the well communication and wide
verification must be done. But now, most people is not aware of this change,
and not try it. So, Python3 migration is reverted and be moved to edk2-staging
Python3 branch for the edk2 user evaluation.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
@@ -17,7 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
**/
|
||||
|
||||
#include "Compress.h"
|
||||
#include "Decompress.h"
|
||||
#include "TianoCompress.h"
|
||||
#include "EfiUtilityMsgs.h"
|
||||
#include "ParseInf.h"
|
||||
@@ -66,7 +65,6 @@ static BOOLEAN QuietMode = FALSE;
|
||||
//
|
||||
STATIC BOOLEAN ENCODE = FALSE;
|
||||
STATIC BOOLEAN DECODE = FALSE;
|
||||
STATIC BOOLEAN UEFIMODE = FALSE;
|
||||
STATIC UINT8 *mSrc, *mDst, *mSrcUpperLimit, *mDstUpperLimit;
|
||||
STATIC UINT8 *mLevel, *mText, *mChildCount, *mBuf, mCLen[NC], mPTLen[NPT], *mLen;
|
||||
STATIC INT16 mHeap[NC + 1];
|
||||
@@ -1705,8 +1703,6 @@ Returns:
|
||||
// Details Option
|
||||
//
|
||||
fprintf (stdout, "Options:\n");
|
||||
fprintf (stdout, " --uefi\n\
|
||||
Enable UefiCompress, use TianoCompress when without this option\n");
|
||||
fprintf (stdout, " -o FileName, --output FileName\n\
|
||||
File will be created to store the ouput content.\n");
|
||||
fprintf (stdout, " -v, --verbose\n\
|
||||
@@ -1826,13 +1822,6 @@ Returns:
|
||||
continue;
|
||||
}
|
||||
|
||||
if (stricmp(argv[0], "--uefi") == 0) {
|
||||
UEFIMODE = TRUE;
|
||||
argc--;
|
||||
argv++;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (stricmp (argv[0], "--debug") == 0) {
|
||||
argc-=2;
|
||||
argv++;
|
||||
@@ -1950,11 +1939,7 @@ Returns:
|
||||
if (DebugMode) {
|
||||
DebugMsg(UTILITY_NAME, 0, DebugLevel, "Encoding", NULL);
|
||||
}
|
||||
if (UEFIMODE) {
|
||||
Status = EfiCompress ((UINT8 *)FileBuffer, InputLength, OutBuffer, &DstSize);
|
||||
} else {
|
||||
Status = TianoCompress ((UINT8 *)FileBuffer, InputLength, OutBuffer, &DstSize);
|
||||
}
|
||||
Status = TianoCompress ((UINT8 *)FileBuffer, InputLength, OutBuffer, &DstSize);
|
||||
|
||||
if (Status == EFI_BUFFER_TOO_SMALL) {
|
||||
OutBuffer = (UINT8 *) malloc (DstSize);
|
||||
@@ -1964,11 +1949,7 @@ Returns:
|
||||
}
|
||||
}
|
||||
|
||||
if (UEFIMODE) {
|
||||
Status = EfiCompress ((UINT8 *)FileBuffer, InputLength, OutBuffer, &DstSize);
|
||||
} else {
|
||||
Status = TianoCompress ((UINT8 *)FileBuffer, InputLength, OutBuffer, &DstSize);
|
||||
}
|
||||
Status = TianoCompress ((UINT8 *)FileBuffer, InputLength, OutBuffer, &DstSize);
|
||||
if (Status != EFI_SUCCESS) {
|
||||
Error (NULL, 0, 0007, "Error compressing file", NULL);
|
||||
goto ERROR;
|
||||
@@ -1998,46 +1979,32 @@ Returns:
|
||||
if (DebugMode) {
|
||||
DebugMsg(UTILITY_NAME, 0, DebugLevel, "Decoding\n", NULL);
|
||||
}
|
||||
//
|
||||
// Get Compressed file original size
|
||||
//
|
||||
Src = (UINT8 *)FileBuffer;
|
||||
OrigSize = Src[4] + (Src[5] << 8) + (Src[6] << 16) + (Src[7] << 24);
|
||||
|
||||
if (UEFIMODE) {
|
||||
Status = Extract((VOID *)FileBuffer, InputLength, (VOID *)&OutBuffer, &DstSize, 1);
|
||||
if (Status != EFI_SUCCESS) {
|
||||
goto ERROR;
|
||||
}
|
||||
fwrite(OutBuffer, (size_t)(DstSize), 1, OutputFile);
|
||||
} else {
|
||||
//
|
||||
// Get Compressed file original size
|
||||
//
|
||||
Src = (UINT8 *)FileBuffer;
|
||||
OrigSize = Src[4] + (Src[5] << 8) + (Src[6] << 16) + (Src[7] << 24);
|
||||
//
|
||||
// Allocate OutputBuffer
|
||||
//
|
||||
OutBuffer = (UINT8 *)malloc(OrigSize);
|
||||
if (OutBuffer == NULL) {
|
||||
Error (NULL, 0, 4001, "Resource:", "Memory cannot be allocated!");
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
//
|
||||
// Allocate OutputBuffer
|
||||
//
|
||||
OutBuffer = (UINT8 *)malloc(OrigSize);
|
||||
if (OutBuffer == NULL) {
|
||||
Error (NULL, 0, 4001, "Resource:", "Memory cannot be allocated!");
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
Status = TDecompress((VOID *)FileBuffer, (VOID *)OutBuffer, (VOID *)Scratch, 2);
|
||||
if (Status != EFI_SUCCESS) {
|
||||
goto ERROR;
|
||||
}
|
||||
fwrite(OutBuffer, (size_t)(Scratch->mOrigSize), 1, OutputFile);
|
||||
Status = Decompress((VOID *)FileBuffer, (VOID *)OutBuffer, (VOID *)Scratch, 2);
|
||||
if (Status != EFI_SUCCESS) {
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
fwrite(OutBuffer, (size_t)(Scratch->mOrigSize), 1, OutputFile);
|
||||
fclose(OutputFile);
|
||||
fclose(InputFile);
|
||||
if (Scratch != NULL) {
|
||||
free(Scratch);
|
||||
}
|
||||
if (FileBuffer != NULL) {
|
||||
free(FileBuffer);
|
||||
}
|
||||
if (OutBuffer != NULL) {
|
||||
free(OutBuffer);
|
||||
}
|
||||
free(Scratch);
|
||||
free(FileBuffer);
|
||||
free(OutBuffer);
|
||||
|
||||
if (DebugMode) {
|
||||
DebugMsg(UTILITY_NAME, 0, DebugLevel, "Encoding successful!\n", NULL);
|
||||
@@ -2667,7 +2634,7 @@ Done:
|
||||
|
||||
RETURN_STATUS
|
||||
EFIAPI
|
||||
TDecompress (
|
||||
Decompress (
|
||||
IN VOID *Source,
|
||||
IN OUT VOID *Destination,
|
||||
IN OUT VOID *Scratch,
|
||||
|
Reference in New Issue
Block a user