There are several lines with trailing whitespace. Could you fix them please?
> git diff | grep " $"
+echo Invalid command line arguments passed, please see the below usage
instructions
+ mkdir %OUT_FOLDER%\EFI\Tools
+)
+if not exist %OUT_FOLDER%\EFI\StdLib\lib\python36.8 (
+ echo Python EFI package available at %OUT_FOLDER%
+echo Then use this script to create a Python EFI package
On 9/19/21 6:25 AM, Jayaprakash Nevara wrote:
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3638
This change is to add IA32 support into py3 EFI package
creation batch script. Enhanced the script take Architecture
as an additional parameter. With this the script can be used
to create deployable Python 3.6.8 EFI package from X64 and IA32 builds
as required by the user
Cc: Rebecca Cran <rebe...@nuviainc.com>
Cc: Michael D Kinney <michael.d.kin...@intel.com>
Signed-off-by: Jayaprakash N <n.jayaprak...@intel.com>
---
.../Python/Python-3.6.8/Py368ReadMe.txt | 4 +-
.../Python-3.6.8/create_python368_pkg.bat | 62 ++++++++++++-------
2 files changed, 41 insertions(+), 25 deletions(-)
diff --git a/AppPkg/Applications/Python/Python-3.6.8/Py368ReadMe.txt
b/AppPkg/Applications/Python/Python-3.6.8/Py368ReadMe.txt
index 94dbccc..8f4fdc6 100644
--- a/AppPkg/Applications/Python/Python-3.6.8/Py368ReadMe.txt
+++ b/AppPkg/Applications/Python/Python-3.6.8/Py368ReadMe.txt
@@ -118,11 +118,11 @@ system as follows:
A script, create_python368_pkg.bat , is provided which facilitates the
population
of the target EFI package. Execute this script from within the
AppPkg/Applications/Python/Python-3.6.8 directory, providing the Tool
Chain, Target
- Build and destination directory which is the path to the destination
directory.
+ Build, Architecture and Directory path to the destination directory.
The appropriate contents of the AppPkg/Applications/Python/Python-3.6.8/Lib
and
Python368.efi Application from Build/AppPkg/RELEASE_VS2017/X64/ will be
^^^^^^^^^^^^^^
- copied into the specified destination directory.
+ copied into the specified Destination directory.
Replace "RELEASE_VS2017", in the source path, with values appropriate for your tool chain.
diff --git a/AppPkg/Applications/Python/Python-3.6.8/create_python368_pkg.bat b/AppPkg/Applications/Python/Python-3.6.8/create_python368_pkg.bat
index 6bbdbd9..2bb62b6 100644
--- a/AppPkg/Applications/Python/Python-3.6.8/create_python368_pkg.bat
+++ b/AppPkg/Applications/Python/Python-3.6.8/create_python368_pkg.bat
@@ -2,47 +2,63 @@
set TOOL_CHAIN_TAG=%1
set TARGET=%2
-set OUT_FOLDER=%3
+set ARCH=%3
+set OUT_FOLDER=%4
if "%TOOL_CHAIN_TAG%"=="" goto usage
if "%TARGET%"=="" goto usage
+if "%ARCH%"=="" goto usage
if "%OUT_FOLDER%"=="" goto usage
goto continue
:usage
echo.
+echo Batch Script to create Python EFI Package.
echo.
+echo Invalid command line arguments passed, please see the below usage
instructions
echo.
-echo Creates Python EFI Package.
-echo.
-echo "Usage: %0 <ToolChain> <Target> <OutFolder>"
-echo.
-echo ToolChain = one of VS2013x86, VS2015x86, VS2017, VS2019
-echo Target = one of RELEASE, DEBUG
-echo OutFolder = Target folder where package needs to create
-echo.
+echo "Usage: %0 <ToolChain> <Target> <Architecture> <OutFolder>"
echo.
+echo ToolChain = one of VS2013x86, VS2015x86, VS2017, VS2019
+echo Target = one of RELEASE, DEBUG
+echo Architecture = one of IA32, X64
+echo OutFolder = Output directory for creating the package
echo.
goto :eof
:continue
cd ..\..\..\..\
-IF NOT EXIST Build\AppPkg\%TARGET%_%TOOL_CHAIN_TAG%\X64\Python368.efi goto
error
-mkdir %OUT_FOLDER%\EFI\Tools
-xcopy Build\AppPkg\%TARGET%_%TOOL_CHAIN_TAG%\X64\Python368.efi
%OUT_FOLDER%\EFI\Tools\ /y
-mkdir %OUT_FOLDER%\EFI\StdLib\lib\python36.8
-mkdir %OUT_FOLDER%\EFI\StdLib\etc
-xcopy AppPkg\Applications\Python\Python-3.6.8\Lib\*
%OUT_FOLDER%\EFI\StdLib\lib\python36.8\ /Y /S /I
-xcopy StdLib\Efi\StdLib\etc\* %OUT_FOLDER%\EFI\StdLib\etc\ /Y /S /I
-goto all_done
-
-:error
-echo Failed to Create Python 3.6.8 Package, Python368.efi is not available on
build location Build\AppPkg\%TARGET%_%TOOL_CHAIN_TAG%\X64\
+if not exist Build\AppPkg\%TARGET%_%TOOL_CHAIN_TAG%\%ARCH%\Python368.efi (
+ goto error
+)
+if not exist %OUT_FOLDER%\EFI\Tools (
+ mkdir %OUT_FOLDER%\EFI\Tools
+)
+xcopy Build\AppPkg\%TARGET%_%TOOL_CHAIN_TAG%\%ARCH%\Python368.efi
%OUT_FOLDER%\EFI\Tools\ /y
-:all_done
-exit /b %ec%
-
+if not exist %OUT_FOLDER%\EFI\StdLib\lib\python36.8 (
+ mkdir %OUT_FOLDER%\EFI\StdLib\lib\python36.8
+)
+if not exist %OUT_FOLDER%\EFI\StdLib\etc (
+ mkdir %OUT_FOLDER%\EFI\StdLib\etc
+)
+xcopy AppPkg\Applications\Python\Python-3.6.8\Lib\*
%OUT_FOLDER%\EFI\StdLib\lib\python36.8\ /Y /S /I
+xcopy StdLib\Efi\StdLib\etc\* %OUT_FOLDER%\EFI\StdLib\etc\ /Y /S /I
+echo.
+if not x%OUT_FOLDER::=%==x%OUT_FOLDER% (
+ echo Python EFI package available at %OUT_FOLDER%
+) else (
+ echo Python EFI package available at %CD%\%OUT_FOLDER%
+)
+goto all_done
+:error
+echo Failed to Create Python EFI Package
+echo Python368.efi is not available at
Build\AppPkg\%TARGET%_%TOOL_CHAIN_TAG%\%ARCH%\
+echo Follow the instructions in Py368ReadMe.txt to build Python interpreter
+echo Then use this script to create a Python EFI package
+:all_done
+exit /b %ERRORLEVEL%
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#80936): https://edk2.groups.io/g/devel/message/80936
Mute This Topic: https://groups.io/mt/85716779/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
