From a2ea0e4804f30cdc754b1ed6a37fff30fd8a5378 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Tue, 22 Sep 2015 16:45:19 -0700
Subject: Issue #25102: Windows installer does not precompile for -O or -OO.

---
 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
index 2ed6491..36cb6e4 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -150,6 +150,8 @@ Build
 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
index 684e0da..d7a65c4 100644
--- 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
index 7b0f3fc..b40c2a5 100644
--- 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"
-- 
cgit v0.12