summaryrefslogtreecommitdiffstats
path: root/AppPkg
diff options
context:
space:
mode:
authordarylm503 <darylm503@6f19259b-4bc3-4df7-8a09-765794883524>2011-06-29 18:16:01 +0000
committerdarylm503 <darylm503@6f19259b-4bc3-4df7-8a09-765794883524>2011-06-29 18:16:01 +0000
commitaf9c2a563c88c6f2ed23178d2f6e9a01f2063a90 (patch)
treece9c8a15bfa076012d8078cf29f84ba1b4f2a579 /AppPkg
parent697aa37e3b9a6edb1472a3ecc37e923da185d83a (diff)
downloadedk2-af9c2a563c88c6f2ed23178d2f6e9a01f2063a90.tar.gz
edk2-af9c2a563c88c6f2ed23178d2f6e9a01f2063a90.tar.bz2
edk2-af9c2a563c88c6f2ed23178d2f6e9a01f2063a90.zip
Give Python/PythonCore.inf its own GUID.
Do not build Python by default since it requires manual preparation before it can be built. Update ReadMe.pdf to include information on configuring and building Python. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11930 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'AppPkg')
-rw-r--r--AppPkg/AppPkg.dsc11
-rw-r--r--AppPkg/Applications/Python/PythonCore.inf7
-rw-r--r--AppPkg/ReadMe.pdfbin87751 -> 131630 bytes
3 files changed, 8 insertions, 10 deletions
diff --git a/AppPkg/AppPkg.dsc b/AppPkg/AppPkg.dsc
index 6e2fa720b5..7bc8f85d92 100644
--- a/AppPkg/AppPkg.dsc
+++ b/AppPkg/AppPkg.dsc
@@ -93,7 +93,8 @@
[LibraryClasses.IA32]
TimerLib|PerformancePkg/Library/DxeTscTimerLib/DxeTscTimerLib.inf
- ## Comment out the above line and un-comment the line below for running under Nt32 emulation.
+ # To run in an emulation environment, such as Nt32Pkg, comment out the TimerLib
+ # description above and un-comment the line below.
# TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
[LibraryClasses.X64]
@@ -141,7 +142,9 @@
AppPkg/Applications/Hello/Hello.inf # No LibC includes or functions.
AppPkg/Applications/Main/Main.inf # Simple invocation. No other LibC functions.
AppPkg/Applications/Enquire/Enquire.inf
- AppPkg/Applications/Python/PythonCore.inf
+
+# After extracting the Python distribution, un-comment the following line to build Python.
+# AppPkg/Applications/Python/PythonCore.inf
################################################################
#
@@ -155,8 +158,8 @@
GCC:*_*_*_CC_FLAGS = -ffreestanding -nostdinc -nostdlib
# The Build Options, below, are only used when building the C library
-# to be run under the NT32 emulation. They disable the clock() system call
-# which is currently incompatible with the NT32 environment.
+# to be run under an emulation environment, such as Nt32Pkg. The clock()
+# system call is modified to return -1 indicating that it is unsupported.
# Just uncomment the lines below and select the correct TimerLib instance, above.
# INTEL:*_*_IA32_CC_FLAGS = /D NT32dvm
diff --git a/AppPkg/Applications/Python/PythonCore.inf b/AppPkg/Applications/Python/PythonCore.inf
index 79a30e0f1e..31e5442445 100644
--- a/AppPkg/Applications/Python/PythonCore.inf
+++ b/AppPkg/Applications/Python/PythonCore.inf
@@ -17,7 +17,7 @@
[Defines]
INF_VERSION = 0x00010006
BASE_NAME = Python
- FILE_GUID = 42f58b27-5dc3-4fa7-844d-5a7dbff06432
+ FILE_GUID = ca5627c4-51ba-4dcb-ac62-c076ebd37ddb
MODULE_TYPE = UEFI_APPLICATION
VERSION_STRING = 0.1
ENTRY_POINT = ShellCEntryLib
@@ -228,11 +228,6 @@
#EFI -- EFI specific code
Efi/config.c
Efi/getpathp.c
-# Efi/_subprocess.c
-# Efi/_winreg.c
-# Efi/dl_nt.c
-# Efi/import_nt.c
-# Efi/msvcrtmodule.c
[BuildOptions]
MSFT:*_*_*_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\Python-2.7.1\Include
diff --git a/AppPkg/ReadMe.pdf b/AppPkg/ReadMe.pdf
index 9dc6c0aae9..2ed66168ab 100644
--- a/AppPkg/ReadMe.pdf
+++ b/AppPkg/ReadMe.pdf
Binary files differ