tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BaseTools: remove the not used PyUtility file 

the PyUtility is not used, so we remove it.
(re-add this patch since it be reverted in Python3 migration patches,
but this check is not related with Python3)

Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Yonghong Zhu 2018-09-13 14:12:00 +08:00
parent 0e982cf03d
commit 6974c784cb
5 changed files with 3 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
BaseTools/Source/C/PyUtility/Makefile
View File

@ -1,25 +0,0 @@
## @file
# Makefile
#
# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
# which accompanies this distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
#
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
!INCLUDE ..\Makefiles\ms.common
APPNAME = GenSec
LIBS = $(LIB_PATH)\Common.lib
OBJECTS = PyUtility.obj
#CFLAGS = $(CFLAGS) /nodefaultlib:libc.lib
!INCLUDE ..\Makefiles\ms.app

106
BaseTools/Source/C/PyUtility/PyUtility.c
View File

@ -1,106 +0,0 @@
/** @file
Python Utility
Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available
under the terms and conditions of the BSD License which accompanies this
distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
#include <Python.h>
#include <Windows.h>
#include <Common/UefiBaseTypes.h>
/*
SaveFileToDisk(FilePath, Content)
*/
STATIC
PyObject*
SaveFileToDisk (
PyObject *Self,
PyObject *Args
)
{
CHAR8 *File;
UINT8 *Data;
UINTN DataLength;
UINTN WriteBytes;
UINTN Status;
HANDLE FileHandle;
PyObject *ReturnValue = Py_False;
Status = PyArg_ParseTuple(
Args,
"ss#",
&File,
&Data,
&DataLength
);
if (Status == 0) {
return NULL;
}
FileHandle = CreateFile(
File,
GENERIC_WRITE,
FILE_SHARE_WRITE|FILE_SHARE_READ|FILE_SHARE_DELETE,
NULL,
CREATE_ALWAYS,
FILE_ATTRIBUTE_NORMAL,
NULL
);
if (FileHandle == INVALID_HANDLE_VALUE) {
PyErr_SetString(PyExc_Exception, "File creation failure");
return NULL;
}
while (WriteFile(FileHandle, Data, DataLength, &WriteBytes, NULL)) {
if (DataLength <= WriteBytes) {
DataLength = 0;
break;
}
Data += WriteBytes;
DataLength -= WriteBytes;
}
if (DataLength != 0) {
// file saved unsuccessfully
PyErr_SetString(PyExc_Exception, "File write failure");
goto Done;
}
//
// Flush buffer may slow down the whole build performance (average 10s slower)
//
//if (!FlushFileBuffers(FileHandle)) {
// PyErr_SetString(PyExc_Exception, "File flush failure");
// goto Done;
//}
// success!
ReturnValue = Py_True;
Done:
CloseHandle(FileHandle);
return ReturnValue;
}
STATIC INT8 SaveFileToDiskDocs[] = "SaveFileToDisk(): Make sure the file is saved to disk\n";
STATIC PyMethodDef PyUtility_Funcs[] = {
{"SaveFileToDisk", (PyCFunction)SaveFileToDisk, METH_VARARGS, SaveFileToDiskDocs},
{NULL, NULL, 0, NULL}
};
PyMODINIT_FUNC
initPyUtility(VOID) {
Py_InitModule3("PyUtility", PyUtility_Funcs, "Utilties Module Implemented C Language");
}

42
BaseTools/Source/C/PyUtility/setup.py
View File

@ -1,42 +0,0 @@
## @file
# package and install PyEfiCompressor extension
#
# Copyright (c) 2008, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
# which accompanies this distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
#
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
##
# Import Modules
#
from distutils.core import setup, Extension
import os
if 'BASE_TOOLS_PATH' not in os.environ:
raise "Please define BASE_TOOLS_PATH to the root of base tools tree"
BaseToolsDir = os.environ['BASE_TOOLS_PATH']
setup(
name="PyUtility",
version="0.01",
ext_modules=[
Extension(
'PyUtility',
sources=[
'PyUtility.c'
],
include_dirs=[
os.path.join(BaseToolsDir, 'Source', 'C', 'Include'),
os.path.join(BaseToolsDir, 'Source', 'C', 'Include', 'Ia32'),
os.path.join(BaseToolsDir, 'Source', 'C', 'Common')
],
)
],
)

10
BaseTools/Source/Python/Common/Misc.py
View File

@ -475,16 +475,6 @@ def SaveFileOnChange(File, Content, IsBinaryFile=True):
EdkLogger.error(None, PERMISSION_FAILURE, "Do not have write permission on directory %s" % DirName) EdkLogger.error(None, PERMISSION_FAILURE, "Do not have write permission on directory %s" % DirName)
try: try:
if GlobalData.gIsWindows:
try:
from .PyUtility import SaveFileToDisk
if not SaveFileToDisk(File, Content):
EdkLogger.error(None, FILE_CREATE_FAILURE, ExtraData=File)
except:
Fd = open(File, "wb")
Fd.write(Content)
Fd.close()
else:
Fd = open(File, "wb") Fd = open(File, "wb")
Fd.write(Content) Fd.write(Content)
Fd.close() Fd.close()

BIN
BaseTools/Source/Python/Common/PyUtility.pyd
View File

Binary file not shown.