AppPkg/Applications/Python: Workaround recent build tool changes which prevent building Python.

Recent changes to the build tools removed user-defined MACRO capability in INF files.  This change manually expands the PYTHON_VERSION macro so that one can again build Python.

Signed-off-by: darylm503
Reviewed-by: geekboy15a


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12810 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 160 insertions, 149 deletions

diff --git a/AppPkg/Applications/Python/PythonCore.inf b/AppPkg/Applications/Python/PythonCore.inf
index d3834ccbfe..15fac14c66 100644
--- a/AppPkg/Applications/Python/PythonCore.inf
+++ b/AppPkg/Applications/Python/PythonCore.inf
@@ -19,7 +19,6 @@
   MODULE_TYPE                 = UEFI_APPLICATION

   VERSION_STRING              = 0.1

   ENTRY_POINT                 = ShellCEntryLib

-  PYTHON_VERSION              = 2.7.2

 

 #

 #  VALID_ARCHITECTURES        = IA32 X64 IPF

@@ -37,142 +36,154 @@
   LibGdtoa

   LibWchar

   LibMath

+  LibGen

+  LibNetUtil

   DevShell

+  BsdSocketLib

+  EfiSocketLib

 

 [Sources]

 #EFI -- EFI specific code

   Efi/config.c

   Efi/getpath.c

+  Efi/edk2module.c

 

 #Parser

-  Python-$(PYTHON_VERSION)/Parser/acceler.c

-  Python-$(PYTHON_VERSION)/Parser/bitset.c

-  Python-$(PYTHON_VERSION)/Parser/firstsets.c

-  Python-$(PYTHON_VERSION)/Parser/grammar.c

-  Python-$(PYTHON_VERSION)/Parser/grammar1.c

-  Python-$(PYTHON_VERSION)/Parser/listnode.c

-  Python-$(PYTHON_VERSION)/Parser/metagrammar.c

-  Python-$(PYTHON_VERSION)/Parser/myreadline.c

-  Python-$(PYTHON_VERSION)/Parser/node.c

-  Python-$(PYTHON_VERSION)/Parser/parser.c

-  Python-$(PYTHON_VERSION)/Parser/parsetok.c

-  Python-$(PYTHON_VERSION)/Parser/tokenizer.c

+  Python-2.7.2/Parser/acceler.c

+  Python-2.7.2/Parser/bitset.c

+  Python-2.7.2/Parser/firstsets.c

+  Python-2.7.2/Parser/grammar.c

+  Python-2.7.2/Parser/grammar1.c

+  Python-2.7.2/Parser/listnode.c

+  Python-2.7.2/Parser/metagrammar.c

+  Python-2.7.2/Parser/myreadline.c

+  Python-2.7.2/Parser/node.c

+  Python-2.7.2/Parser/parser.c

+  Python-2.7.2/Parser/parsetok.c

+  Python-2.7.2/Parser/tokenizer.c

 

 #Python

-  Python-$(PYTHON_VERSION)/Python/_warnings.c

-  Python-$(PYTHON_VERSION)/Python/asdl.c

-  Python-$(PYTHON_VERSION)/Python/ast.c

-  Python-$(PYTHON_VERSION)/Python/bltinmodule.c

-  Python-$(PYTHON_VERSION)/Python/ceval.c

-  Python-$(PYTHON_VERSION)/Python/codecs.c

-  Python-$(PYTHON_VERSION)/Python/compile.c

-  Python-$(PYTHON_VERSION)/Python/dtoa.c

-  Python-$(PYTHON_VERSION)/Python/dynload_stub.c

-  Python-$(PYTHON_VERSION)/Python/errors.c

-  Python-$(PYTHON_VERSION)/Python/formatter_string.c

-  Python-$(PYTHON_VERSION)/Python/formatter_unicode.c

-  Python-$(PYTHON_VERSION)/Python/frozen.c

-  Python-$(PYTHON_VERSION)/Python/future.c

-  Python-$(PYTHON_VERSION)/Python/getargs.c

-  Python-$(PYTHON_VERSION)/Python/getcompiler.c

-  Python-$(PYTHON_VERSION)/Python/getcopyright.c

-  Python-$(PYTHON_VERSION)/Python/getopt.c

-  Python-$(PYTHON_VERSION)/Python/getplatform.c

-  Python-$(PYTHON_VERSION)/Python/getversion.c

-  Python-$(PYTHON_VERSION)/Python/graminit.c

-  Python-$(PYTHON_VERSION)/Python/import.c

-  Python-$(PYTHON_VERSION)/Python/importdl.c

-  Python-$(PYTHON_VERSION)/Python/marshal.c

-  Python-$(PYTHON_VERSION)/Python/modsupport.c

-  Python-$(PYTHON_VERSION)/Python/mysnprintf.c

-  Python-$(PYTHON_VERSION)/Python/mystrtoul.c

-  Python-$(PYTHON_VERSION)/Python/peephole.c

-  Python-$(PYTHON_VERSION)/Python/pyarena.c

-  Python-$(PYTHON_VERSION)/Python/pyctype.c

-  Python-$(PYTHON_VERSION)/Python/pyfpe.c

-  Python-$(PYTHON_VERSION)/Python/pymath.c

-  Python-$(PYTHON_VERSION)/Python/pystate.c

-  Python-$(PYTHON_VERSION)/Python/pystrcmp.c

-  Python-$(PYTHON_VERSION)/Python/pystrtod.c

-  Python-$(PYTHON_VERSION)/Python/Python-ast.c

-  Python-$(PYTHON_VERSION)/Python/pythonrun.c

-  Python-$(PYTHON_VERSION)/Python/structmember.c

-  Python-$(PYTHON_VERSION)/Python/symtable.c

-  Python-$(PYTHON_VERSION)/Python/sysmodule.c

-  Python-$(PYTHON_VERSION)/Python/traceback.c

+  Python-2.7.2/Python/_warnings.c

+  Python-2.7.2/Python/asdl.c

+  Python-2.7.2/Python/ast.c

+  Python-2.7.2/Python/bltinmodule.c

+  Python-2.7.2/Python/ceval.c

+  Python-2.7.2/Python/codecs.c

+  Python-2.7.2/Python/compile.c

+  Python-2.7.2/Python/dtoa.c

+  Python-2.7.2/Python/dynload_stub.c

+  Python-2.7.2/Python/errors.c

+  Python-2.7.2/Python/formatter_string.c

+  Python-2.7.2/Python/formatter_unicode.c

+  Python-2.7.2/Python/frozen.c

+  Python-2.7.2/Python/future.c

+  Python-2.7.2/Python/getargs.c

+  Python-2.7.2/Python/getcompiler.c

+  Python-2.7.2/Python/getcopyright.c

+  Python-2.7.2/Python/getopt.c

+  Python-2.7.2/Python/getplatform.c

+  Python-2.7.2/Python/getversion.c

+  Python-2.7.2/Python/graminit.c

+  Python-2.7.2/Python/import.c

+  Python-2.7.2/Python/importdl.c

+  Python-2.7.2/Python/marshal.c

+  Python-2.7.2/Python/modsupport.c

+  Python-2.7.2/Python/mysnprintf.c

+  Python-2.7.2/Python/mystrtoul.c

+  Python-2.7.2/Python/peephole.c

+  Python-2.7.2/Python/pyarena.c

+  Python-2.7.2/Python/pyctype.c

+  Python-2.7.2/Python/pyfpe.c

+  Python-2.7.2/Python/pymath.c

+  Python-2.7.2/Python/pystate.c

+  Python-2.7.2/Python/pystrcmp.c

+  Python-2.7.2/Python/pystrtod.c

+  Python-2.7.2/Python/Python-ast.c

+  Python-2.7.2/Python/pythonrun.c

+  Python-2.7.2/Python/structmember.c

+  Python-2.7.2/Python/symtable.c

+  Python-2.7.2/Python/sysmodule.c

+  Python-2.7.2/Python/traceback.c

 #  Python-$(PYTHON_VERSION)/Python/thread.c

 

 #Modules -- See Efi/config.c

-  Python-$(PYTHON_VERSION)/Modules/main.c

-  Python-$(PYTHON_VERSION)/Modules/python.c

-  Python-$(PYTHON_VERSION)/Modules/getbuildinfo.c

+  Python-2.7.2/Modules/main.c

+  Python-2.7.2/Modules/python.c

+  Python-2.7.2/Modules/getbuildinfo.c

+

+  Python-2.7.2/Modules/arraymodule.c

+  Python-2.7.2/Modules/binascii.c

+  Python-2.7.2/Modules/errnomodule.c

+  Python-2.7.2/Modules/gcmodule.c

+  Python-2.7.2/Modules/signalmodule.c

+  Python-2.7.2/Modules/operator.c

+  Python-2.7.2/Modules/_weakref.c

+  Python-2.7.2/Modules/mathmodule.c

+  Python-2.7.2/Modules/_math.c

+  Python-2.7.2/Modules/timemodule.c

+  Python-2.7.2/Modules/datetimemodule.c

+  Python-2.7.2/Modules/cStringIO.c

+  Python-2.7.2/Modules/_codecsmodule.c

+  Python-2.7.2/Modules/_randommodule.c

+  Python-2.7.2/Modules/xxsubtype.c

+

+  Python-2.7.2/Modules/_heapqmodule.c

+  Python-2.7.2/Modules/itertoolsmodule.c

+  Python-2.7.2/Modules/_collectionsmodule.c

+  Python-2.7.2/Modules/_sre.c

+  Python-2.7.2/Modules/parsermodule.c

+  Python-2.7.2/Modules/_struct.c

+  Python-2.7.2/Modules/cPickle.c

+  Python-2.7.2/Modules/_functoolsmodule.c

+  Python-2.7.2/Modules/cmathmodule.c

+  Python-2.7.2/Modules/_json.c

+

+  Python-2.7.2/Modules/_bisectmodule.c

+  Python-2.7.2/Modules/future_builtins.c

+  Python-2.7.2/Modules/md5.c

+  Python-2.7.2/Modules/md5module.c

+  Python-2.7.2/Modules/shamodule.c

+  Python-2.7.2/Modules/sha256module.c

+  Python-2.7.2/Modules/sha512module.c

+  Python-2.7.2/Modules/stropmodule.c

+

+  # Socket related modules

+#  Python-$(PYTHON_VERSION)/Modules/getaddrinfo.c       # included by socketmodule.c

+#  Python-$(PYTHON_VERSION)/Modules/getnameinfo.c       # included by socketmodule.c

+  Python-2.7.2/Modules/selectmodule.c

+  Python-2.7.2/Modules/socketmodule.c

 

-#  Python-$(PYTHON_VERSION)/Modules/_bisectmodule.c

-#  Python-$(PYTHON_VERSION)/Modules/_codecsmodule.c

-#  Python-$(PYTHON_VERSION)/Modules/_collectionsmodule.c

-#  Python-$(PYTHON_VERSION)/Modules/_csv.c

-#  Python-$(PYTHON_VERSION)/Modules/_functoolsmodule.c

-#  Python-$(PYTHON_VERSION)/Modules/_heapqmodule.c

-#  Python-$(PYTHON_VERSION)/Modules/_json.c

-#  Python-$(PYTHON_VERSION)/Modules/_math.c

-#  Python-$(PYTHON_VERSION)/Modules/_randommodule.c

-#  Python-$(PYTHON_VERSION)/Modules/_sre.c

-#  Python-$(PYTHON_VERSION)/Modules/_struct.c

-  Python-$(PYTHON_VERSION)/Modules/arraymodule.c

-  Python-$(PYTHON_VERSION)/Modules/binascii.c

-#  Python-$(PYTHON_VERSION)/Modules/cPickle.c

-#  Python-$(PYTHON_VERSION)/Modules/cStringIO.c

-  Python-$(PYTHON_VERSION)/Modules/errnomodule.c

-#  Python-$(PYTHON_VERSION)/Modules/future_builtins.c

-  Python-$(PYTHON_VERSION)/Modules/gcmodule.c

 #  Python-$(PYTHON_VERSION)/Modules/imageop.c

-#  Python-$(PYTHON_VERSION)/Modules/itertoolsmodule.c

-#  Python-$(PYTHON_VERSION)/Modules/mathmodule.c

-#  Python-$(PYTHON_VERSION)/Modules/md5.c

-#  Python-$(PYTHON_VERSION)/Modules/md5module.c

-#  Python-$(PYTHON_VERSION)/Modules/operator.c

-  Python-$(PYTHON_VERSION)/Modules/parsermodule.c

-  Python-$(PYTHON_VERSION)/Modules/signalmodule.c

-#  Python-$(PYTHON_VERSION)/Modules/shamodule.c

-#  Python-$(PYTHON_VERSION)/Modules/sha256module.c

-#  Python-$(PYTHON_VERSION)/Modules/sha512module.c

-#  Python-$(PYTHON_VERSION)/Modules/stropmodule.c

+#  Python-$(PYTHON_VERSION)/Modules/_csv.c

 #  Python-$(PYTHON_VERSION)/Modules/symtablemodule.c

-#  Python-$(PYTHON_VERSION)/Modules/timemodule.c

-#  Python-$(PYTHON_VERSION)/Modules/xxsubtype.c

-

 #  Python-$(PYTHON_VERSION)/Modules/_hotshot.c

 #  Python-$(PYTHON_VERSION)/Modules/_localemodule.c

 #  Python-$(PYTHON_VERSION)/Modules/_lsprof.c

-#  Python-$(PYTHON_VERSION)/Modules/_weakref.c

 #  Python-$(PYTHON_VERSION)/Modules/audioop.c

-#  Python-$(PYTHON_VERSION)/Modules/cmathmodule.c

-#  Python-$(PYTHON_VERSION)/Modules/datetimemodule.c

 #  Python-$(PYTHON_VERSION)/Modules/mmapmodule.c

-#  Python-$(PYTHON_VERSION)/Modules/posixmodule.c

 #  Python-$(PYTHON_VERSION)/Modules/rotatingtree.c

 #  Python-$(PYTHON_VERSION)/Modules/threadmodule.c

 #  Python-$(PYTHON_VERSION)/Modules/zipimport.c

 #  Python-$(PYTHON_VERSION)/Modules/zlibmodule.c

 

 #Modules/cjkcodecs

-#  Python-$(PYTHON_VERSION)/Modules/cjkcodecs/multibytecodec.c

-#  Python-$(PYTHON_VERSION)/Modules/cjkcodecs/_codecs_cn.c

-#  Python-$(PYTHON_VERSION)/Modules/cjkcodecs/_codecs_hk.c

-#  Python-$(PYTHON_VERSION)/Modules/cjkcodecs/_codecs_iso2022.c

-#  Python-$(PYTHON_VERSION)/Modules/cjkcodecs/_codecs_jp.c

-#  Python-$(PYTHON_VERSION)/Modules/cjkcodecs/_codecs_kr.c

-#  Python-$(PYTHON_VERSION)/Modules/cjkcodecs/_codecs_tw.c

+  Python-2.7.2/Modules/cjkcodecs/multibytecodec.c

+  Python-2.7.2/Modules/cjkcodecs/_codecs_cn.c

+  Python-2.7.2/Modules/cjkcodecs/_codecs_hk.c

+  Python-2.7.2/Modules/cjkcodecs/_codecs_iso2022.c

+  Python-2.7.2/Modules/cjkcodecs/_codecs_jp.c

+  Python-2.7.2/Modules/cjkcodecs/_codecs_kr.c

+  Python-2.7.2/Modules/cjkcodecs/_codecs_tw.c

 

 

 #Modules/_io

-  Python-$(PYTHON_VERSION)/Modules/_io/_iomodule.c

-  Python-$(PYTHON_VERSION)/Modules/_io/bufferedio.c

-  Python-$(PYTHON_VERSION)/Modules/_io/bytesio.c

-  Python-$(PYTHON_VERSION)/Modules/_io/fileio.c

-  Python-$(PYTHON_VERSION)/Modules/_io/iobase.c

-  Python-$(PYTHON_VERSION)/Modules/_io/stringio.c

-  Python-$(PYTHON_VERSION)/Modules/_io/textio.c

+  Python-2.7.2/Modules/_io/_iomodule.c

+  Python-2.7.2/Modules/_io/bufferedio.c

