summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1998-03-05 05:39:50 (GMT)
committerGuido van Rossum <guido@python.org>1998-03-05 05:39:50 (GMT)
commite0394259b0255fdf53046de75a67cbc538625171 (patch)
tree33add8398331e0a6413c63105c126b098567c918
parent541e783664b910c3a08d16ac9774df9f85d3dade (diff)
downloadcpython-e0394259b0255fdf53046de75a67cbc538625171.zip
cpython-e0394259b0255fdf53046de75a67cbc538625171.tar.gz
cpython-e0394259b0255fdf53046de75a67cbc538625171.tar.bz2
Unfold some lines that were previously folded but don't need to be
now we're reindented. Remove files before renaming something to them -- for Windows. Change check for Python home directory so it works correct on Windows.
-rwxr-xr-xTools/freeze/freeze.py19
1 files changed, 12 insertions, 7 deletions
diff --git a/Tools/freeze/freeze.py b/Tools/freeze/freeze.py
index ca16654..77ad998 100755
--- a/Tools/freeze/freeze.py
+++ b/Tools/freeze/freeze.py
@@ -145,7 +145,7 @@ def main():
prefix = sys.prefix
# determine whether -p points to the Python source tree
- ishome = os.path.exists(os.path.join(prefix, 'Include', 'pythonrun.h'))
+ ishome = os.path.exists(os.path.join(prefix, 'Python', 'ceval.c'))
# locations derived from options
version = sys.version[:3]
@@ -275,8 +275,8 @@ def main():
outfp.close()
if backup:
if cmp.cmp(backup, frozen_c):
- sys.stderr.write('%s not changed, not written\n' %
- frozen_c)
+ sys.stderr.write('%s not changed, not written\n' % frozen_c)
+ os.unlink(frozen_c)
os.rename(backup, frozen_c)
# windows gets different treatment
@@ -332,8 +332,8 @@ def main():
infp.close()
if backup:
if cmp.cmp(backup, config_c):
- sys.stderr.write('%s not changed, not written\n' %
- config_c)
+ sys.stderr.write('%s not changed, not written\n' % config_c)
+ os.unlink(config_c)
os.rename(backup, config_c)
cflags = defines + includes + ['$(OPT)']
@@ -351,6 +351,11 @@ def main():
['$(MODLIBS)', '$(LIBS)', '$(SYSLIBS)']
backup = makefile + '~'
+ if os.path.exists(makefile):
+ try:
+ os.unlink(backup)
+ except os.error:
+ pass
try:
os.rename(makefile, backup)
except os.error:
@@ -364,8 +369,8 @@ def main():
if not cmp.cmp(backup, makefile):
print 'previous Makefile saved as', backup
else:
- sys.stderr.write('%s not changed, not written\n' %
- makefile)
+ sys.stderr.write('%s not changed, not written\n' % makefile)
+ os.unlink(makefile)
os.rename(backup, makefile)
# Done!