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

diff --git a/AppPkg/AppPkg.dsc b/AppPkg/AppPkg.dsc
index 6e2fa720b556d22ed371915a7339b7c53a8f0263..7bc8f85d92268b88e54f2b70506e4924062a210f 100644 (file)
--- a/AppPkg/AppPkg.dsc
+++ b/AppPkg/AppPkg.dsc
@@ -93,7 +93,8 @@
 \r
 [LibraryClasses.IA32]\r
   TimerLib|PerformancePkg/Library/DxeTscTimerLib/DxeTscTimerLib.inf\r
 \r
 [LibraryClasses.IA32]\r
   TimerLib|PerformancePkg/Library/DxeTscTimerLib/DxeTscTimerLib.inf\r

-  ## Comment out the above line and un-comment the line below for running under Nt32 emulation.\r
+  # To run in an emulation environment, such as Nt32Pkg, comment out the TimerLib\r
+  # description above and un-comment the line below.\r

 #  TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf\r
 \r
 [LibraryClasses.X64]\r
 #  TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf\r
 \r
 [LibraryClasses.X64]\r


@@ -141,7 +142,9 @@
   AppPkg/Applications/Hello/Hello.inf        # No LibC includes or functions.\r
   AppPkg/Applications/Main/Main.inf          # Simple invocation. No other LibC functions.\r
   AppPkg/Applications/Enquire/Enquire.inf\r
   AppPkg/Applications/Hello/Hello.inf        # No LibC includes or functions.\r
   AppPkg/Applications/Main/Main.inf          # Simple invocation. No other LibC functions.\r
   AppPkg/Applications/Enquire/Enquire.inf\r

-  AppPkg/Applications/Python/PythonCore.inf\r
+\r
+# After extracting the Python distribution, un-comment the following line to build Python.\r
+#  AppPkg/Applications/Python/PythonCore.inf\r

 \r
 ################################################################\r
 #\r
 \r
 ################################################################\r
 #\r


@@ -155,8 +158,8 @@
     GCC:*_*_*_CC_FLAGS      = -ffreestanding -nostdinc -nostdlib\r
 \r
 # The Build Options, below, are only used when building the C library\r
     GCC:*_*_*_CC_FLAGS      = -ffreestanding -nostdinc -nostdlib\r
 \r
 # The Build Options, below, are only used when building the C library\r

-# to be run under the NT32 emulation.  They disable the clock() system call\r
-# which is currently incompatible with the NT32 environment.\r
+# to be run under an emulation environment, such as Nt32Pkg.  The clock()\r
+# system call is modified to return -1 indicating that it is unsupported.\r

 # Just uncomment the lines below and select the correct TimerLib instance, above.\r
 \r
   # INTEL:*_*_IA32_CC_FLAGS     = /D NT32dvm\r
 # Just uncomment the lines below and select the correct TimerLib instance, above.\r
 \r
   # INTEL:*_*_IA32_CC_FLAGS     = /D NT32dvm\r

diff --git a/AppPkg/Applications/Python/PythonCore.inf b/AppPkg/Applications/Python/PythonCore.inf
index 79a30e0f1e9594fd843af0bef68a9cb05234f5c9..31e5442445f0e5afcfbdae911d7d57e30b6c30ce 100644 (file)
--- a/AppPkg/Applications/Python/PythonCore.inf
+++ b/AppPkg/Applications/Python/PythonCore.inf
@@ -17,7 +17,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010006\r
   BASE_NAME                      = Python\r
 [Defines]\r
   INF_VERSION                    = 0x00010006\r
   BASE_NAME                      = Python\r

-  FILE_GUID                      = 42f58b27-5dc3-4fa7-844d-5a7dbff06432\r
+  FILE_GUID                      = ca5627c4-51ba-4dcb-ac62-c076ebd37ddb\r

   MODULE_TYPE                    = UEFI_APPLICATION\r
   VERSION_STRING                 = 0.1\r
   ENTRY_POINT                    = ShellCEntryLib\r
   MODULE_TYPE                    = UEFI_APPLICATION\r
   VERSION_STRING                 = 0.1\r
   ENTRY_POINT                    = ShellCEntryLib\r


@@ -228,11 +228,6 @@
 #EFI -- EFI specific code\r
   Efi/config.c\r
   Efi/getpathp.c\r
 #EFI -- EFI specific code\r
   Efi/config.c\r
   Efi/getpathp.c\r

-#  Efi/_subprocess.c\r
-#  Efi/_winreg.c\r
-#  Efi/dl_nt.c\r
-#  Efi/import_nt.c\r
-#  Efi/msvcrtmodule.c\r

 \r
 [BuildOptions]\r
    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\r
 \r
 [BuildOptions]\r
    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\r

diff --git a/AppPkg/ReadMe.pdf b/AppPkg/ReadMe.pdf
index 9dc6c0aae953a287d1c0ebaefd53934356bdeca9..2ed66168abe96dcbfb5ad21a4645ab4b933f5542 100644 (file)
Binary files a/AppPkg/ReadMe.pdf and b/AppPkg/ReadMe.pdf differ