* [edk2-libc Patch 0/1] Add IA32 support for Py3 packaging script
@ 2021-09-19 12:25 Jayaprakash, N
2021-09-19 12:25 ` [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script Jayaprakash, N
[not found] ` <16A638C89F9F20A4.6604@groups.io>
0 siblings, 2 replies; 12+ messages in thread
From: Jayaprakash, N @ 2021-09-19 12:25 UTC (permalink / raw)
To: devel
Jayaprakash Nevara (1):
AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3
package creation batch script
.../Python/Python-3.6.8/Py368ReadMe.txt | 4 +-
.../Python-3.6.8/create_python368_pkg.bat | 62 ++++++++++++-------
2 files changed, 41 insertions(+), 25 deletions(-)
--
2.32.0.windows.2
^ permalink raw reply [flat|nested] 12+ messages in thread* [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script 2021-09-19 12:25 [edk2-libc Patch 0/1] Add IA32 support for Py3 packaging script Jayaprakash, N @ 2021-09-19 12:25 ` Jayaprakash, N 2021-09-21 16:35 ` Rebecca Cran [not found] ` <16A638C89F9F20A4.6604@groups.io> 1 sibling, 1 reply; 12+ messages in thread From: Jayaprakash, N @ 2021-09-19 12:25 UTC (permalink / raw) To: devel; +Cc: Rebecca Cran, Michael D Kinney, Jayaprakash N 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 <rebecca@nuviainc.com> Cc: Michael D Kinney <michael.d.kinney@intel.com> Signed-off-by: Jayaprakash N <n.jayaprakash@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% -- 2.32.0.windows.2 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script 2021-09-19 12:25 ` [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script Jayaprakash, N @ 2021-09-21 16:35 ` Rebecca Cran 2021-09-22 2:33 ` [edk2-devel] " Jayaprakash, N [not found] ` <16A7043165EA916C.27516@groups.io> 0 siblings, 2 replies; 12+ messages in thread From: Rebecca Cran @ 2021-09-21 16:35 UTC (permalink / raw) To: Jayaprakash Nevara, devel; +Cc: Michael D Kinney 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 <rebecca@nuviainc.com> > Cc: Michael D Kinney <michael.d.kinney@intel.com> > Signed-off-by: Jayaprakash N <n.jayaprakash@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% ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [edk2-devel] [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script 2021-09-21 16:35 ` Rebecca Cran @ 2021-09-22 2:33 ` Jayaprakash, N 2021-09-23 1:29 ` Rebecca Cran [not found] ` <16A7043165EA916C.27516@groups.io> 1 sibling, 1 reply; 12+ messages in thread From: Jayaprakash, N @ 2021-09-22 2:33 UTC (permalink / raw) To: devel@edk2.groups.io, rebecca@nuviainc.com; +Cc: Kinney, Michael D Hi Rebecca, Can I resubmit the patch after making these changes in the same development branch or does it require creating a new branch? Regards, JP -----Original Message----- From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Rebecca Cran Sent: 21 September 2021 22:05 To: Jayaprakash, N <n.jayaprakash@intel.com>; devel@edk2.groups.io Cc: Kinney, Michael D <michael.d.kinney@intel.com> Subject: Re: [edk2-devel] [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script 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 <rebecca@nuviainc.com> > Cc: Michael D Kinney <michael.d.kinney@intel.com> > Signed-off-by: Jayaprakash N <n.jayaprakash@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% ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [edk2-devel] [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script 2021-09-22 2:33 ` [edk2-devel] " Jayaprakash, N @ 2021-09-23 1:29 ` Rebecca Cran 2021-09-23 4:22 ` Jayaprakash, N 0 siblings, 1 reply; 12+ messages in thread From: Rebecca Cran @ 2021-09-23 1:29 UTC (permalink / raw) To: Jayaprakash, N, devel@edk2.groups.io; +Cc: Kinney, Michael D You should be able to use the same branch. -- Rebecca Cran On 9/21/21 8:33 PM, Jayaprakash, N wrote: > Hi Rebecca, > > Can I resubmit the patch after making these changes in the same development branch or does it require creating a new branch? > > Regards, > JP > > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Rebecca Cran > Sent: 21 September 2021 22:05 > To: Jayaprakash, N <n.jayaprakash@intel.com>; devel@edk2.groups.io > Cc: Kinney, Michael D <michael.d.kinney@intel.com> > Subject: Re: [edk2-devel] [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script > > 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 <rebecca@nuviainc.com> >> Cc: Michael D Kinney <michael.d.kinney@intel.com> >> Signed-off-by: Jayaprakash N <n.jayaprakash@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% > > > > ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [edk2-devel] [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script 2021-09-23 1:29 ` Rebecca Cran @ 2021-09-23 4:22 ` Jayaprakash, N 2021-09-23 18:32 ` Rebecca Cran 0 siblings, 1 reply; 12+ messages in thread From: Jayaprakash, N @ 2021-09-23 4:22 UTC (permalink / raw) To: Rebecca Cran, devel@edk2.groups.io; +Cc: Kinney, Michael D Thank you Rebecca. I have submitted the updated patch for review. Regards, JP -----Original Message----- From: Rebecca Cran <rebecca@nuviainc.com> Sent: 23 September 2021 06:59 To: Jayaprakash, N <n.jayaprakash@intel.com>; devel@edk2.groups.io Cc: Kinney, Michael D <michael.d.kinney@intel.com> Subject: Re: [edk2-devel] [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script You should be able to use the same branch. -- Rebecca Cran On 9/21/21 8:33 PM, Jayaprakash, N wrote: > Hi Rebecca, > > Can I resubmit the patch after making these changes in the same development branch or does it require creating a new branch? > > Regards, > JP > > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Rebecca Cran > Sent: 21 September 2021 22:05 > To: Jayaprakash, N <n.jayaprakash@intel.com>; devel@edk2.groups.io > Cc: Kinney, Michael D <michael.d.kinney@intel.com> > Subject: Re: [edk2-devel] [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script > > 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 <rebecca@nuviainc.com> >> Cc: Michael D Kinney <michael.d.kinney@intel.com> >> Signed-off-by: Jayaprakash N <n.jayaprakash@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% > > > > ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [edk2-devel] [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script 2021-09-23 4:22 ` Jayaprakash, N @ 2021-09-23 18:32 ` Rebecca Cran 2021-09-24 8:04 ` Jayaprakash, N 0 siblings, 1 reply; 12+ messages in thread From: Rebecca Cran @ 2021-09-23 18:32 UTC (permalink / raw) To: Jayaprakash, N, devel@edk2.groups.io; +Cc: Kinney, Michael D Sorry I don't see it. Could you re-send it with "PATCH v2" in the subject line (by passing -v2 to "git format-patch") if you didn't already please? -- Rebecca Cran On 9/22/21 10:22 PM, Jayaprakash, N wrote: > Thank you Rebecca. > I have submitted the updated patch for review. > > Regards, > JP > > -----Original Message----- > From: Rebecca Cran <rebecca@nuviainc.com> > Sent: 23 September 2021 06:59 > To: Jayaprakash, N <n.jayaprakash@intel.com>; devel@edk2.groups.io > Cc: Kinney, Michael D <michael.d.kinney@intel.com> > Subject: Re: [edk2-devel] [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script > > You should be able to use the same branch. > > ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [edk2-devel] [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script 2021-09-23 18:32 ` Rebecca Cran @ 2021-09-24 8:04 ` Jayaprakash, N 2021-10-04 0:35 ` Jayaprakash, N 0 siblings, 1 reply; 12+ messages in thread From: Jayaprakash, N @ 2021-09-24 8:04 UTC (permalink / raw) To: devel@edk2.groups.io, rebecca@nuviainc.com; +Cc: Kinney, Michael D Apologies, I have already shared the patch. I will take this input for future patches. Regards, JP -----Original Message----- From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Rebecca Cran Sent: 24 September 2021 00:02 To: Jayaprakash, N <n.jayaprakash@intel.com>; devel@edk2.groups.io Cc: Kinney, Michael D <michael.d.kinney@intel.com> Subject: Re: [edk2-devel] [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script Sorry I don't see it. Could you re-send it with "PATCH v2" in the subject line (by passing -v2 to "git format-patch") if you didn't already please? -- Rebecca Cran On 9/22/21 10:22 PM, Jayaprakash, N wrote: > Thank you Rebecca. > I have submitted the updated patch for review. > > Regards, > JP > > -----Original Message----- > From: Rebecca Cran <rebecca@nuviainc.com> > Sent: 23 September 2021 06:59 > To: Jayaprakash, N <n.jayaprakash@intel.com>; devel@edk2.groups.io > Cc: Kinney, Michael D <michael.d.kinney@intel.com> > Subject: Re: [edk2-devel] [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script > > You should be able to use the same branch. > > ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [edk2-devel] [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script 2021-09-24 8:04 ` Jayaprakash, N @ 2021-10-04 0:35 ` Jayaprakash, N 2021-10-14 3:48 ` Rebecca Cran 0 siblings, 1 reply; 12+ messages in thread From: Jayaprakash, N @ 2021-10-04 0:35 UTC (permalink / raw) To: devel@edk2.groups.io, rebecca@nuviainc.com; +Cc: Kinney, Michael D Hi Rebecca / Mike, Could you look into this? Regards, JP -----Original Message----- From: Jayaprakash, N Sent: 24 September 2021 13:34 To: devel@edk2.groups.io; rebecca@nuviainc.com Cc: Kinney, Michael D <michael.d.kinney@intel.com> Subject: RE: [edk2-devel] [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script Apologies, I have already shared the patch. I will take this input for future patches. Regards, JP -----Original Message----- From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Rebecca Cran Sent: 24 September 2021 00:02 To: Jayaprakash, N <n.jayaprakash@intel.com>; devel@edk2.groups.io Cc: Kinney, Michael D <michael.d.kinney@intel.com> Subject: Re: [edk2-devel] [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script Sorry I don't see it. Could you re-send it with "PATCH v2" in the subject line (by passing -v2 to "git format-patch") if you didn't already please? -- Rebecca Cran On 9/22/21 10:22 PM, Jayaprakash, N wrote: > Thank you Rebecca. > I have submitted the updated patch for review. > > Regards, > JP > > -----Original Message----- > From: Rebecca Cran <rebecca@nuviainc.com> > Sent: 23 September 2021 06:59 > To: Jayaprakash, N <n.jayaprakash@intel.com>; devel@edk2.groups.io > Cc: Kinney, Michael D <michael.d.kinney@intel.com> > Subject: Re: [edk2-devel] [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script > > You should be able to use the same branch. > > ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [edk2-devel] [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script 2021-10-04 0:35 ` Jayaprakash, N @ 2021-10-14 3:48 ` Rebecca Cran 0 siblings, 0 replies; 12+ messages in thread From: Rebecca Cran @ 2021-10-14 3:48 UTC (permalink / raw) To: Jayaprakash, N, devel@edk2.groups.io; +Cc: Kinney, Michael D Sorry for the delay. I can't see the copy of the patch you sent out: could you send it again, this time marking it as v2 please? Since it's sent out via email there's no problem with duplicates. -- Rebecca Cran On 10/3/21 6:35 PM, Jayaprakash, N wrote: > Hi Rebecca / Mike, > > Could you look into this? > > Regards, > JP > > -----Original Message----- > From: Jayaprakash, N > Sent: 24 September 2021 13:34 > To: devel@edk2.groups.io; rebecca@nuviainc.com > Cc: Kinney, Michael D <michael.d.kinney@intel.com> > Subject: RE: [edk2-devel] [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script > > Apologies, I have already shared the patch. > I will take this input for future patches. > > Regards, > JP > > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Rebecca Cran > Sent: 24 September 2021 00:02 > To: Jayaprakash, N <n.jayaprakash@intel.com>; devel@edk2.groups.io > Cc: Kinney, Michael D <michael.d.kinney@intel.com> > Subject: Re: [edk2-devel] [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script > > Sorry I don't see it. Could you re-send it with "PATCH v2" in the subject line (by passing -v2 to "git format-patch") if you didn't already please? > > > -- > Rebecca Cran > > > On 9/22/21 10:22 PM, Jayaprakash, N wrote: >> Thank you Rebecca. >> I have submitted the updated patch for review. >> >> Regards, >> JP >> >> -----Original Message----- >> From: Rebecca Cran <rebecca@nuviainc.com> >> Sent: 23 September 2021 06:59 >> To: Jayaprakash, N <n.jayaprakash@intel.com>; devel@edk2.groups.io >> Cc: Kinney, Michael D <michael.d.kinney@intel.com> >> Subject: Re: [edk2-devel] [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script >> >> You should be able to use the same branch. >> >> > > > > ^ permalink raw reply [flat|nested] 12+ messages in thread
[parent not found: <16A7043165EA916C.27516@groups.io>]
* Re: [edk2-devel] [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script [not found] ` <16A7043165EA916C.27516@groups.io> @ 2021-09-22 13:05 ` Jayaprakash, N 0 siblings, 0 replies; 12+ messages in thread From: Jayaprakash, N @ 2021-09-22 13:05 UTC (permalink / raw) To: devel@edk2.groups.io, Jayaprakash, N, rebecca@nuviainc.com Cc: Kinney, Michael D Hi Rebecca, I have resubmitted the patch with the changes suggested. Thank you, JP -----Original Message----- From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Jayaprakash, N Sent: 22 September 2021 08:03 To: devel@edk2.groups.io; rebecca@nuviainc.com Cc: Kinney, Michael D <michael.d.kinney@intel.com> Subject: Re: [edk2-devel] [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script Hi Rebecca, Can I resubmit the patch after making these changes in the same development branch or does it require creating a new branch? Regards, JP -----Original Message----- From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Rebecca Cran Sent: 21 September 2021 22:05 To: Jayaprakash, N <n.jayaprakash@intel.com>; devel@edk2.groups.io Cc: Kinney, Michael D <michael.d.kinney@intel.com> Subject: Re: [edk2-devel] [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script 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 <rebecca@nuviainc.com> > Cc: Michael D Kinney <michael.d.kinney@intel.com> > Signed-off-by: Jayaprakash N <n.jayaprakash@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% ^ permalink raw reply [flat|nested] 12+ messages in thread
[parent not found: <16A638C89F9F20A4.6604@groups.io>]
* Re: [edk2-devel] [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script [not found] ` <16A638C89F9F20A4.6604@groups.io> @ 2021-09-21 14:37 ` Jayaprakash, N 0 siblings, 0 replies; 12+ messages in thread From: Jayaprakash, N @ 2021-09-21 14:37 UTC (permalink / raw) To: devel@edk2.groups.io, Jayaprakash, N; +Cc: Rebecca Cran, Kinney, Michael D Hi Rebecca, This another patch submitted to add IA32 support for py3 UEFI package creation batch script. Would you be able to review and merge this change? Regards, JP -----Original Message----- From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Jayaprakash, N Sent: 19 September 2021 17:55 To: devel@edk2.groups.io Cc: Rebecca Cran <rebecca@nuviainc.com>; Kinney, Michael D <michael.d.kinney@intel.com>; Jayaprakash, N <n.jayaprakash@intel.com> Subject: [edk2-devel] [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script 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 <rebecca@nuviainc.com> Cc: Michael D Kinney <michael.d.kinney@intel.com> Signed-off-by: Jayaprakash N <n.jayaprakash@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% -- 2.32.0.windows.2 ^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2021-10-14 3:48 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-19 12:25 [edk2-libc Patch 0/1] Add IA32 support for Py3 packaging script Jayaprakash, N
2021-09-19 12:25 ` [edk2-libc Patch 1/1] AppPkg/Applications/Python/Python3.6.8: add IA32 support for py3 package creation batch script Jayaprakash, N
2021-09-21 16:35 ` Rebecca Cran
2021-09-22 2:33 ` [edk2-devel] " Jayaprakash, N
2021-09-23 1:29 ` Rebecca Cran
2021-09-23 4:22 ` Jayaprakash, N
2021-09-23 18:32 ` Rebecca Cran
2021-09-24 8:04 ` Jayaprakash, N
2021-10-04 0:35 ` Jayaprakash, N
2021-10-14 3:48 ` Rebecca Cran
[not found] ` <16A7043165EA916C.27516@groups.io>
2021-09-22 13:05 ` Jayaprakash, N
[not found] ` <16A638C89F9F20A4.6604@groups.io>
2021-09-21 14:37 ` Jayaprakash, N
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox