Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
aa25d5d0
Commit
aa25d5d0
authored
Apr 12, 2019
by
Paul Monson
Committed by
Steve Dower
Apr 12, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable building nuget packages for ARM32 (GH-12669)
parent
b75b1a35
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
3 deletions
+36
-3
Tools/nuget/build.bat
Tools/nuget/build.bat
+16
-3
Tools/nuget/make_pkg.proj
Tools/nuget/make_pkg.proj
+1
-0
Tools/nuget/pythonarm32.nuspec
Tools/nuget/pythonarm32.nuspec
+19
-0
No files found.
Tools/nuget/build.bat
View file @
aa25d5d0
...
...
@@ -6,20 +6,24 @@ if "%Py_OutDir%"=="" set Py_OutDir=%PCBUILD%
set
BUILDX86
=
set
BUILDX64
=
set
BUILDARM32
=
set
REBUILD
=
set
OUTPUT
=
set
PACKAGES
=
set
PYTHON_EXE
=
:CheckOpts
if
"
%
~1"
EQU
"-h"
goto
Help
if
"
%
~1"
EQU
"-x86"
(
set
BUILDX86
=
1
)
&&
shift
&&
goto
CheckOpts
if
"
%
~1"
EQU
"-x64"
(
set
BUILDX64
=
1
)
&&
shift
&&
goto
CheckOpts
if
"
%
~1"
EQU
"-arm32"
(
set
BUILDARM32
=
1
)
&&
shift
&&
goto
CheckOpts
if
"
%
~1"
EQU
"-r"
(
set
REBUILD
=
-r
)
&&
shift
&&
goto
CheckOpts
if
"
%
~1"
EQU
"-o"
(
set
OUTPUT
=
"/p:OutputPath=
%
~2"
)
&&
shift
&&
shift
&&
goto
CheckOpts
if
"
%
~1"
EQU
"--out"
(
set
OUTPUT
=
"/p:OutputPath=
%
~2"
)
&&
shift
&&
shift
&&
goto
CheckOpts
if
"
%
~1"
EQU
"-p"
(
set
PACKAGES
=
%PACKAGES%
%
~
2
)
&&
shift
&&
shift
&&
goto
CheckOpts
if
"
%
~1"
EQU
"--python-exe"
(
set
PYTHON_EXE
=
"/p:PythonExe=
%
~2"
)
&&
shift
&&
shift
&&
goto
CheckOpts
if
not
defined
BUILDX86
if
not
defined
BUILDX64
(
set
BUILDX86
=
1
)
&&
(
set
BUILDX64
=
1
)
if
not
defined
BUILDX86
if
not
defined
BUILDX64
if
not
defined
BUILDARM32
(
set
BUILDX86
=
1
)
&&
(
set
BUILDX64
=
1
)
&&
(
set
BUILDARM32
=
1
)
call
"
%D%
..\msi\get_externals.bat"
call
"
%PCBUILD%
find_msbuild.bat"
%MSBUILD%
...
...
@@ -32,7 +36,7 @@ if defined BUILDX86 (
)
else
if
not
exist
"
%Py_OutDir%
win32\python.exe"
call
"
%PCBUILD%
build.bat"
-e
if
errorlevel
1
goto
:eof
%MSBUILD%
"
%D%
make_pkg.proj"
/p
:Configuration
=
Release
/p
:Platform
=
x86
%OUTPUT%
%PACKAGES%
%MSBUILD%
"
%D%
make_pkg.proj"
/p
:Configuration
=
Release
/p
:Platform
=
x86
%OUTPUT%
%PACKAGES%
%PYTHON_EXE%
if
errorlevel
1
goto
:eof
)
...
...
@@ -41,7 +45,16 @@ if defined BUILDX64 (
)
else
if
not
exist
"
%Py_OutDir%
amd64\python.exe"
call
"
%PCBUILD%
build.bat"
-p
x64
-e
if
errorlevel
1
goto
:eof
%MSBUILD%
"
%D%
make_pkg.proj"
/p
:Configuration
=
Release
/p
:Platform
=
x64
%OUTPUT%
%PACKAGES%
%MSBUILD%
"
%D%
make_pkg.proj"
/p
:Configuration
=
Release
/p
:Platform
=
x64
%OUTPUT%
%PACKAGES%
%PYTHON_EXE%
if
errorlevel
1
goto
:eof
)
if
defined
BUILDARM32
(
if
defined
REBUILD
(
call
"
%PCBUILD%
build.bat"
-p
ARM
-e -r
-
-no-tkinter
)
else
if
not
exist
"
%Py_OutDir%
arm32\python.exe"
call
"
%PCBUILD%
build.bat"
-p
ARM
-e
-
-no-tkinter
if
errorlevel
1
goto
:eof
%MSBUILD%
"
%D%
make_pkg.proj"
/p
:Configuration
=
Release
/p
:Platform
=
ARM
%OUTPUT%
%PACKAGES%
%PYTHON_EXE%
if
errorlevel
1
goto
:eof
)
...
...
Tools/nuget/make_pkg.proj
View file @
aa25d5d0
...
...
@@ -4,6 +4,7 @@
<ProjectGuid>
{10487945-15D1-4092-A214-338395C4116B}
</ProjectGuid>
<OutputName>
python
</OutputName>
<OutputName
Condition=
"$(Platform) == 'x86'"
>
$(OutputName)x86
</OutputName>
<OutputName
Condition=
"$(Platform) == 'ARM'"
>
$(OutputName)arm32
</OutputName>
<OutputName
Condition=
"$(BuildForDaily) == 'true'"
>
$(OutputName)daily
</OutputName>
<OutputSuffix></OutputSuffix>
<SupportSigning>
false
</SupportSigning>
...
...
Tools/nuget/pythonarm32.nuspec
0 → 100644
View file @
aa25d5d0
<?xml version="1.0"?>
<package
>
<metadata>
<id>
pythonarm32
</id>
<title>
Python (ARM32)
</title>
<authors>
Python Software Foundation
</authors>
<version>
0.0.0.0
</version>
<licenseUrl>
https://docs.python.org/3/license.html
</licenseUrl>
<projectUrl>
https://www.python.org/
</projectUrl>
<requireLicenseAcceptance>
false
</requireLicenseAcceptance>
<description>
Installs Python ARM32 for use in build scenarios.
</description>
<iconUrl>
https://www.python.org/static/favicon.ico
</iconUrl>
<tags>
python
</tags>
</metadata>
<files>
<file
src=
"**\*"
exclude=
"python.props"
target=
"tools"
/>
<file
src=
"python.props"
target=
"build\native"
/>
</files>
</package>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment