1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ditched '_find_SET()', since it was a no-value-added wrapper around

Browse Source 
'get_msvc_paths()'.
Renamed '_do_SET()' to 'set_path_env_var()', tweaked docstring, and
  cosmetically tweaked code.
Stylistic changes to MSVCCompiler constructor (variable renaming
  and type consistency).
This commit is contained in:
Greg Ward 2000-02-11 02:52:39 +00:00
parent 699880931e
commit 5de8cee73f
1 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Lib/distutils/msvccompiler.py
View File

@ -121,23 +121,14 @@ def find_exe (exe, version_number):
return exe # last desperate hope return exe # last desperate hope
def _find_SET(name,version_number): def set_path_env_var (name, version_number):
"""looks up in the registry and returns a list of values suitable for """Set environment variable 'name' to an MSVC path type value obtained
use in a SET command eg SET name=value. Normally the value will be a from 'get_msvc_paths()'. This is equivalent to a SET command prior
';' separated list similar to a path list. to execution of spawned commands."""
name is the name of an MSVC path and version_number is a version_number p = get_msvc_paths (name, version_number)
of an MSVC installation."""
return get_msvc_paths(name, version_number)
def _do_SET(name, version_number):
"""sets os.environ[name] to an MSVC path type value obtained from
_find_SET. This is equivalent to a SET command prior to execution of
spawned commands."""
p=_find_SET(name, version_number)
if p: if p:
os.environ[name]=string.join(p,';') os.environ[name] = string.join (p,';')
class MSVCCompiler (CCompiler) : class MSVCCompiler (CCompiler) :
@ -155,16 +146,16 @@ class MSVCCompiler (CCompiler) :
self.add_library_dir( os.path.join( sys.exec_prefix, 'libs' ) ) self.add_library_dir( os.path.join( sys.exec_prefix, 'libs' ) )
vNum = get_devstudio_versions () versions = get_devstudio_versions ()
if vNum: if versions:
vNum = vNum[0] # highest version version = versions[0] # highest version
self.cc = _find_exe("cl.exe", vNum) self.cc = _find_exe("cl.exe", version)
self.link = _find_exe("link.exe", vNum) self.link = _find_exe("link.exe", version)
_do_SET('lib', vNum) set_path_env_var ('lib', version)
_do_SET('include', vNum) set_path_env_var ('include', version)
path=_find_SET('path', vNum) path=get_msvc_paths('path', version)
try: try:
for p in string.split(os.environ['path'],';'): for p in string.split(os.environ['path'],';'):
path.append(p) path.append(p)