[Python-checkins] cpython (3.5): Issue #25102: Windows installer does not precompile for -O or -OO.
steve.dower
python-checkins at python.org
Wed Sep 23 02:01:48 CEST 2015
https://hg.python.org/cpython/rev/31b230e5517e
changeset: 98179:31b230e5517e
branch: 3.5
user: Steve Dower <steve.dower at microsoft.com>
date: Tue Sep 22 16:45:19 2015 -0700
summary:
Issue #25102: Windows installer does not precompile for -O or -OO.
files:
Misc/NEWS | 2 +
Tools/msi/bundle/bundle.wxl | 2 +
Tools/msi/bundle/packagegroups/postinstall.wxs | 51 +++++++++-
3 files changed, 50 insertions(+), 5 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -150,6 +150,8 @@
Windows
-------
+- Issue #25102: Windows installer does not precompile for -O or -OO.
+
- Issue #25081: Makes Back button in installer go back to upgrade page when
upgrading.
diff --git a/Tools/msi/bundle/bundle.wxl b/Tools/msi/bundle/bundle.wxl
--- a/Tools/msi/bundle/bundle.wxl
+++ b/Tools/msi/bundle/bundle.wxl
@@ -2,4 +2,6 @@
<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
<String Id="CRTDescription">C Runtime Update (KB2999226)</String>
<String Id="CompileAllDescription">Precompiling standard library</String>
+ <String Id="CompileAllODescription">Precompiling standard library (-O)</String>
+ <String Id="CompileAllOODescription">Precompiling standard library (-OO)</String>
</WixLocalization>
diff --git a/Tools/msi/bundle/packagegroups/postinstall.wxs b/Tools/msi/bundle/packagegroups/postinstall.wxs
--- a/Tools/msi/bundle/packagegroups/postinstall.wxs
+++ b/Tools/msi/bundle/packagegroups/postinstall.wxs
@@ -40,23 +40,64 @@
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
</MsiPackage>
- <?define CompileAllCommand=-$(var.ShortVersion)$(var.Suffix32) -E -s -Wi "[TargetDir]\Lib\compileall.py" -f -x "bad_coding|badsyntax|site-packages|py2_|lib2to3\\tests|venv\\scripts" "[TargetDir]\Lib"?>
+ <?define CompileAllCommand=-E -s -Wi "[TargetDir]\Lib\compileall.py" -f -x "bad_coding|badsyntax|site-packages|py2_|lib2to3\\tests|venv\\scripts" "[TargetDir]\Lib"?>
<ExePackage Id="compileall_AllUsers"
SourceFile="py.exe"
Compressed="yes"
DisplayName="!(loc.CompileAllDescription)"
- InstallCommand='$(var.CompileAllCommand)'
- RepairCommand='$(var.CompileAllCommand)'
+ InstallCommand='-$(var.ShortVersion)$(var.Suffix32) $(var.CompileAllCommand)'
+ RepairCommand='-$(var.ShortVersion)$(var.Suffix32) $(var.CompileAllCommand)'
Permanent="yes"
PerMachine="yes"
Vital="no"
InstallCondition="InstallAllUsers and CompileAll and not LauncherOnly" />
+ <ExePackage Id="compileallO_AllUsers"
+ SourceFile="py.exe"
+ Compressed="yes"
+ DisplayName="!(loc.CompileAllODescription)"
+ InstallCommand='-$(var.ShortVersion)$(var.Suffix32) -O $(var.CompileAllCommand)'
+ RepairCommand='-$(var.ShortVersion)$(var.Suffix32) -O $(var.CompileAllCommand)'
+ Permanent="yes"
+ PerMachine="yes"
+ Vital="no"
+ InstallCondition="InstallAllUsers and CompileAll and not LauncherOnly" />
+ <ExePackage Id="compileallOO_AllUsers"
+ SourceFile="py.exe"
+ Compressed="yes"
+ DisplayName="!(loc.CompileAllOODescription)"
+ InstallCommand='-$(var.ShortVersion)$(var.Suffix32) -OO $(var.CompileAllCommand)'
+ RepairCommand='-$(var.ShortVersion)$(var.Suffix32) -OO $(var.CompileAllCommand)'
+ Permanent="yes"
+ PerMachine="yes"
+ Vital="no"
+ InstallCondition="InstallAllUsers and CompileAll and not LauncherOnly" />
+
<ExePackage Id="compileall_JustForMe"
SourceFile="py.exe"
Compressed="yes"
DisplayName="!(loc.CompileAllDescription)"
- InstallCommand='$(var.CompileAllCommand)'
- RepairCommand='$(var.CompileAllCommand)'
+ InstallCommand='-$(var.ShortVersion)$(var.Suffix32) $(var.CompileAllCommand)'
+ RepairCommand='-$(var.ShortVersion)$(var.Suffix32) $(var.CompileAllCommand)'
+ Permanent="yes"
+ PerMachine="no"
+ Vital="no"
+ InstallCondition="not InstallAllUsers and CompileAll and not LauncherOnly" />
+ <ExePackage Id="compileallO_JustForMe"
+ SourceFile="py.exe"
+ Compressed="yes"
+ DisplayName="!(loc.CompileAllODescription)"
+ InstallCommand='-$(var.ShortVersion)$(var.Suffix32) -O $(var.CompileAllCommand)'
+ RepairCommand='-$(var.ShortVersion)$(var.Suffix32) -O $(var.CompileAllCommand)'
+ Permanent="yes"
+ PerMachine="no"
+ Vital="no"
+ InstallCondition="not InstallAllUsers and CompileAll and not LauncherOnly" />
+ <ExePackage Id="compileallOO_JustForMe"
+ SourceFile="py.exe"
+ Compressed="yes"
+ DisplayName="!(loc.CompileAllOODescription)"
+ InstallCommand='-$(var.ShortVersion)$(var.Suffix32) -OO $(var.CompileAllCommand)'
+ RepairCommand='-$(var.ShortVersion)$(var.Suffix32) -OO $(var.CompileAllCommand)'
Permanent="yes"
PerMachine="no"
Vital="no"
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list