Kaydet (Commit) a0e18357 authored tarafından Guido van Rossum's avatar Guido van Rossum

Rearrange some stuff so that the warning for unknown modules is also

issued on Windows.
üst 31d53ed9
......@@ -279,22 +279,7 @@ def main():
os.unlink(frozen_c)
os.rename(backup, frozen_c)
# windows gets different treatment
if win:
# Taking a shortcut here...
import winmakemakefile
outfp = open(makefile, 'w')
try:
winmakemakefile.makemakefile(outfp,
locals(),
[frozenmain_c,
os.path.basename(frozen_c)],
os.path.basename(target))
finally:
outfp.close()
return
# generate config.c and Makefile
# look for unfrozen modules (builtin and of unknown origin)
builtins = []
unknown = []
mods = dict.keys()
......@@ -307,17 +292,36 @@ def main():
else:
unknown.append(mod)
# search for unknown modules in extensions directories (not on Windows)
addfiles = []
if unknown:
if unknown and not win:
addfiles, addmods = \
checkextensions.checkextensions(unknown, extensions)
for mod in addmods:
unknown.remove(mod)
builtins = builtins + addmods
# report unknown modules
if unknown:
sys.stderr.write('Warning: unknown modules remain: %s\n' %
string.join(unknown))
# windows gets different treatment
if win:
# Taking a shortcut here...
import winmakemakefile
outfp = open(makefile, 'w')
try:
winmakemakefile.makemakefile(outfp,
locals(),
[frozenmain_c,
os.path.basename(frozen_c)],
os.path.basename(target))
finally:
outfp.close()
return
# generate config.c and Makefile
builtins.sort()
infp = open(config_c_in)
backup = config_c + '~'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment