Remove ARM launchers. Fixes #611.

5 files changed, 7 insertions, 19 deletions

diff --git a/CHANGES.rst b/CHANGES.rst
index b763607c..f13e8c62 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,13 @@
 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
 -------
 
diff --git a/msvc-build-launcher.cmd b/msvc-build-launcher.cmd
index e54c4f6c..92da290e 100644
--- a/msvc-build-launcher.cmd
+++ b/msvc-build-launcher.cmd
@@ -35,21 +35,5 @@ if "%ERRORLEVEL%"=="0" (
   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%

 

diff --git a/setuptools/cli-arm-32.exe b/setuptools/cli-arm-32.exe
deleted file mode 100644
index 2f40402d..00000000
--- a/setuptools/cli-arm-32.exe
+++ /dev/null
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index ccc66cf7..9ca1554e 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -32,7 +32,6 @@ import zipfile
 import re
 import stat
 import random
-import platform
 import textwrap
 import warnings
 import site
@@ -2203,8 +2202,6 @@ def get_win_launcher(type):
     Returns the executable as a byte string.
     """
     launcher_fn = '%s.exe' % type
-    if platform.machine().lower() == 'arm':
-        launcher_fn = launcher_fn.replace(".", "-arm.")
     if is_64bit():
         launcher_fn = launcher_fn.replace(".", "-64.")
     else:
diff --git a/setuptools/gui-arm-32.exe b/setuptools/gui-arm-32.exe
deleted file mode 100644
index 537aff37..00000000
--- a/setuptools/gui-arm-32.exe
+++ /dev/null