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
6727b3c2
Commit
6727b3c2
authored
Sep 05, 2015
by
Steve Dower
Browse files
Options
Browse Files
Download
Plain Diff
Issue #24910: Windows MSIs now have unique display names.
parents
8820a350
f3f2d372
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
13 additions
and
11 deletions
+13
-11
Misc/NEWS
Misc/NEWS
+2
-0
Tools/msi/core/core_d.wxs
Tools/msi/core/core_d.wxs
+1
-1
Tools/msi/core/core_pdb.wxs
Tools/msi/core/core_pdb.wxs
+1
-1
Tools/msi/dev/dev_d.wxs
Tools/msi/dev/dev_d.wxs
+1
-1
Tools/msi/exe/exe_d.wxs
Tools/msi/exe/exe_d.wxs
+1
-1
Tools/msi/exe/exe_pdb.wxs
Tools/msi/exe/exe_pdb.wxs
+1
-1
Tools/msi/lib/lib_d.wxs
Tools/msi/lib/lib_d.wxs
+1
-1
Tools/msi/lib/lib_pdb.wxs
Tools/msi/lib/lib_pdb.wxs
+1
-1
Tools/msi/tcltk/tcltk_d.wxs
Tools/msi/tcltk/tcltk_d.wxs
+1
-1
Tools/msi/tcltk/tcltk_pdb.wxs
Tools/msi/tcltk/tcltk_pdb.wxs
+1
-1
Tools/msi/test/test_d.wxs
Tools/msi/test/test_d.wxs
+1
-1
Tools/msi/test/test_pdb.wxs
Tools/msi/test/test_pdb.wxs
+1
-1
No files found.
Misc/NEWS
View file @
6727b3c2
...
...
@@ -155,6 +155,8 @@ Tests
Build
-----
- Issue #24910: Windows MSIs now have unique display names.
- Issue #24986: It is now possible to build Python on Windows without errors
when external libraries are not available.
...
...
Tools/msi/core/core_d.wxs
View file @
6727b3c2
<?xml version="1.0" encoding="UTF-8"?>
<Wix
xmlns=
"http://schemas.microsoft.com/wix/2006/wi"
>
<Product
Id=
"*"
Language=
"!(loc.LCID)"
Name=
"!(loc.Title)"
Version=
"$(var.Version)"
Manufacturer=
"!(loc.Manufacturer)"
UpgradeCode=
"$(var.UpgradeCode)"
>
<Product
Id=
"*"
Language=
"!(loc.LCID)"
Name=
"!(loc.Title
_d
)"
Version=
"$(var.Version)"
Manufacturer=
"!(loc.Manufacturer)"
UpgradeCode=
"$(var.UpgradeCode)"
>
<Package
InstallerVersion=
"300"
Compressed=
"yes"
InstallScope=
"perUser"
Platform=
"$(var.Platform)"
/>
<MediaTemplate
EmbedCab=
"yes"
CompressionLevel=
"high"
/>
...
...
Tools/msi/core/core_pdb.wxs
View file @
6727b3c2
<?xml version="1.0" encoding="UTF-8"?>
<Wix
xmlns=
"http://schemas.microsoft.com/wix/2006/wi"
>
<Product
Id=
"*"
Language=
"!(loc.LCID)"
Name=
"!(loc.Title)"
Version=
"$(var.Version)"
Manufacturer=
"!(loc.Manufacturer)"
UpgradeCode=
"$(var.UpgradeCode)"
>
<Product
Id=
"*"
Language=
"!(loc.LCID)"
Name=
"!(loc.Title
Pdb
)"
Version=
"$(var.Version)"
Manufacturer=
"!(loc.Manufacturer)"
UpgradeCode=
"$(var.UpgradeCode)"
>
<Package
InstallerVersion=
"300"
Compressed=
"yes"
InstallScope=
"perUser"
Platform=
"$(var.Platform)"
/>
<MediaTemplate
EmbedCab=
"yes"
CompressionLevel=
"high"
/>
...
...
Tools/msi/dev/dev_d.wxs
View file @
6727b3c2
<?xml version="1.0" encoding="UTF-8"?>
<Wix
xmlns=
"http://schemas.microsoft.com/wix/2006/wi"
>
<Product
Id=
"*"
Language=
"!(loc.LCID)"
Name=
"!(loc.Title)"
Version=
"$(var.Version)"
Manufacturer=
"!(loc.Manufacturer)"
UpgradeCode=
"$(var.UpgradeCode)"
>
<Product
Id=
"*"
Language=
"!(loc.LCID)"
Name=
"!(loc.Title
_d
)"
Version=
"$(var.Version)"
Manufacturer=
"!(loc.Manufacturer)"
UpgradeCode=
"$(var.UpgradeCode)"
>
<Package
InstallerVersion=
"300"
Compressed=
"yes"
InstallScope=
"perUser"
Platform=
"$(var.Platform)"
/>
<MediaTemplate
EmbedCab=
"yes"
CompressionLevel=
"high"
/>
...
...
Tools/msi/exe/exe_d.wxs
View file @
6727b3c2
<?xml version="1.0" encoding="UTF-8"?>
<Wix
xmlns=
"http://schemas.microsoft.com/wix/2006/wi"
>
<Product
Id=
"*"
Language=
"!(loc.LCID)"
Name=
"!(loc.Title)"
Version=
"$(var.Version)"
Manufacturer=
"!(loc.Manufacturer)"
UpgradeCode=
"$(var.UpgradeCode)"
>
<Product
Id=
"*"
Language=
"!(loc.LCID)"
Name=
"!(loc.Title
_d
)"
Version=
"$(var.Version)"
Manufacturer=
"!(loc.Manufacturer)"
UpgradeCode=
"$(var.UpgradeCode)"
>
<Package
InstallerVersion=
"300"
Compressed=
"yes"
InstallScope=
"perUser"
Platform=
"$(var.Platform)"
/>
<MediaTemplate
EmbedCab=
"yes"
CompressionLevel=
"high"
/>
...
...
Tools/msi/exe/exe_pdb.wxs
View file @
6727b3c2
<?xml version="1.0" encoding="UTF-8"?>
<Wix
xmlns=
"http://schemas.microsoft.com/wix/2006/wi"
>
<Product
Id=
"*"
Language=
"!(loc.LCID)"
Name=
"!(loc.Title)"
Version=
"$(var.Version)"
Manufacturer=
"!(loc.Manufacturer)"
UpgradeCode=
"$(var.UpgradeCode)"
>
<Product
Id=
"*"
Language=
"!(loc.LCID)"
Name=
"!(loc.Title
Pdb
)"
Version=
"$(var.Version)"
Manufacturer=
"!(loc.Manufacturer)"
UpgradeCode=
"$(var.UpgradeCode)"
>
<Package
InstallerVersion=
"300"
Compressed=
"yes"
InstallScope=
"perUser"
Platform=
"$(var.Platform)"
/>
<MediaTemplate
EmbedCab=
"yes"
CompressionLevel=
"high"
/>
...
...
Tools/msi/lib/lib_d.wxs
View file @
6727b3c2
<?xml version="1.0" encoding="UTF-8"?>
<Wix
xmlns=
"http://schemas.microsoft.com/wix/2006/wi"
>
<Product
Id=
"*"
Language=
"!(loc.LCID)"
Name=
"!(loc.Title)"
Version=
"$(var.Version)"
Manufacturer=
"!(loc.Manufacturer)"
UpgradeCode=
"$(var.UpgradeCode)"
>
<Product
Id=
"*"
Language=
"!(loc.LCID)"
Name=
"!(loc.Title
_d
)"
Version=
"$(var.Version)"
Manufacturer=
"!(loc.Manufacturer)"
UpgradeCode=
"$(var.UpgradeCode)"
>
<Package
InstallerVersion=
"300"
Compressed=
"yes"
InstallScope=
"perUser"
Platform=
"$(var.Platform)"
/>
<MediaTemplate
EmbedCab=
"yes"
CompressionLevel=
"high"
/>
...
...
Tools/msi/lib/lib_pdb.wxs
View file @
6727b3c2
<?xml version="1.0" encoding="UTF-8"?>
<Wix
xmlns=
"http://schemas.microsoft.com/wix/2006/wi"
>
<Product
Id=
"*"
Language=
"!(loc.LCID)"
Name=
"!(loc.Title)"
Version=
"$(var.Version)"
Manufacturer=
"!(loc.Manufacturer)"
UpgradeCode=
"$(var.UpgradeCode)"
>
<Product
Id=
"*"
Language=
"!(loc.LCID)"
Name=
"!(loc.Title
Pdb
)"
Version=
"$(var.Version)"
Manufacturer=
"!(loc.Manufacturer)"
UpgradeCode=
"$(var.UpgradeCode)"
>
<Package
InstallerVersion=
"300"
Compressed=
"yes"
InstallScope=
"perUser"
Platform=
"$(var.Platform)"
/>
<MediaTemplate
EmbedCab=
"yes"
CompressionLevel=
"high"
/>
...
...
Tools/msi/tcltk/tcltk_d.wxs
View file @
6727b3c2
<?xml version="1.0" encoding="UTF-8"?>
<Wix
xmlns=
"http://schemas.microsoft.com/wix/2006/wi"
>
<Product
Id=
"*"
Language=
"!(loc.LCID)"
Name=
"!(loc.Title)"
Version=
"$(var.Version)"
Manufacturer=
"!(loc.Manufacturer)"
UpgradeCode=
"$(var.UpgradeCode)"
>
<Product
Id=
"*"
Language=
"!(loc.LCID)"
Name=
"!(loc.Title
_d
)"
Version=
"$(var.Version)"
Manufacturer=
"!(loc.Manufacturer)"
UpgradeCode=
"$(var.UpgradeCode)"
>
<Package
InstallerVersion=
"300"
Compressed=
"yes"
InstallScope=
"perUser"
Platform=
"$(var.Platform)"
/>
<MediaTemplate
EmbedCab=
"yes"
CompressionLevel=
"high"
/>
...
...
Tools/msi/tcltk/tcltk_pdb.wxs
View file @
6727b3c2
<?xml version="1.0" encoding="UTF-8"?>
<Wix
xmlns=
"http://schemas.microsoft.com/wix/2006/wi"
>
<Product
Id=
"*"
Language=
"!(loc.LCID)"
Name=
"!(loc.Title)"
Version=
"$(var.Version)"
Manufacturer=
"!(loc.Manufacturer)"
UpgradeCode=
"$(var.UpgradeCode)"
>
<Product
Id=
"*"
Language=
"!(loc.LCID)"
Name=
"!(loc.Title
Pdb
)"
Version=
"$(var.Version)"
Manufacturer=
"!(loc.Manufacturer)"
UpgradeCode=
"$(var.UpgradeCode)"
>
<Package
InstallerVersion=
"300"
Compressed=
"yes"
InstallScope=
"perUser"
Platform=
"$(var.Platform)"
/>
<MediaTemplate
EmbedCab=
"yes"
CompressionLevel=
"high"
/>
...
...
Tools/msi/test/test_d.wxs
View file @
6727b3c2
<?xml version="1.0" encoding="UTF-8"?>
<Wix
xmlns=
"http://schemas.microsoft.com/wix/2006/wi"
>
<Product
Id=
"*"
Language=
"!(loc.LCID)"
Name=
"!(loc.Title)"
Version=
"$(var.Version)"
Manufacturer=
"!(loc.Manufacturer)"
UpgradeCode=
"$(var.UpgradeCode)"
>
<Product
Id=
"*"
Language=
"!(loc.LCID)"
Name=
"!(loc.Title
_d
)"
Version=
"$(var.Version)"
Manufacturer=
"!(loc.Manufacturer)"
UpgradeCode=
"$(var.UpgradeCode)"
>
<Package
InstallerVersion=
"300"
Compressed=
"yes"
InstallScope=
"perUser"
Platform=
"$(var.Platform)"
/>
<MediaTemplate
EmbedCab=
"yes"
CompressionLevel=
"high"
/>
...
...
Tools/msi/test/test_pdb.wxs
View file @
6727b3c2
<?xml version="1.0" encoding="UTF-8"?>
<Wix
xmlns=
"http://schemas.microsoft.com/wix/2006/wi"
>
<Product
Id=
"*"
Language=
"!(loc.LCID)"
Name=
"!(loc.Title)"
Version=
"$(var.Version)"
Manufacturer=
"!(loc.Manufacturer)"
UpgradeCode=
"$(var.UpgradeCode)"
>
<Product
Id=
"*"
Language=
"!(loc.LCID)"
Name=
"!(loc.Title
Pdb
)"
Version=
"$(var.Version)"
Manufacturer=
"!(loc.Manufacturer)"
UpgradeCode=
"$(var.UpgradeCode)"
>
<Package
InstallerVersion=
"300"
Compressed=
"yes"
InstallScope=
"perUser"
Platform=
"$(var.Platform)"
/>
<MediaTemplate
EmbedCab=
"yes"
CompressionLevel=
"high"
/>
...
...
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