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

Fixed so 'parse_makefile()' uses the TextFile class to ensure that

Browse Source 
comments are stripped and lines are joined according to the backslash
convention.
This commit is contained in:
Greg Ward 2000-09-15 00:03:13 +00:00
parent f3d41272c6
commit 3fff8d2969
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Lib/distutils/sysconfig.py
View File

@ -154,7 +154,7 @@ def parse_config_h(fp, g=None):
g[m.group(1)] = 0 g[m.group(1)] = 0
return g return g
def parse_makefile(fp, g=None): def parse_makefile(fn, g=None):
"""Parse a Makefile-style file. """Parse a Makefile-style file.
A dictionary containing name/value pairs is returned. If an A dictionary containing name/value pairs is returned. If an
@ -162,15 +162,18 @@ def parse_makefile(fp, g=None):
used instead of a new dictionary. used instead of a new dictionary.
""" """
from distutils.text_file import TextFile
fp = TextFile(fn, strip_comments=1, join_lines=1)
if g is None: if g is None:
g = {} g = {}
variable_rx = re.compile("([a-zA-Z][a-zA-Z0-9_]+)\s*=\s*(.*)\n") variable_rx = re.compile("([a-zA-Z][a-zA-Z0-9_]+)\s*=\s*(.*)")
done = {} done = {}
notdone = {} notdone = {}
#
while 1: while 1:
line = fp.readline() line = fp.readline()
if not line: if line is None:
break break
m = variable_rx.match(line) m = variable_rx.match(line)
if m: if m:
@ -233,7 +236,7 @@ def _init_posix():
# load the installed Makefile: # load the installed Makefile:
try: try:
filename = get_makefile_filename() filename = get_makefile_filename()
file = open(filename) parse_makefile(filename, g)
except IOError, msg: except IOError, msg:
my_msg = "invalid Python installation: unable to open %s" % filename my_msg = "invalid Python installation: unable to open %s" % filename
if hasattr(msg, "strerror"): if hasattr(msg, "strerror"):
@ -241,7 +244,6 @@ def _init_posix():
raise DistutilsPlatformError, my_msg raise DistutilsPlatformError, my_msg
parse_makefile(file, g)
# 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