From bd5ee3c5d99877fd208b3b3aa1f5482c3e3b2efe Mon Sep 17 00:00:00 2001 From: denfromufa Date: Wed, 27 Jan 2016 23:27:38 -0600 Subject: [PATCH 1/2] Update setup.py --- setup.py | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index b8ae6fd77..95b5f2f09 100644 --- a/setup.py +++ b/setup.py @@ -2,6 +2,12 @@ Setup script for building clr.pyd and dependencies using mono and into an egg or wheel. """ +#import ptvsd +#ptvsd.enable_attach('pythonnet') +#while not ptvsd.is_attached(): +# from time import sleep +# sleep(1) + from setuptools import setup, Extension from distutils.command.build_ext import build_ext from distutils.command.install_lib import install_lib @@ -28,6 +34,18 @@ def _find_msbuild_tool(tool="msbuild.exe", use_windows_sdk=False): import winreg as _winreg if use_windows_sdk: + if sys.version_info[:2] == (2,7): + locappdir = os.environ["LOCALAPPDATA"] + vcpy27 = (r"Programs\Common\Microsoft" + r"\Visual C++ for Python\9.0\WinSDK\Bin") + if PLATFORM == "x86": + mtpath = os.path.join( + locappdir, vcpy27, r"mt.exe") + elif PLATFORM == "x64": + mtpath = os.path.join( + locappdir, vcpy27, r"x64\mt.exe") + if os.path.exists(mtpath): + return mtpath value_name = "InstallationFolder" sdk_name = "Windows SDK" keys_to_check = [ @@ -41,6 +59,7 @@ def _find_msbuild_tool(tool="msbuild.exe", use_windows_sdk=False): value_name = "MSBuildToolsPath" sdk_name = "MSBuild" keys_to_check = [ + r"SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0", r"SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0", r"SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0", r"SOFTWARE\Microsoft\MSBuild\ToolsVersions\3.5", @@ -148,7 +167,7 @@ def build_extension(self, ext): "/p:Configuration=%s" % _config, "/p:Platform=%s" % PLATFORM, "/p:DefineConstants=\"%s\"" % _defines_sep.join(defines), - "/p:PythonBuildDir=%s" % os.path.abspath(dest_dir), + "/p:PythonBuildDir=\"%s\"" % os.path.abspath(dest_dir), "/verbosity:%s" % VERBOSITY, ] @@ -314,4 +333,3 @@ def _check_output(*popenargs, **kwargs): "install_data": PythonNET_InstallData, } ) - From 641eeba8bc76ffee0bbcc62fdf215c79ef2f6753 Mon Sep 17 00:00:00 2001 From: denfromufa Date: Thu, 28 Jan 2016 09:06:02 -0600 Subject: [PATCH 2/2] Update setup.py --- setup.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/setup.py b/setup.py index 95b5f2f09..392a03506 100644 --- a/setup.py +++ b/setup.py @@ -2,11 +2,6 @@ Setup script for building clr.pyd and dependencies using mono and into an egg or wheel. """ -#import ptvsd -#ptvsd.enable_attach('pythonnet') -#while not ptvsd.is_attached(): -# from time import sleep -# sleep(1) from setuptools import setup, Extension from distutils.command.build_ext import build_ext