From 777af30645432cacda5c9b5df940d8fb27a1479c Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Sun, 19 Apr 2015 19:50:35 -0700
Subject: [PATCH] Minor fixes to Windows build scripts

---
 Tools/msi/make_zip.py     | 13 ++++++++++---
 Tools/msi/testrelease.bat |  5 ++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Tools/msi/make_zip.py b/Tools/msi/make_zip.py
index 00329561db4..56d6f3807b3 100644
--- 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 b93306a1ee0..a989575ed6f 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 @@ exit /B 0
 
 @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