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
f7dabd84
Commit
f7dabd84
authored
12 years ago
by
Antoine Pitrou
Browse files
Options
Browse Files
Download
Plain Diff
Merge
parents
a14bd005
0b2b583e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
14 deletions
+17
-14
Lib/test/crashers/losing_mro_ref.py
Lib/test/crashers/losing_mro_ref.py
+0
-0
PCbuild/pcbuild.sln
PCbuild/pcbuild.sln
+6
-6
Tools/msi/msi.py
Tools/msi/msi.py
+11
-8
No files found.
Lib/test/crashers/lo
o
sing_mro_ref.py
→
Lib/test/crashers/losing_mro_ref.py
View file @
f7dabd84
File moved
This diff is collapsed.
Click to expand it.
PCbuild/pcbuild.sln
View file @
f7dabd84
...
...
@@ -584,16 +584,16 @@ Global
{6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Release|x64.ActiveCfg = Release|x64
{6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Release|x64.Build.0 = Release|x64
{885D4898-D08D-4091-9C40-C700CFE3FC5A}.Debug|Win32.ActiveCfg = PGInstrument|Win32
{885D4898-D08D-4091-9C40-C700CFE3FC5A}.Debug|x64.ActiveCfg =
Debug
|x64
{885D4898-D08D-4091-9C40-C700CFE3FC5A}.Debug|x64.Build.0 =
Debug
|x64
{885D4898-D08D-4091-9C40-C700CFE3FC5A}.Debug|x64.ActiveCfg =
PGUpdate
|x64
{885D4898-D08D-4091-9C40-C700CFE3FC5A}.Debug|x64.Build.0 =
PGUpdate
|x64
{885D4898-D08D-4091-9C40-C700CFE3FC5A}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
{885D4898-D08D-4091-9C40-C700CFE3FC5A}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
{885D4898-D08D-4091-9C40-C700CFE3FC5A}.PGInstrument|x64.ActiveCfg =
Release
|x64
{885D4898-D08D-4091-9C40-C700CFE3FC5A}.PGInstrument|x64.Build.0 =
Release
|x64
{885D4898-D08D-4091-9C40-C700CFE3FC5A}.PGInstrument|x64.ActiveCfg =
PGInstrument
|x64
{885D4898-D08D-4091-9C40-C700CFE3FC5A}.PGInstrument|x64.Build.0 =
PGInstrument
|x64
{885D4898-D08D-4091-9C40-C700CFE3FC5A}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
{885D4898-D08D-4091-9C40-C700CFE3FC5A}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
{885D4898-D08D-4091-9C40-C700CFE3FC5A}.PGUpdate|x64.ActiveCfg =
Releas
e|x64
{885D4898-D08D-4091-9C40-C700CFE3FC5A}.PGUpdate|x64.Build.0 =
Releas
e|x64
{885D4898-D08D-4091-9C40-C700CFE3FC5A}.PGUpdate|x64.ActiveCfg =
PGUpdat
e|x64
{885D4898-D08D-4091-9C40-C700CFE3FC5A}.PGUpdate|x64.Build.0 =
PGUpdat
e|x64
{885D4898-D08D-4091-9C40-C700CFE3FC5A}.Release|Win32.ActiveCfg = Release|Win32
{885D4898-D08D-4091-9C40-C700CFE3FC5A}.Release|Win32.Build.0 = Release|Win32
{885D4898-D08D-4091-9C40-C700CFE3FC5A}.Release|x64.ActiveCfg = Release|x64
...
...
This diff is collapsed.
Click to expand it.
Tools/msi/msi.py
View file @
f7dabd84
...
...
@@ -6,7 +6,6 @@ from msilib import Feature, CAB, Directory, Dialog, Binary, add_data
import
uisample
from
win32com.client
import
constants
from
distutils.spawn
import
find_executable
from
uuids
import
product_codes
import
tempfile
# Settings can be overridden in config.py below
...
...
@@ -77,9 +76,6 @@ upgrade_code_64='{6A965A0C-6EE6-4E3A-9983-3263F56311EC}'
if
snapshot
:
current_version
=
"%s.%s.%s"
%
(
major
,
minor
,
int
(
time
.
time
()
/
3600
/
24
))
product_code
=
msilib
.
gen_uuid
()
else
:
product_code
=
product_codes
[
current_version
]
if
full_current_version
is
None
:
full_current_version
=
current_version
...
...
@@ -187,12 +183,19 @@ dll_path = os.path.join(srcdir, PCBUILD, dll_file)
msilib
.
set_arch_from_file
(
dll_path
)
if
msilib
.
pe_type
(
dll_path
)
!=
msilib
.
pe_type
(
"msisupport.dll"
):
raise
SystemError
(
"msisupport.dll for incorrect architecture"
)
if
msilib
.
Win64
:
upgrade_code
=
upgrade_code_64
# Bump the last digit of the code by one, so that 32-bit and 64-bit
# releases get separate product codes
digit
=
hex
((
int
(
product_code
[
-
2
],
16
)
+
1
)
%
16
)[
-
1
]
product_code
=
product_code
[:
-
2
]
+
digit
+
'}'
if
snapshot
:
product_code
=
msilib
.
gen_uuid
()
else
:
# official release: generate UUID from the download link that the file will have
import
uuid
product_code
=
uuid
.
uuid3
(
uuid
.
NAMESPACE_URL
,
'http://www.python.org/ftp/python/%s.%s.%s/python-%s%s.msi'
%
(
major
,
minor
,
micro
,
full_current_version
,
msilib
.
arch_ext
))
product_code
=
'{%s}'
%
product_code
if
testpackage
:
ext
=
'px'
...
...
This diff is collapsed.
Click to expand it.
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