From f94fc2f497c22bd28b5f04ec58c97e0f4d95486f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 23 Mar 2015 00:21:40 +0300 Subject: modules/gnome: auto-set girepository directory Signed-off-by: Igor Gnatenko --- modules/gnome.py | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/gnome.py') diff --git a/modules/gnome.py b/modules/gnome.py index c0e391f..ef5f6b8 100644 --- a/modules/gnome.py +++ b/modules/gnome.py @@ -70,6 +70,7 @@ class GnomeModule: typelib_cmd = ['g-ir-compiler', scan_target, '--output', '@OUTPUT@'] kwargs['output'] = typelib_output kwargs['command'] = typelib_cmd + kwargs['install_dir'] = os.path.join(state.environment.get_libdir(), 'girepository-1.0') typelib_target = build.CustomTarget(typelib_name, state.subdir, kwargs) return [scan_target, typelib_target] -- cgit v1.1 From 888945ac2e6e212ee06ec7eaa6607b0faf1a2743 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 23 Mar 2015 00:32:41 +0300 Subject: modules/gnome: install Gir also and auto-detect it's dir Gir file should be installed in devel subpackage Signed-off-by: Igor Gnatenko --- modules/gnome.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'modules/gnome.py') diff --git a/modules/gnome.py b/modules/gnome.py index ef5f6b8..53e26ee 100644 --- a/modules/gnome.py +++ b/modules/gnome.py @@ -63,6 +63,9 @@ class GnomeModule: scankwargs = {'output' : girfile, 'input' : libsources, 'command' : scan_command} + if kwargs.get('install'): + scankwargs['install'] = kwargs['install'] + scankwargs['install_dir'] = os.path.join(state.environment.get_datadir(), 'gir-1.0') scan_target = build.CustomTarget(scan_name, state.subdir, scankwargs) typelib_name = girtarget.name + '-typelib' -- cgit v1.1 From e2b63141d08d3317b32acf8af7ce0854c7ffb1ee Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 23 Mar 2015 02:16:41 +0300 Subject: modules/gnome: use custom classes for targets. Closes #62 To easy identify which target we're building (for making files section in rpm) Signed-off-by: Igor Gnatenko --- modules/gnome.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'modules/gnome.py') diff --git a/modules/gnome.py b/modules/gnome.py index 53e26ee..80ee5fb 100644 --- a/modules/gnome.py +++ b/modules/gnome.py @@ -66,7 +66,7 @@ class GnomeModule: if kwargs.get('install'): scankwargs['install'] = kwargs['install'] scankwargs['install_dir'] = os.path.join(state.environment.get_datadir(), 'gir-1.0') - scan_target = build.CustomTarget(scan_name, state.subdir, scankwargs) + scan_target = GirTarget(scan_name, state.subdir, scankwargs) typelib_name = girtarget.name + '-typelib' typelib_output = '%s-%s.typelib' % (ns, nsversion) @@ -74,7 +74,7 @@ class GnomeModule: kwargs['output'] = typelib_output kwargs['command'] = typelib_cmd kwargs['install_dir'] = os.path.join(state.environment.get_libdir(), 'girepository-1.0') - typelib_target = build.CustomTarget(typelib_name, state.subdir, kwargs) + typelib_target = TypelibTarget(typelib_name, state.subdir, kwargs) return [scan_target, typelib_target] def compile_schemas(self, state, args, kwargs): @@ -115,3 +115,11 @@ def initialize(): mlog.log('Warning, glib compiled dependencies will not work until this upstream issue is fixed:', mlog.bold('https://bugzilla.gnome.org/show_bug.cgi?id=745754')) return GnomeModule() + +class GirTarget(build.CustomTarget): + def __init__(self, name, subdir, kwargs): + super().__init__(name, subdir, kwargs) + +class TypelibTarget(build.CustomTarget): + def __init__(self, name, subdir, kwargs): + super().__init__(name, subdir, kwargs) -- cgit v1.1