mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 00:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Updated freeze.py to the new Makefile symbol layout.

Browse source 
Fixed a few compiler warnings.

freeze.py now produces binaries which can import shared
modules (unlike before).
This commit is contained in:
Marc-André Lemburg 2002-04-04 16:15:41 +00:00
parent 47834463d0
commit 64b4f2770e
4 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Tools/freeze/freeze.py
View file

@ -464,7 +464,7 @@ def main():
somevars['CFLAGS'] = string.join(cflags) # override somevars['CFLAGS'] = string.join(cflags) # override
somevars['CPPFLAGS'] = string.join(cppflags) # override somevars['CPPFLAGS'] = string.join(cppflags) # override
files = ['$(OPT)', '$(LDFLAGS)', base_config_c, base_frozen_c] + \ files = [base_config_c, base_frozen_c] + \
files + supp_sources + addfiles + libs + \ files + supp_sources + addfiles + libs + \
['$(MODLIBS)', '$(LIBS)', '$(SYSLIBS)'] ['$(MODLIBS)', '$(LIBS)', '$(SYSLIBS)']

2
Tools/freeze/makeconfig.py
View file

@ -19,7 +19,7 @@ def makeconfig(infp, outfp, modules, with_ifdef=0):
continue continue
if with_ifdef: if with_ifdef:
outfp.write("#ifndef init%s\n"%mod) outfp.write("#ifndef init%s\n"%mod)
outfp.write('extern void init%s();\n' % mod) outfp.write('extern void init%s(void);\n' % mod)
if with_ifdef: if with_ifdef:
outfp.write("#endif\n") outfp.write("#endif\n")
elif m2 and m2.search(line): elif m2 and m2.search(line):

4
Tools/freeze/makefreeze.py
View file

@ -18,9 +18,7 @@ trailer = """\
# if __debug__ == 0 (i.e. -O option given), set Py_OptimizeFlag in frozen app. # if __debug__ == 0 (i.e. -O option given), set Py_OptimizeFlag in frozen app.
default_entry_point = """ default_entry_point = """
int int
main(argc, argv) main(int argc, char **argv)
int argc;
char **argv;
{ {
extern int Py_FrozenMain(int, char **); extern int Py_FrozenMain(int, char **);
""" + ((not __debug__ and """ """ + ((not __debug__ and """

2
Tools/freeze/makemakefile.py
View file

@ -24,7 +24,7 @@ def makemakefile(outfp, makevars, files, target):
deps.append(dest) deps.append(dest)
outfp.write("\n%s: %s\n" % (target, string.join(deps))) outfp.write("\n%s: %s\n" % (target, string.join(deps)))
outfp.write("\t$(CC) %s -o %s $(LDLAST)\n" % outfp.write("\t$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) %s -o %s $(LDLAST)\n" %
(string.join(files), target)) (string.join(files), target))
outfp.write("\nclean:\n\t-rm -f *.o %s\n" % target) outfp.write("\nclean:\n\t-rm -f *.o %s\n" % target)