luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-01 15:03:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

gdbus-codegen: Add --output-directory flag

Browse Source 
This is useful with Meson where files are generated in subdirs

https://bugzilla.gnome.org/show_bug.cgi?id=778801
This commit is contained in:
Patrick Griffis
2017-02-16 21:03:18 -05:00
parent 001245171b
commit ee09bb704f
3 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gio/gdbus-2.0/codegen/codegen.py
View File

@@ -28,13 +28,15 @@ from . import dbustypes
# ----------------------------------------------------------------------------------------------------
class CodeGenerator:
def __init__(self, ifaces, namespace, interface_prefix, generate_objmanager, generate_autocleanup, docbook_gen, h, c):
def __init__(self, ifaces, namespace, interface_prefix, generate_objmanager,
generate_autocleanup, docbook_gen, h, c, header_name):
self.docbook_gen = docbook_gen
self.generate_objmanager = generate_objmanager
self.generate_autocleanup = generate_autocleanup
self.ifaces = ifaces
self.h = h
self.c = c
self.header_name = header_name
self.namespace = namespace
if len(namespace) > 0:
if utils.is_ugly_case(namespace):
@@ -48,7 +50,7 @@ class CodeGenerator:
self.ns_upper = ''
self.ns_lower = ''
self.interface_prefix = interface_prefix
self.header_guard = self.h.name.upper().replace('.', '_').replace('-', '_').replace('/', '_')
self.header_guard = header_name.upper().replace('.', '_').replace('-', '_').replace('/', '_')
# ----------------------------------------------------------------------------------------------------
@@ -67,7 +69,7 @@ class CodeGenerator:
'#include "%s"\n'
'\n'
'#include <string.h>\n'
%(self.h.name))
%(self.header_name))
self.c.write('#ifdef G_OS_UNIX\n'
'# include <gio/gunixfdlist.h>\n'

12
gio/gdbus-2.0/codegen/codegen_main.py
View File

@@ -21,6 +21,7 @@
import sys
import optparse
from os import path
from . import config
from . import utils
@@ -162,6 +163,8 @@ def codegen_main():
help='Generate Docbook in OUTFILES-org.Project.IFace.xml')
arg_parser.add_option('', '--annotate', nargs=3, action='append', metavar='WHAT KEY VALUE',
help='Add annotation (may be used several times)')
arg_parser.add_option('', '--output-directory', metavar='OUTDIR', default='',
help='Location to output generated files')
(opts, args) = arg_parser.parse_args();
all_ifaces = []
@@ -185,15 +188,18 @@ def codegen_main():
c_code = opts.generate_c_code
if c_code:
h = open(c_code + '.h', 'w')
c = open(c_code + '.c', 'w')
outdir = opts.output_directory
header_name = c_code + '.h'
h = open(path.join(outdir, header_name), 'w')
c = open(path.join(outdir, c_code + '.c'), 'w')
gen = codegen.CodeGenerator(all_ifaces,
opts.c_namespace,
opts.interface_prefix,
opts.c_generate_object_manager,
opts.c_generate_autocleanup,
docbook_gen,
h, c);
h, c,
header_name)
ret = gen.generate()
h.close()
c.close()