Minor fixes to Windows build scripts

diff --git a/Tools/msi/make_zip.py b/Tools/msi/make_zip.py
index 00329561db49f4b1b86961a483f30d0c0e227f52..56d6f3807b3a7c872c141252e051d088c3f467c1 100644 (file)
--- a/Tools/msi/make_zip.py
+++ b/Tools/msi/make_zip.py
@@ -30,9 +30,16 @@ def include_in_lib(p):
             return False
         return True
 
-    if name in {'_ctypes_test.pyd', '_testbuffer.pyd', '_testcapi.pyd', '_testimportmultiple.pyd', 'xxlimited.pyd'}:
-        return False
-    return p.suffix.lower() not in {'.pyc', '.pyo'}
+    suffix = p.suffix.lower()
+    if suffix == '.pyd':
+        return name not in {
+            '_ctypes_test.pyd',
+            '_testbuffer.pyd',
+            '_testcapi.pyd',
+            '_testimportmultiple.pyd',
+            'xxlimited.pyd',
+        }
+    return suffix not in {'.pyc', '.pyo'}
 
 def include_in_tools(p):
     if p.is_dir() and p.name.lower() in {'scripts', 'i18n', 'pynche', 'demo', 'parser'}:

diff --git a/Tools/msi/testrelease.bat b/Tools/msi/testrelease.bat
index b93306a1ee0243ac63dde9f013e3a0e964216145..a989575ed6f0327abe6b2c17dd4821d2a2ffdaf5 100644 (file)
--- a/Tools/msi/testrelease.bat
+++ b/Tools/msi/testrelease.bat
@@ -1,4 +1,4 @@
-@setlocal\r
+@setlocal enableextensions\r
 @echo off\r
 \r
 set D=%~dp0\r
@@ -51,6 +51,9 @@ exit /B 0
 \r
 @if not exist "%~1" exit /B 1\r
 \r
+@set EXE=%~1\r
+@if not "%EXE:embed=%"=="%EXE%" exit /B 0\r
+\r
 @set EXITCODE=0\r
 @echo Installing %1 into %2\r
 "%~1" /passive /log "%~2\install\log.txt" TargetDir="%~2\Python" Include_debug=1 Include_symbols=1 %~3\r