diff options
| author | Thomas Wouters <thomas@python.org> | 2014-04-17 01:13:29 +0200 |
|---|---|---|
| committer | Thomas Wouters <thomas@python.org> | 2014-04-17 01:13:29 +0200 |
| commit | b7781c267239a03e8060544d1eb90c3f3fb4b23e (patch) | |
| tree | 2170c12d1ebe26da2c3f068ce211d8a941d55966 | |
| parent | f7dc4b2d4da501c49349e47e580e6198c4057ebb (diff) | |
| download | cpython-b7781c267239a03e8060544d1eb90c3f3fb4b23e.tar.gz | |
Fix Tools/scripts/generate_opcode_h.py from issue #17861 to work correctly
when building in a separate object tree. More people should build this way.
This may still fail if the source is unwritable, I haven't tested that yet.
| -rw-r--r-- | Makefile.pre.in | 8 | ||||
| -rw-r--r-- | Tools/scripts/generate_opcode_h.py | 19 |
2 files changed, 13 insertions, 14 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index fbec3b7a68..8866766305 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -324,10 +324,10 @@ PGENOBJS= $(POBJS) $(PGOBJS) ########################################################################## # opcode.h generation -OPCODE_H_DIR= Include -OPCODE_H_SCRIPT= Tools/scripts/generate_opcode_h.py -OPCODE_H= $(srcdir)/$(OPCODE_H_DIR)/opcode.h -OPCODE_H_GEN= @OPCODEHGEN@ $(OPCODE_H_SCRIPT) Lib/ $(OPCODE_H) +OPCODE_H_DIR= $(srcdir)/Include +OPCODE_H_SCRIPT= $(srcdir)/Tools/scripts/generate_opcode_h.py +OPCODE_H= $(OPCODE_H_DIR)/opcode.h +OPCODE_H_GEN= @OPCODEHGEN@ $(OPCODE_H_SCRIPT) $(srcdir)/Lib/opcode.py $(OPCODE_H) # ########################################################################## # AST diff --git a/Tools/scripts/generate_opcode_h.py b/Tools/scripts/generate_opcode_h.py index b315491cb1..a329a404f4 100644 --- a/Tools/scripts/generate_opcode_h.py +++ b/Tools/scripts/generate_opcode_h.py @@ -1,10 +1,6 @@ # This script generates the opcode.h header file. import sys -if len(sys.argv) > 0: - sys.path.insert(0, sys.argv[1]) -# Importing module from our given src directory. -import opcode header = """/* Auto-generated by Tools/scripts/generate_opcode_h.py */ #ifndef Py_OPCODE_H #define Py_OPCODE_H @@ -37,17 +33,20 @@ enum cmp_op {PyCmp_LT=Py_LT, PyCmp_LE=Py_LE, PyCmp_EQ=Py_EQ, PyCmp_NE=Py_NE, """ -def main(outfile='Include/opcode.h'): +def main(opcode_py, outfile='Include/opcode.h'): + opcode = {} + exec(open(opcode_py).read(), opcode) + opmap = opcode['opmap'] with open(outfile, 'w') as fobj: fobj.write(header) - for name in opcode.opname: - if name in opcode.opmap: - fobj.write("#define %-20s\t%-3s\n" % (name, opcode.opmap[name])) + for name in opcode['opname']: + if name in opmap: + fobj.write("#define %-20s\t%-3s\n" % (name, opmap[name])) if name == 'POP_EXCEPT': # Special entry for HAVE_ARGUMENT fobj.write("#define %-20s\t%-3d\n" % - ('HAVE_ARGUMENT', opcode.HAVE_ARGUMENT)) + ('HAVE_ARGUMENT', opcode['HAVE_ARGUMENT'])) fobj.write(footer) if __name__ == '__main__': - main(sys.argv[2]) + main(sys.argv[1], sys.argv[2]) |