Commit 16361e51 authored by Jason R. Coombs's avatar Jason R. Coombs

Remove ARM launchers. Fixes #611.

parent df8f9384
...@@ -2,6 +2,13 @@ ...@@ -2,6 +2,13 @@
CHANGES CHANGES
======= =======
v23.0.0
-------
* #611: Removed ARM executables for CLI and GUI script
launchers on Windows. If this was a feature you cared
about, please comment in the ticket.
v22.0.5 v22.0.5
------- -------
......
...@@ -35,21 +35,5 @@ if "%ERRORLEVEL%"=="0" ( ...@@ -35,21 +35,5 @@ if "%ERRORLEVEL%"=="0" (
echo Windows SDK 6.1 not found to build Windows 64-bit version echo Windows SDK 6.1 not found to build Windows 64-bit version
) )
REM Windows RT ARM build requires both freeware
REM "Visual Studio Express 2012 for Windows 8" and
REM "Visual Studio Express 2012 for Windows Desktop" to be installed from
REM http://www.microsoft.com/visualstudio/eng/products/visual-studio-express-products
set PATH=%PATH_OLD%
set PATH=C:\Program Files\Microsoft Visual Studio 11.0\VC;%PATH%
set PATH=C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC;%PATH%
call VCVARSALL x86_arm >nul 2>&1
if "%ERRORLEVEL%"=="0" (
echo Building Windows RT Version ...
cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" /D _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE launcher.c /O2 /link /MACHINE:ARM /SUBSYSTEM:CONSOLE /out:setuptools/cli-arm-32.exe
cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" /D _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE launcher.c /O2 /link /MACHINE:ARM /SUBSYSTEM:WINDOWS /out:setuptools/gui-arm-32.exe
) else (
echo Visual Studio ^(Express^) 2012 not found to build Windows RT Version
)
set PATH=%PATH_OLD% set PATH=%PATH_OLD%
...@@ -32,7 +32,6 @@ import zipfile ...@@ -32,7 +32,6 @@ import zipfile
import re import re
import stat import stat
import random import random
import platform
import textwrap import textwrap
import warnings import warnings
import site import site
...@@ -2203,8 +2202,6 @@ def get_win_launcher(type): ...@@ -2203,8 +2202,6 @@ def get_win_launcher(type):
Returns the executable as a byte string. Returns the executable as a byte string.
""" """
launcher_fn = '%s.exe' % type launcher_fn = '%s.exe' % type
if platform.machine().lower() == 'arm':
launcher_fn = launcher_fn.replace(".", "-arm.")
if is_64bit(): if is_64bit():
launcher_fn = launcher_fn.replace(".", "-64.") launcher_fn = launcher_fn.replace(".", "-64.")
else: else:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment