traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Patch #1355883: Build Python-ast.c and Python-ast.h 

independently. Fixes #1355883.
This commit is contained in:
Martin v. Löwis 2006-04-14 15:02:32 +00:00
parent 969ef7501c
commit 7580149bde
2 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile.pre.in
View File

@ -219,13 +219,15 @@ PGENOBJS= $(PGENMAIN) $(POBJS) $(PGOBJS)
########################################################################## ##########################################################################
# AST # AST
AST_H= $(srcdir)/Include/Python-ast.h AST_H_DIR= $(srcdir)/Include
AST_C= $(srcdir)/Python/Python-ast.c AST_H= $(AST_H_DIR)/Python-ast.h
AST_C_DIR= $(srcdir)/Python
AST_C= $(AST_C_DIR)/Python-ast.c
AST_ASDL= $(srcdir)/Parser/Python.asdl AST_ASDL= $(srcdir)/Parser/Python.asdl
ASDLGEN_FILES= $(srcdir)/Parser/asdl.py $(srcdir)/Parser/asdl_c.py ASDLGEN_FILES= $(srcdir)/Parser/asdl.py $(srcdir)/Parser/asdl_c.py
# XXX Note that a build now requires Python exist before the build starts # XXX Note that a build now requires Python exist before the build starts
ASDLGEN= $(srcdir)/Parser/asdl_c.py -h $(srcdir)/Include -c $(srcdir)/Python ASDLGEN= $(srcdir)/Parser/asdl_c.py
########################################################################## ##########################################################################
# Python # Python
@ -465,8 +467,11 @@ Parser/metagrammar.o: $(srcdir)/Parser/metagrammar.c
Parser/tokenizer_pgen.o: $(srcdir)/Parser/tokenizer.c Parser/tokenizer_pgen.o: $(srcdir)/Parser/tokenizer.c
$(AST_H) $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) $(AST_H): $(AST_ASDL) $(ASDLGEN_FILES)
$(ASDLGEN) $(AST_ASDL) $(ASDLGEN) -h $(AST_H_DIR) $(AST_ASDL)
$(AST_C): $(AST_ASDL) $(ASDLGEN_FILES)
$(ASDLGEN) -c $(AST_C_DIR) $(AST_ASDL)
Python/compile.o Python/symtable.o: $(GRAMMAR_H) $(AST_H) Python/compile.o Python/symtable.o: $(GRAMMAR_H) $(AST_H)

8
Parser/asdl_c.py
View File

@ -726,8 +726,6 @@ def main(srcfile):
sys.exit(1) sys.exit(1)
if INC_DIR: if INC_DIR:
p = "%s/%s-ast.h" % (INC_DIR, mod.name) p = "%s/%s-ast.h" % (INC_DIR, mod.name)
else:
p = "%s-ast.h" % mod.name
f = open(p, "wb") f = open(p, "wb")
print >> f, auto_gen_msg print >> f, auto_gen_msg
print >> f, '#include "asdl.h"\n' print >> f, '#include "asdl.h"\n'
@ -741,8 +739,6 @@ def main(srcfile):
if SRC_DIR: if SRC_DIR:
p = os.path.join(SRC_DIR, str(mod.name) + "-ast.c") p = os.path.join(SRC_DIR, str(mod.name) + "-ast.c")
else:
p = "%s-ast.c" % mod.name
f = open(p, "wb") f = open(p, "wb")
print >> f, auto_gen_msg print >> f, auto_gen_msg
print >> f, '#include "Python.h"' print >> f, '#include "Python.h"'
@ -767,6 +763,9 @@ if __name__ == "__main__":
INC_DIR = '' INC_DIR = ''
SRC_DIR = '' SRC_DIR = ''
opts, args = getopt.getopt(sys.argv[1:], "h:c:") opts, args = getopt.getopt(sys.argv[1:], "h:c:")
if len(opts) != 1:
print "Must specify exactly one output file"
sys.exit(1)
for o, v in opts: for o, v in opts:
if o == '-h': if o == '-h':
INC_DIR = v INC_DIR = v
@ -774,4 +773,5 @@ if __name__ == "__main__":
SRC_DIR = v SRC_DIR = v
if len(args) != 1: if len(args) != 1:
print "Must specify single input file" print "Must specify single input file"
sys.exit(1)
main(args[0]) main(args[0])