diff options
author | Jan-Michael Brummer <jan.brummer@tabos.org> | 2023-03-11 23:01:23 +0100 |
---|---|---|
committer | Jan-Michael Brummer <jan.brummer@tabos.org> | 2023-03-27 16:31:58 +0200 |
commit | e0424607df081c88b0c4531c9b2a3da6bfb506c0 (patch) | |
tree | 56a3c8e2288c1a2460f16e7eeb0e9c64ae170074 | |
parent | 4b883bf6dde14b655b251f3d1db9dce6f2f32f56 (diff) | |
download | libproxy-git-e0424607df081c88b0c4531c9b2a3da6bfb506c0.tar.gz |
Various cleanups (#69)
-rw-r--r-- | docs/meson.build | 2 | ||||
-rw-r--r-- | docs/px.toml.in | 2 | ||||
-rw-r--r-- | meson.build | 21 | ||||
-rw-r--r-- | meson_options.txt | 7 | ||||
-rw-r--r-- | src/backend/dbus/dbus.c | 2 | ||||
-rw-r--r-- | src/backend/meson.build | 20 | ||||
-rw-r--r-- | src/backend/px-manager.c | 4 | ||||
-rw-r--r-- | src/backend/px-manager.h | 11 | ||||
-rw-r--r-- | src/backend/px-plugin-config.c | 1 | ||||
-rw-r--r-- | src/backend/px-plugin-pacrunner.h | 1 | ||||
-rw-r--r-- | src/libproxy/meson.build | 68 | ||||
-rw-r--r-- | src/libproxy/proxy.c | 2 |
12 files changed, 58 insertions, 83 deletions
diff --git a/docs/meson.build b/docs/meson.build index 556a13d..09263c5 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -23,7 +23,7 @@ docs_dir = datadir / 'doc' custom_target('px-doc', input: [ px_toml, libproxy_gir[0] ], - output: 'libproxy-@0@'.format(apiversion), + output: 'libproxy-@0@'.format(api_version), command: [ gidocgen, 'generate', diff --git a/docs/px.toml.in b/docs/px.toml.in index 5bc08c9..740419b 100644 --- a/docs/px.toml.in +++ b/docs/px.toml.in @@ -6,7 +6,7 @@ license = "LGPL-2.1-or-later" browse_url = "https://github.com/janbrummer/libproxy2" repository_url = "https://github.com/janbrummer/libproxy2" website_url = "https://janbrummer.github.io/libproxy2/" -logo_url = "libproxy.svg" +# logo_url = "libproxy.svg" dependencies = [ "GObject-2.0", "Gio-2.0", diff --git a/meson.build b/meson.build index 695c3df..924a0c7 100644 --- a/meson.build +++ b/meson.build @@ -4,11 +4,14 @@ project('libproxy', 'c', default_options: [ 'warning_level=2', 'werror=false', 'c_std=gnu11', ], ) -cc = meson.get_compiler('c') +version_arr = meson.project_version().split('-')[0].split('.') +libproxy_version_major = version_arr[0].to_int() +libproxy_version_minor = version_arr[1].to_int() root_dir = include_directories('.') px_prefix = get_option('prefix') +datadir = get_option('datadir') px_libdir = join_paths(px_prefix, get_option('libdir')) px_plugins_dir = join_paths(px_libdir, meson.project_name().to_lower(), 'plugins') girdir = get_option('datadir') / 'gir-1.0' @@ -17,15 +20,11 @@ vapidir = get_option('datadir') / 'vala' / 'vapi' add_project_arguments(['-I' + meson.project_build_root()], language: 'c') -version_arr = meson.project_version().split('-')[0].split('.') -libproxy_version_major = version_arr[0].to_int() -libproxy_version_minor = version_arr[1].to_int() - -apiversion = '1.0' -package_api_name = '@0@-@1@'.format(meson.project_name(), apiversion) +# The major api version as encoded in the libraries name +api_version = '1.0' +package_api_name = '@0@-@1@'.format(meson.project_name(), api_version) -libproxy_prefix = get_option('prefix') -datadir = get_option('datadir') +cc = meson.get_compiler('c') project_c_args = [] test_c_args = [ @@ -83,9 +82,7 @@ test_c_args = [ '-fno-strict-aliasing', ['-Werror=format-security', '-Werror=format=2'], ] -#if get_option('buildtype') != 'plain' -# test_c_args += '-fstack-protector-strong' -#endif + foreach arg: test_c_args if cc.has_multi_arguments(arg) project_c_args += arg diff --git a/meson_options.txt b/meson_options.txt index 1c530b8..04389b9 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -80,4 +80,11 @@ option( type: 'boolean', value: true, description: 'Whether to build cURL support' +) + +option( + 'introspection', + type: 'boolean', + value: true, + description: 'Whether to build introspection support' )
\ No newline at end of file diff --git a/src/backend/dbus/dbus.c b/src/backend/dbus/dbus.c index 2495257..a04c0f9 100644 --- a/src/backend/dbus/dbus.c +++ b/src/backend/dbus/dbus.c @@ -1,4 +1,4 @@ -/* main.c +/* dbus.c * * Copyright 2022-2023 The Libproxy Team * diff --git a/src/backend/meson.build b/src/backend/meson.build index 4a9a1ab..b0b8de9 100644 --- a/src/backend/meson.build +++ b/src/backend/meson.build @@ -1,5 +1,3 @@ -api_version = '1.0' - px_backend_sources = [ 'px-manager.c', 'px-manager.h', @@ -17,12 +15,12 @@ px_backend_deps = [ ] px_backend_c_args = [ - '-DG_LOG_DOMAIN="libpxbackend"', + '-DG_LOG_DOMAIN="pxbackend"', ] px_backend_inc = include_directories('.') -px_backend_lib = shared_library( +px_backend = shared_library( 'pxbackend-@0@'.format(api_version), px_backend_sources, dependencies: px_backend_deps, @@ -30,21 +28,9 @@ px_backend_lib = shared_library( install: true ) -gnome = import('gnome') -px_backend_gir = gnome.generate_gir( - px_backend_lib, - sources: px_backend_sources, - nsversion: api_version, - namespace: 'Px', - symbol_prefix: 'px', - identifier_prefix: 'Px', - includes: [ 'Gio-2.0' ], - install: false, -) - px_backend_dep = declare_dependency( include_directories: px_backend_inc, - link_with: px_backend_lib, + link_with: px_backend, dependencies: px_backend_deps ) diff --git a/src/backend/px-manager.c b/src/backend/px-manager.c index ad230ac..51669cb 100644 --- a/src/backend/px-manager.c +++ b/src/backend/px-manager.c @@ -46,7 +46,6 @@ static GParamSpec *obj_properties[LAST_PROP]; * Manage libproxy modules */ -/* TODO: Move to private structure */ struct _PxManager { GObject parent_instance; PeasEngine *engine; @@ -286,6 +285,7 @@ px_manager_new (void) return px_manager_new_with_options ("plugins-dir", PX_PLUGINS_DIR, NULL); } +#ifdef HAVE_CURL static size_t store_data (void *contents, size_t size, @@ -299,6 +299,7 @@ store_data (void *contents, return real_size; } +#endif /** * px_manager_pac_download: @@ -548,7 +549,6 @@ px_manager_get_proxies_sync (PxManager *self, const char *url, GError **error) { - /* GList *list; */ g_autoptr (GStrvBuilder) builder = g_strv_builder_new (); g_autoptr (GUri) uri = g_uri_parse (url, G_URI_FLAGS_PARSE_RELAXED, error); g_auto (GStrv) config = NULL; diff --git a/src/backend/px-manager.h b/src/backend/px-manager.h index 74c0584..486fb51 100644 --- a/src/backend/px-manager.h +++ b/src/backend/px-manager.h @@ -26,17 +26,6 @@ G_BEGIN_DECLS #define PX_TYPE_MANAGER (px_manager_get_type()) -// #define PX_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PX_TYPE_MANAGER, PxManager)) - -// typedef struct _PxManager PxManager; -// typedef struct _PxManagerClass PxManagerClass; - -// struct _PxManagerClass -// { -// GObjectClass parent_class; - -// gboolean (*get_config) (PxManager *self, GUri *uri); -// }; G_DECLARE_FINAL_TYPE (PxManager, px_manager, PX, MANAGER, GObject) diff --git a/src/backend/px-plugin-config.c b/src/backend/px-plugin-config.c index d71d49a..22f369a 100644 --- a/src/backend/px-plugin-config.c +++ b/src/backend/px-plugin-config.c @@ -19,7 +19,6 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ - #include "px-plugin-config.h" G_DEFINE_INTERFACE (PxConfig, px_config, G_TYPE_OBJECT) diff --git a/src/backend/px-plugin-pacrunner.h b/src/backend/px-plugin-pacrunner.h index f7251ce..4b03a24 100644 --- a/src/backend/px-plugin-pacrunner.h +++ b/src/backend/px-plugin-pacrunner.h @@ -19,7 +19,6 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ - #pragma once #include <glib-object.h> diff --git a/src/libproxy/meson.build b/src/libproxy/meson.build index 8fdd880..873b184 100644 --- a/src/libproxy/meson.build +++ b/src/libproxy/meson.build @@ -1,5 +1,3 @@ -api_version = '1.0' - libproxy_inc = include_directories('.') libproxy_sources = [] @@ -30,7 +28,7 @@ if cc.has_multi_link_arguments(vscript) vflag += vscript endif -libproxy_lib = shared_library( +libproxy = shared_library( 'proxy', libproxy_sources, include_directories: px_backend_inc, @@ -43,7 +41,7 @@ libproxy_lib = shared_library( libproxy_dep = declare_dependency ( include_directories: libproxy_inc, - link_with: libproxy_lib, + link_with: libproxy, dependencies: libproxy_deps ) @@ -51,7 +49,7 @@ install_headers(libproxy_headers, subdir: 'libproxy') pkg = import('pkgconfig') pkg.generate( - libraries: [libproxy_lib], + libraries: [libproxy], subdirs: 'libproxy', version: meson.project_version(), name: 'libproxy', @@ -61,35 +59,37 @@ pkg.generate( install_dir: join_paths(get_option('libdir'), 'pkgconfig') ) -gnome = import('gnome') +if get_option('introspection') + gnome = import('gnome') -libproxy_gir_extra_args = [ - '--c-include=proxy.h', - '--quiet', -] + libproxy_gir_extra_args = [ + '--c-include=proxy.h', + '--quiet', + ] -libproxy_gir = gnome.generate_gir( - libproxy_lib, - sources: libproxy_headers + libproxy_sources, - nsversion: api_version, - namespace: 'Libproxy', - export_packages: package_api_name, - symbol_prefix: 'px', - identifier_prefix: 'px', - link_with: libproxy_lib, - includes: [ 'Gio-2.0' ], - install: true, - install_dir_gir: girdir, - install_dir_typelib: typelibdir, - extra_args: libproxy_gir_extra_args, -) - -if get_option('vapi') - libproxy_vapi = gnome.generate_vapi(package_api_name, - sources: libproxy_gir[0], - packages: [ 'gio-2.0' ], - install: true, - install_dir: vapidir, - metadata_dirs: [ meson.current_source_dir() ], + libproxy_gir = gnome.generate_gir( + libproxy, + sources: libproxy_headers + libproxy_sources, + nsversion: api_version, + namespace: 'Libproxy', + export_packages: package_api_name, + symbol_prefix: 'px', + identifier_prefix: 'px', + link_with: libproxy, + includes: [ 'Gio-2.0' ], + install: true, + install_dir_gir: girdir, + install_dir_typelib: typelibdir, + extra_args: libproxy_gir_extra_args, ) -endif + + if get_option('vapi') + libproxy_vapi = gnome.generate_vapi(package_api_name, + sources: libproxy_gir[0], + packages: [ 'gio-2.0' ], + install: true, + install_dir: vapidir, + metadata_dirs: [ meson.current_source_dir() ], + ) + endif +endif
\ No newline at end of file diff --git a/src/libproxy/proxy.c b/src/libproxy/proxy.c index 2ae6041..5c910a1 100644 --- a/src/libproxy/proxy.c +++ b/src/libproxy/proxy.c @@ -27,8 +27,6 @@ /** * SECTION:px-proxy * @short_description: A convient helper for using proxy servers - * - * Test 123 */ struct _pxProxyFactory { |