From 5c3c2cf6b3944fb98e4a0cfa78ac5c29888b0d65 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Thu, 8 Feb 2024 14:32:35 +0000 Subject: [PATCH] girepository: Rename g-ir-generate and g-ir-inspect MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename them to `gi-decompile-repository` and `gi-inspect-repository` to match the existing `gi-compile-repository`. The names have to differ from those used in girepository-1.0 to avoid collisions. ‘generate’ has been changed to ‘decompile’ because it does the inverse of what `gi-compile-repository` does: it converts a typelib to a GIR file. ‘generate’ never really made much sense for this anyway — it’s almost a synonym of ‘compile’. Signed-off-by: Philip Withnall Helps: #3155 --- .../generate.c => decompiler/decompiler.c} | 0 girepository/decompiler/meson.build | 25 +++++++++++++++++++ .../g-ir-inspect.c => inspector/inspector.c} | 0 girepository/inspector/meson.build | 24 ++++++++++++++++++ girepository/meson.build | 2 ++ 5 files changed, 51 insertions(+) rename girepository/{tools/generate.c => decompiler/decompiler.c} (100%) create mode 100644 girepository/decompiler/meson.build rename girepository/{tools/g-ir-inspect.c => inspector/inspector.c} (100%) create mode 100644 girepository/inspector/meson.build diff --git a/girepository/tools/generate.c b/girepository/decompiler/decompiler.c similarity index 100% rename from girepository/tools/generate.c rename to girepository/decompiler/decompiler.c diff --git a/girepository/decompiler/meson.build b/girepository/decompiler/meson.build new file mode 100644 index 000000000..cb4553262 --- /dev/null +++ b/girepository/decompiler/meson.build @@ -0,0 +1,25 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-FileCopyrightText: 2024 GNOME Foundation + +custom_c_args = [ + '-DG_LOG_DOMAIN="GLib-GirDecompiler"', +] + +if cc.get_id() != 'msvc' + custom_c_args = cc.get_supported_arguments([ + '-Wno-old-style-definition', + '-Wno-cast-align', + '-Wno-unused-parameter', + '-Wno-duplicated-branches', + ]) +endif + +gidecompiletypelib = executable('gi-decompile-typelib', 'decompiler.c', + dependencies: [ + libgirepository_dep, + libgirepository_internals_dep, + libgio_dep, + ], + install: true, + c_args: custom_c_args, +) diff --git a/girepository/tools/g-ir-inspect.c b/girepository/inspector/inspector.c similarity index 100% rename from girepository/tools/g-ir-inspect.c rename to girepository/inspector/inspector.c diff --git a/girepository/inspector/meson.build b/girepository/inspector/meson.build new file mode 100644 index 000000000..8948cedc8 --- /dev/null +++ b/girepository/inspector/meson.build @@ -0,0 +1,24 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-FileCopyrightText: 2024 GNOME Foundation + +custom_c_args = [ + '-DG_LOG_DOMAIN="GLib-GirInspector"', +] + +if cc.get_id() != 'msvc' + custom_c_args = cc.get_supported_arguments([ + '-Wno-old-style-definition', + '-Wno-cast-align', + '-Wno-unused-parameter', + '-Wno-duplicated-branches', + ]) +endif + +giinspecttypelib = executable('gi-inspect-typelib', 'inspector.c', + dependencies: [ + libgirepository_dep, + libgio_dep, + ], + install: true, + c_args: custom_c_args, +) diff --git a/girepository/meson.build b/girepository/meson.build index 3dd539376..3292f6672 100644 --- a/girepository/meson.build +++ b/girepository/meson.build @@ -243,3 +243,5 @@ if build_tests endif subdir('compiler') +subdir('decompiler') +subdir('inspector') \ No newline at end of file