Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
setuptools
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
setuptools
Commits
3fa9efcb
Commit
3fa9efcb
authored
Apr 07, 2017
by
Jason R. Coombs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Extract generator for simpler syntax. Ref #995.
parent
9430e92f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
8 deletions
+7
-8
setuptools/msvc.py
setuptools/msvc.py
+7
-8
No files found.
setuptools/msvc.py
View file @
3fa9efcb
...
@@ -987,16 +987,17 @@ class EnvironmentInfo:
...
@@ -987,16 +987,17 @@ class EnvironmentInfo:
"""
"""
Microsoft Windows SDK Tools
Microsoft Windows SDK Tools
"""
"""
tools = []
return list(self._sdk_tools())
def _sdk_tools(self):
if self.vc_ver < 15.0:
if self.vc_ver < 15.0:
bin_dir = '
Bin
' if self.vc_ver <= 11.0 else r'
Bin
\
x86
'
bin_dir = '
Bin
' if self.vc_ver <= 11.0 else r'
Bin
\
x86
'
tools += [os.path.join(self.si.WindowsSdkDir, bin_dir)]
yield os.path.join(self.si.WindowsSdkDir, bin_dir)
if not self.pi.current_is_x86():
if not self.pi.current_is_x86():
arch_subdir = self.pi.current_dir(x64=True)
arch_subdir = self.pi.current_dir(x64=True)
path = '
Bin
%
s
' % arch_subdir
path = '
Bin
%
s
' % arch_subdir
tools += [os.path.join(self.si.WindowsSdkDir, path)]
yield os.path.join(self.si.WindowsSdkDir, path)
if self.vc_ver == 10.0 or self.vc_ver == 11.0:
if self.vc_ver == 10.0 or self.vc_ver == 11.0:
if self.pi.target_is_x86():
if self.pi.target_is_x86():
...
@@ -1004,18 +1005,16 @@ class EnvironmentInfo:
...
@@ -1004,18 +1005,16 @@ class EnvironmentInfo:
else:
else:
arch_subdir = self.pi.current_dir(hidex86=True, x64=True)
arch_subdir = self.pi.current_dir(hidex86=True, x64=True)
path = r'
Bin
\
NETFX
4.0
Tools
%
s
' % arch_subdir
path = r'
Bin
\
NETFX
4.0
Tools
%
s
' % arch_subdir
tools += [os.path.join(self.si.WindowsSdkDir, path)]
yield os.path.join(self.si.WindowsSdkDir, path)
elif self.vc_ver >= 15.0:
elif self.vc_ver >= 15.0:
path = os.path.join(self.si.WindowsSdkDir, '
Bin
')
path = os.path.join(self.si.WindowsSdkDir, '
Bin
')
arch_subdir = self.pi.current_dir(x64=True)
arch_subdir = self.pi.current_dir(x64=True)
sdkver = self._get_content_dirname(path, slash=False)
sdkver = self._get_content_dirname(path, slash=False)
tools += [os.path.join(path, r'
%
s
%
s
' % (sdkver, arch_subdir))]
yield os.path.join(path, r'
%
s
%
s
' % (sdkver, arch_subdir))
if self.si.WindowsSDKExecutablePath:
if self.si.WindowsSDKExecutablePath:
tools += [self.si.WindowsSDKExecutablePath]
yield self.si.WindowsSDKExecutablePath
return tools
@property
@property
def SdkSetup(self):
def SdkSetup(self):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment