containers
/
toolbox
mirror of https://github.com/containers/toolbox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: Ship the Go implementation by default, not the POSIX shell one 

The Go implementation is now considered stable enough for wider use,
and should have feature parity with its POSIX shell counterpart.

https://github.com/containers/toolbox/pull/437
This commit is contained in:
Debarshi Ray 2020-05-13 23:34:00 +02:00
parent edf6aa4d1c
commit 0b3c66434e
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meson.build
View File

@ -5,7 +5,7 @@ project(
meson_version: '>= 0.40.0', meson_version: '>= 0.40.0',
) )
go = find_program('go', required: false) go = find_program('go')
go_md2man = find_program('go-md2man') go_md2man = find_program('go-md2man')
shellcheck = find_program('shellcheck', required: false) shellcheck = find_program('shellcheck', required: false)
@ -20,11 +20,6 @@ if shellcheck.found()
test('shellcheck', shellcheck, args: [toolbox]) test('shellcheck', shellcheck, args: [toolbox])
endif endif
install_data(
toolbox,
install_dir: get_option('bindir'),
)
bash_completion = dependency('bash-completion', required: false) bash_completion = dependency('bash-completion', required: false)
if bash_completion.found() if bash_completion.found()
install_data( install_data(

18
src/meson.build
View File

@ -19,15 +19,15 @@ sources = files(
'pkg/version/version.go', 'pkg/version/version.go',
) )
if go.found() custom_target(
custom_target( 'toolbox',
'toolbox-go', build_by_default: true,
build_by_default: true, command: [go_build_wrapper_program, meson.current_source_dir(), meson.current_build_dir()],
command: [go_build_wrapper_program, meson.current_source_dir(), meson.current_build_dir()], input: sources,
input: sources, install: true,
output: 'toolbox', install_dir: get_option('bindir'),
) output: 'toolbox',
endif )
if shellcheck.found() if shellcheck.found()
test('shellcheck go-build-wrapper', shellcheck, args: [go_build_wrapper_file]) test('shellcheck go-build-wrapper', shellcheck, args: [go_build_wrapper_file])