Skip to content

Commit

Permalink
build: Ship the Go implementation by default, not the POSIX shell one
Browse files Browse the repository at this point in the history
The Go implementation is now considered stable enough for wider use,
and should have feature parity with its POSIX shell counterpart.

#437
  • Loading branch information
debarshiray committed May 14, 2020
1 parent edf6aa4 commit 0b3c664
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 15 deletions.
7 changes: 1 addition & 6 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ project(
meson_version: '>= 0.40.0',
)

go = find_program('go', required: false)
go = find_program('go')
go_md2man = find_program('go-md2man')
shellcheck = find_program('shellcheck', required: false)

Expand All @@ -20,11 +20,6 @@ if shellcheck.found()
test('shellcheck', shellcheck, args: [toolbox])
endif

install_data(
toolbox,
install_dir: get_option('bindir'),
)

bash_completion = dependency('bash-completion', required: false)
if bash_completion.found()
install_data(
Expand Down
18 changes: 9 additions & 9 deletions src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ sources = files(
'pkg/version/version.go',
)

if go.found()
custom_target(
'toolbox-go',
build_by_default: true,
command: [go_build_wrapper_program, meson.current_source_dir(), meson.current_build_dir()],
input: sources,
output: 'toolbox',
)
endif
custom_target(
'toolbox',
build_by_default: true,
command: [go_build_wrapper_program, meson.current_source_dir(), meson.current_build_dir()],
input: sources,
install: true,
install_dir: get_option('bindir'),
output: 'toolbox',
)

if shellcheck.found()
test('shellcheck go-build-wrapper', shellcheck, args: [go_build_wrapper_file])
Expand Down

0 comments on commit 0b3c664

Please sign in to comment.