+  Python-2.7.2/Modules/_io/bytesio.c

+  Python-2.7.2/Modules/_io/fileio.c

+  Python-2.7.2/Modules/_io/iobase.c

+  Python-2.7.2/Modules/_io/stringio.c

+  Python-2.7.2/Modules/_io/textio.c

 

 #Modules/zlib

 #  Python-$(PYTHON_VERSION)/Modules/zlib/adler32.c

@@ -189,47 +200,47 @@
 #  Python-$(PYTHON_VERSION)/Modules/zlib/zutil.c

 

 #Objects

-  Python-$(PYTHON_VERSION)/Objects/abstract.c

-  Python-$(PYTHON_VERSION)/Objects/boolobject.c

-  Python-$(PYTHON_VERSION)/Objects/bufferobject.c

-  Python-$(PYTHON_VERSION)/Objects/bytearrayobject.c

-  Python-$(PYTHON_VERSION)/Objects/bytes_methods.c

-  Python-$(PYTHON_VERSION)/Objects/capsule.c

-  Python-$(PYTHON_VERSION)/Objects/cellobject.c

-  Python-$(PYTHON_VERSION)/Objects/classobject.c

-  Python-$(PYTHON_VERSION)/Objects/cobject.c

-  Python-$(PYTHON_VERSION)/Objects/codeobject.c

-  Python-$(PYTHON_VERSION)/Objects/complexobject.c

-  Python-$(PYTHON_VERSION)/Objects/descrobject.c

-  Python-$(PYTHON_VERSION)/Objects/dictobject.c

-  Python-$(PYTHON_VERSION)/Objects/enumobject.c

-  Python-$(PYTHON_VERSION)/Objects/exceptions.c

-  Python-$(PYTHON_VERSION)/Objects/fileobject.c

-  Python-$(PYTHON_VERSION)/Objects/floatobject.c

-  Python-$(PYTHON_VERSION)/Objects/frameobject.c

-  Python-$(PYTHON_VERSION)/Objects/funcobject.c

-  Python-$(PYTHON_VERSION)/Objects/genobject.c

-  Python-$(PYTHON_VERSION)/Objects/intobject.c

-  Python-$(PYTHON_VERSION)/Objects/iterobject.c

-  Python-$(PYTHON_VERSION)/Objects/listobject.c

-  Python-$(PYTHON_VERSION)/Objects/longobject.c

-  Python-$(PYTHON_VERSION)/Objects/memoryobject.c

-  Python-$(PYTHON_VERSION)/Objects/methodobject.c

-  Python-$(PYTHON_VERSION)/Objects/moduleobject.c

-  Python-$(PYTHON_VERSION)/Objects/object.c

-  Python-$(PYTHON_VERSION)/Objects/obmalloc.c

-  Python-$(PYTHON_VERSION)/Objects/rangeobject.c

-  Python-$(PYTHON_VERSION)/Objects/setobject.c

-  Python-$(PYTHON_VERSION)/Objects/sliceobject.c

-  Python-$(PYTHON_VERSION)/Objects/stringobject.c

-  Python-$(PYTHON_VERSION)/Objects/structseq.c

-  Python-$(PYTHON_VERSION)/Objects/tupleobject.c

-  Python-$(PYTHON_VERSION)/Objects/typeobject.c

-  Python-$(PYTHON_VERSION)/Objects/unicodectype.c

-  Python-$(PYTHON_VERSION)/Objects/unicodeobject.c

-  Python-$(PYTHON_VERSION)/Objects/weakrefobject.c

+  Python-2.7.2/Objects/abstract.c

+  Python-2.7.2/Objects/boolobject.c

+  Python-2.7.2/Objects/bufferobject.c

+  Python-2.7.2/Objects/bytearrayobject.c

+  Python-2.7.2/Objects/bytes_methods.c

+  Python-2.7.2/Objects/capsule.c

+  Python-2.7.2/Objects/cellobject.c

+  Python-2.7.2/Objects/classobject.c

+  Python-2.7.2/Objects/cobject.c

+  Python-2.7.2/Objects/codeobject.c

+  Python-2.7.2/Objects/complexobject.c

