mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-01 23:53:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Miscellaneous minor cleanups.

Browse source
This commit is contained in:
Fred Drake 2001-08-02 20:03:12 +00:00
parent f90490ef94
commit c916cdc5ca
1 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Lib/distutils/sysconfig.py
View file

@ -29,14 +29,15 @@ EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
python_build = 0 python_build = 0
def set_python_build(): def set_python_build():
"""Set the python_build flag to true; this means that we're """Set the python_build flag to true.
building Python itself. Only called from the setup.py script
shipped with Python. This means that we're building Python itself. Only called from
the setup.py script shipped with Python.
""" """
global python_build global python_build
python_build = 1 python_build = 1
def get_python_inc(plat_specific=0, prefix=None): def get_python_inc(plat_specific=0, prefix=None):
"""Return the directory containing installed Python header files. """Return the directory containing installed Python header files.
@ -55,7 +56,7 @@ def get_python_inc(plat_specific=0, prefix=None):
return "Include/" return "Include/"
return os.path.join(prefix, "include", "python" + sys.version[:3]) return os.path.join(prefix, "include", "python" + sys.version[:3])
elif os.name == "nt": elif os.name == "nt":
return os.path.join(prefix, "Include") # include or Include? return os.path.join(prefix, "include")
elif os.name == "mac": elif os.name == "mac":
return os.path.join(prefix, "Include") return os.path.join(prefix, "Include")
else: else:
@ -80,7 +81,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
""" """
if prefix is None: if prefix is None:
prefix = plat_specific and EXEC_PREFIX or PREFIX prefix = plat_specific and EXEC_PREFIX or PREFIX
if os.name == "posix": if os.name == "posix":
libpython = os.path.join(prefix, libpython = os.path.join(prefix,
"lib", "python" + sys.version[:3]) "lib", "python" + sys.version[:3])
@ -91,20 +92,20 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
elif os.name == "nt": elif os.name == "nt":
if standard_lib: if standard_lib:
return os.path.join(PREFIX, "Lib") return os.path.join(prefix, "Lib")
else: else:
return prefix return prefix
elif os.name == "mac": elif os.name == "mac":
if plat_specific: if plat_specific:
if standard_lib: if standard_lib:
return os.path.join(EXEC_PREFIX, "Mac", "Plugins") return os.path.join(prefix, "Mac", "Plugins")
else: else:
raise DistutilsPlatformError( raise DistutilsPlatformError(
"OK, where DO site-specific extensions go on the Mac?") "OK, where DO site-specific extensions go on the Mac?")
else: else:
if standard_lib: if standard_lib:
return os.path.join(PREFIX, "Lib") return os.path.join(prefix, "Lib")
else: else:
raise DistutilsPlatformError( raise DistutilsPlatformError(
"OK, where DO site-specific modules go on the Mac?") "OK, where DO site-specific modules go on the Mac?")
@ -113,13 +114,12 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
"I don't know where Python installs its library " "I don't know where Python installs its library "
"on platform '%s'" % os.name) "on platform '%s'" % os.name)
# get_python_lib()
def customize_compiler(compiler): def customize_compiler(compiler):
"""Do any platform-specific customization of the CCompiler instance """Do any platform-specific customization of a CCompiler instance.
'compiler'. Mainly needed on Unix, so we can plug in the information
that varies across Unices and is stored in Python's Makefile. Mainly needed on Unix, so we can plug in the information that
varies across Unices and is stored in Python's Makefile.
""" """
if compiler.compiler_type == "unix": if compiler.compiler_type == "unix":
(cc, opt, ccshared, ldshared, so_ext) = \ (cc, opt, ccshared, ldshared, so_ext) = \
@ -138,8 +138,10 @@ def customize_compiler(compiler):
def get_config_h_filename(): def get_config_h_filename():
"""Return full pathname of installed pyconfig.h file.""" """Return full pathname of installed pyconfig.h file."""
if python_build: inc_dir = '.' if python_build:
else: inc_dir = get_python_inc(plat_specific=1) inc_dir = os.curdir
else:
inc_dir = get_python_inc(plat_specific=1)
if sys.version < '2.2': if sys.version < '2.2':
config_h = 'config.h' config_h = 'config.h'
else: else:
@ -197,7 +199,6 @@ def parse_makefile(fn, g=None):
A dictionary containing name/value pairs is returned. If an A dictionary containing name/value pairs is returned. If an
optional dictionary is passed in as the second argument, it is optional dictionary is passed in as the second argument, it is
used instead of a new dictionary. used instead of a new dictionary.
""" """
from distutils.text_file import TextFile from distutils.text_file import TextFile
fp = TextFile(fn, strip_comments=1, skip_blanks=1, join_lines=1) fp = TextFile(fn, strip_comments=1, skip_blanks=1, join_lines=1)
@ -309,8 +310,8 @@ def _init_posix():
my_msg = my_msg + " (%s)" % msg.strerror my_msg = my_msg + " (%s)" % msg.strerror
raise DistutilsPlatformError(my_msg) raise DistutilsPlatformError(my_msg)
# On AIX, there are wrong paths to the linker scripts in the Makefile # On AIX, there are wrong paths to the linker scripts in the Makefile
# -- these paths are relative to the Python source, but when installed # -- these paths are relative to the Python source, but when installed
# the scripts are in another directory. # the scripts are in another directory.
@ -397,6 +398,6 @@ def get_config_vars(*args):
def get_config_var(name): def get_config_var(name):
"""Return the value of a single variable using the dictionary """Return the value of a single variable using the dictionary
returned by 'get_config_vars()'. Equivalent to returned by 'get_config_vars()'. Equivalent to
get_config_vars().get(name) get_config_vars().get(name)
""" """
return get_config_vars().get(name) return get_config_vars().get(name)