wbrawner/toolbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: Disambiguate the 'toolbox' file and target

Browse source 
Fallout from 6c0b045e1a

https://github.com/containers/toolbox/pull/1120
This commit is contained in:
Debarshi Ray 2022-09-09 15:30:28 +02:00
parent 66d0418595
commit e6c0c00d79
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
completion/meson.build
View file

@ -17,7 +17,7 @@ endif
completion_bash = custom_target('bash-completion', completion_bash = custom_target('bash-completion',
capture: true, capture: true,
command: [generate_completions_program, meson.global_source_root() / 'src', 'bash'], command: [generate_completions_program, meson.global_source_root() / 'src', 'bash'],
depends: [toolbox], depends: [toolbox_go],
install: true, install: true,
install_dir: bash_comp_dir, install_dir: bash_comp_dir,
output: 'toolbox') output: 'toolbox')
@ -25,7 +25,7 @@ completion_bash = custom_target('bash-completion',
completion_zsh = custom_target('zsh-completion', completion_zsh = custom_target('zsh-completion',
capture: true, capture: true,
command: [generate_completions_program, meson.global_source_root() / 'src', 'zsh'], command: [generate_completions_program, meson.global_source_root() / 'src', 'zsh'],
depends: [toolbox], depends: [toolbox_go],
install: true, install: true,
install_dir: get_option('datadir') / 'zsh' / 'site-functions', install_dir: get_option('datadir') / 'zsh' / 'site-functions',
output: '_toolbox') output: '_toolbox')
@ -33,7 +33,7 @@ completion_zsh = custom_target('zsh-completion',
completion_fish = custom_target('fish-completion', completion_fish = custom_target('fish-completion',
capture: true, capture: true,
command: [generate_completions_program, meson.global_source_root() / 'src', 'fish'], command: [generate_completions_program, meson.global_source_root() / 'src', 'fish'],
depends: [toolbox], depends: [toolbox_go],
install: true, install: true,
install_dir: fish_comp_dir, install_dir: fish_comp_dir,
output: 'toolbox.fish') output: 'toolbox.fish')

4
meson.build
View file

@ -33,10 +33,10 @@ if tmpfilesdir == '' or not fs.exists('/run/.containerenv')
endif endif
endif endif
toolbox = files('toolbox') toolbox_sh = files('toolbox')
if shellcheck.found() if shellcheck.found()
test('shellcheck', shellcheck, args: [toolbox]) test('shellcheck', shellcheck, args: [toolbox_sh])
endif endif
if not skopeo.found() if not skopeo.found()

6
profile.d/meson.build
View file

@ -1,10 +1,10 @@
toolbox_sh = files('toolbox.sh') profile_toolbox_sh = files('toolbox.sh')
if shellcheck.found() if shellcheck.found()
test('shellcheck profile.d', shellcheck, args: ['--shell=sh', toolbox_sh]) test('shellcheck profile.d', shellcheck, args: ['--shell=sh', profile_toolbox_sh])
endif endif
install_data( install_data(
toolbox_sh, profile_toolbox_sh,
install_dir: profiledir, install_dir: profiledir,
) )

2
src/meson.build
View file

@ -48,7 +48,7 @@ endif
message('Host machine dynamic linker:', dynamic_linker) message('Host machine dynamic linker:', dynamic_linker)
toolbox = custom_target( toolbox_go = custom_target(
'toolbox', 'toolbox',
command: [ command: [
go_build_wrapper_program, go_build_wrapper_program,