Minor fixes to Windows build scripts

This commit is contained in:
Steve Dower 2015-04-19 19:50:35 -07:00
parent 3c28c6e4fb
commit 777af30645
2 changed files with 14 additions and 4 deletions

View File

@ -30,9 +30,16 @@ def include_in_lib(p):
return False return False
return True return True
if name in {'_ctypes_test.pyd', '_testbuffer.pyd', '_testcapi.pyd', '_testimportmultiple.pyd', 'xxlimited.pyd'}: suffix = p.suffix.lower()
return False if suffix == '.pyd':
return p.suffix.lower() not in {'.pyc', '.pyo'} 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): def include_in_tools(p):
if p.is_dir() and p.name.lower() in {'scripts', 'i18n', 'pynche', 'demo', 'parser'}: if p.is_dir() and p.name.lower() in {'scripts', 'i18n', 'pynche', 'demo', 'parser'}:

View File

@ -1,4 +1,4 @@
@setlocal @setlocal enableextensions
@echo off @echo off
set D=%~dp0 set D=%~dp0
@ -51,6 +51,9 @@ exit /B 0
@if not exist "%~1" exit /B 1 @if not exist "%~1" exit /B 1
@set EXE=%~1
@if not "%EXE:embed=%"=="%EXE%" exit /B 0
@set EXITCODE=0 @set EXITCODE=0
@echo Installing %1 into %2 @echo Installing %1 into %2
"%~1" /passive /log "%~2\install\log.txt" TargetDir="%~2\Python" Include_debug=1 Include_symbols=1 %~3 "%~1" /passive /log "%~2\install\log.txt" TargetDir="%~2\Python" Include_debug=1 Include_symbols=1 %~3