mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-12 12:21:30 +00:00
bc17f73dcb
Original commit message from CVS: * codegen/Makefile.am: * codegen/argtypes.py: * codegen/codegen.py: * codegen/definitions.py: * codegen/defsconvert.py: * codegen/defsparser.py: * codegen/docextract.py: * codegen/docextract_to_xml.py: * codegen/docgen.py: * codegen/h2def.py: * codegen/mergedefs.py: * codegen/missingdefs.py: * codegen/mkskel.py: * codegen/override.py: * codegen/reversewrapper.py: Updated codegenerator to current pygtk one. * gst/gst.defs: * gst/gst.override: * gst/gstpad.override: Update defs for new constructor definition. * testsuite/test_bin.py: With new constructors, pygobject will try to convert the argument to the proper GType (here a string).
26 lines
665 B
Python
Executable file
26 lines
665 B
Python
Executable file
#!/usr/bin/env python
|
|
# -*- Mode: Python; py-indent-offset: 4 -*-
|
|
|
|
import optparse
|
|
|
|
import defsparser
|
|
|
|
parser = optparse.OptionParser(
|
|
usage="usage: %prog [options] generated-defs old-defs")
|
|
parser.add_option("-p", "--merge-parameters",
|
|
help="Merge changes in function/methods parameter lists",
|
|
action="store_true", dest="parmerge", default=False)
|
|
(options, args) = parser.parse_args()
|
|
|
|
if len(args) != 2:
|
|
parser.error("wrong number of arguments")
|
|
|
|
newp = defsparser.DefsParser(args[0])
|
|
oldp = defsparser.DefsParser(args[1])
|
|
|
|
newp.startParsing()
|
|
oldp.startParsing()
|
|
|
|
newp.merge(oldp, options.parmerge)
|
|
|
|
newp.write_defs()
|