Minor fixes to Windows build scripts
diff --git a/Tools/msi/make_zip.py b/Tools/msi/make_zip.py
index 0032956..56d6f38 100644
--- a/Tools/msi/make_zip.py
+++ b/Tools/msi/make_zip.py
@@ -30,9 +30,16 @@
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 b93306a..a989575 100644
--- a/Tools/msi/testrelease.bat
+++ b/Tools/msi/testrelease.bat
@@ -1,4 +1,4 @@
-@setlocal
+@setlocal enableextensions
@echo off
set D=%~dp0
@@ -51,6 +51,9 @@
@if not exist "%~1" exit /B 1
+@set EXE=%~1
+@if not "%EXE:embed=%"=="%EXE%" exit /B 0
+
@set EXITCODE=0
@echo Installing %1 into %2
"%~1" /passive /log "%~2\install\log.txt" TargetDir="%~2\Python" Include_debug=1 Include_symbols=1 %~3