+  Python-2.7.2/Objects/descrobject.c

+  Python-2.7.2/Objects/dictobject.c

+  Python-2.7.2/Objects/enumobject.c

+  Python-2.7.2/Objects/exceptions.c

+  Python-2.7.2/Objects/fileobject.c

+  Python-2.7.2/Objects/floatobject.c

+  Python-2.7.2/Objects/frameobject.c

+  Python-2.7.2/Objects/funcobject.c

+  Python-2.7.2/Objects/genobject.c

+  Python-2.7.2/Objects/intobject.c

+  Python-2.7.2/Objects/iterobject.c

+  Python-2.7.2/Objects/listobject.c

+  Python-2.7.2/Objects/longobject.c

+  Python-2.7.2/Objects/memoryobject.c

+  Python-2.7.2/Objects/methodobject.c

+  Python-2.7.2/Objects/moduleobject.c

+  Python-2.7.2/Objects/object.c

+  Python-2.7.2/Objects/obmalloc.c

+  Python-2.7.2/Objects/rangeobject.c

+  Python-2.7.2/Objects/setobject.c

+  Python-2.7.2/Objects/sliceobject.c

+  Python-2.7.2/Objects/stringobject.c

+  Python-2.7.2/Objects/structseq.c

+  Python-2.7.2/Objects/tupleobject.c

+  Python-2.7.2/Objects/typeobject.c

+  Python-2.7.2/Objects/unicodectype.c

+  Python-2.7.2/Objects/unicodeobject.c

+  Python-2.7.2/Objects/weakrefobject.c

 

 [BuildOptions]

-   MSFT:*_*_IA32_CC_FLAGS         = /Oi- /wd4018 /wd4054 /wd4055 /wd4101 /wd4131 /wd4152 /wd4204 /wd4210 /wd4244 /wd4267 /wd4305 /wd4310 /wd4389 /wd4701 /wd4702 /wd4706 /I%WORKSPACE%\AppPkg\Applications\Python\Ia32 /I%WORKSPACE%\AppPkg\Applications\Python\Efi /I%WORKSPACE%\AppPkg\Applications\Python\Python-$(PYTHON_VERSION)\Include

-   MSFT:*_*_X64_CC_FLAGS          = /Oi- /wd4018 /wd4054 /wd4055 /wd4101 /wd4131 /wd4152 /wd4204 /wd4210 /wd4244 /wd4267 /wd4305 /wd4310 /wd4389 /wd4701 /wd4702 /wd4706 /I%WORKSPACE%\AppPkg\Applications\Python\X64 /I%WORKSPACE%\AppPkg\Applications\Python\Efi /I%WORKSPACE%\AppPkg\Applications\Python\Python-$(PYTHON_VERSION)\Include

-    GCC:*_*_IPF_SYMRENAME_FLAGS   = --redefine-syms=$WORKSPACE/StdLib/GccSymRename.txt

+   MSFT:*_*_IA32_CC_FLAGS         = /Oi- /wd4018 /wd4054 /wd4055 /wd4101 /wd4131 /wd4152 /wd4204 /wd4210 /wd4244 /wd4267 /wd4305 /wd4310 /wd4389 /wd4701 /wd4702 /wd4706 /I$(WORKSPACE)\AppPkg\Applications\Python\Ia32 /I$(WORKSPACE)\AppPkg\Applications\Python\Efi /I$(WORKSPACE)\AppPkg\Applications\Python\Python-2.7.2\Include

+   MSFT:*_*_X64_CC_FLAGS          = /Oi- /wd4018 /wd4054 /wd4055 /wd4101 /wd4131 /wd4152 /wd4204 /wd4210 /wd4244 /wd4267 /wd4305 /wd4310 /wd4389 /wd4701 /wd4702 /wd4706 /I$(WORKSPACE)\AppPkg\Applications\Python\X64 /I$(WORKSPACE)\AppPkg\Applications\Python\Efi /I$(WORKSPACE)\AppPkg\Applications\Python\Python-2.7.2\Include

+    GCC:*_*_IPF_SYMRENAME_FLAGS   = --redefine-syms=$(WORKSPACE)/StdLib/GccSymRename.txt