Skip to content

gnome: allow boolean 'false' for install_dir_gir/typelib #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
VaiTon wants to merge 1 commit into from
+21 −5
Closed

gnome: allow boolean 'false' for install_dir_gir/typelib #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/install.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ push_install_targets(struct workspace *wk,
.install_dirs_is_arr = get_obj_type(wk, install_dirs) == obj_array,
};

assert(ctx.install_dirs_is_arr || get_obj_type(wk, install_dirs) == obj_string);
assert(ctx.install_dirs_is_arr || get_obj_type(wk, install_dirs) == obj_string || get_obj_type(wk, install_dirs) == obj_bool);

if (ctx.install_dirs_is_arr) {
struct obj_array *a1 = get_obj_array(wk, filenames);
Expand Down
24 changes: 20 additions & 4 deletions src/script/modules/gnome.meson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,8 @@ func generate_gir(
includes listify[str]: [],
install_gir bool:,
install_typelib bool:,
install_dir_gir str:,
install_dir_typelib str:,
install_dir_gir bool|str:,
install_dir_typelib bool|str:,
link_with listify[both_libs|build_tgt]: [],
namespace str:,
nsversion str:,
Expand All @@ -218,6 +218,14 @@ func generate_gir(
error('nsversion kwarg is required')
endif

if typeof(install_dir_gir) == 'bool' and install_dir_gir == true
error('install_dir_gir as boolean can only be false')
endif

if typeof(install_dir_typelib) == 'bool' and install_dir_typelib == true
error('install_dir_typelib as boolean can only be false')
endif

# Determine install directories
if is_null(install_dir_gir)
install_dir_gir = get_option('datadir') / 'gir-1.0'
Expand All @@ -228,11 +236,19 @@ func generate_gir(
endif

if is_null(install_gir)
install_gir = install
if install_dir_gir == false
install_gir = false
else
install_gir = install
endif
endif

if is_null(install_typelib)
install_typelib = install
if install_dir_typelib == false
install_typelib = false
else
install_typelib = install
endif
endif

# Find required programs
Expand Down
Loading