From b4c635a2e85a92bd0c3dd69c2d70612d09158bbd Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Wed, 11 Jul 2018 23:07:39 +0300 Subject: Remove long deprecated command scripts. --- man/mesonconf.1 | 10 ---------- man/mesonintrospect.1 | 13 ------------- man/mesontest.1 | 13 ------------- man/wraptool.1 | 13 ------------- mesonconf.py | 20 -------------------- mesonintrospect.py | 20 -------------------- mesonrewriter.py | 29 ----------------------------- mesontest.py | 22 ---------------------- setup.py | 12 ++---------- wraptool.py | 23 ----------------------- 10 files changed, 2 insertions(+), 173 deletions(-) delete mode 100644 man/mesonconf.1 delete mode 100644 man/mesonintrospect.1 delete mode 100644 man/mesontest.1 delete mode 100644 man/wraptool.1 delete mode 100755 mesonconf.py delete mode 100755 mesonintrospect.py delete mode 100755 mesonrewriter.py delete mode 100755 mesontest.py delete mode 100755 wraptool.py diff --git a/man/mesonconf.1 b/man/mesonconf.1 deleted file mode 100644 index 5463c71dc..000000000 --- a/man/mesonconf.1 +++ /dev/null @@ -1,10 +0,0 @@ -.TH MESONCONF "1" "July 2018" "mesonconf 0.47.0" "User Commands" -.SH NAME -mesonconf - a tool to configure Meson builds -.SH DESCRIPTION - -This executable is deprecated and will be removed in the future. The -functionality that was in this executable can be invoked via the main Meson -command like this: - -.B meson configure diff --git a/man/mesonintrospect.1 b/man/mesonintrospect.1 deleted file mode 100644 index 5d3eb429f..000000000 --- a/man/mesonintrospect.1 +++ /dev/null @@ -1,13 +0,0 @@ -.TH MESONINTROSPECT "1" "July 2018" "mesonintrospect 0.47.0" "User Commands" -.SH NAME -mesonintrospect - a tool to extract information about a Meson build -.SH DESCRIPTION - -This executable is deprecated and will be removed in the future. The -functionality that was in this executable can be invoked via the main Meson -command like this: - -.B meson introspect - -.SH SEE ALSO -http://mesonbuild.com/ diff --git a/man/mesontest.1 b/man/mesontest.1 deleted file mode 100644 index e231bf64f..000000000 --- a/man/mesontest.1 +++ /dev/null @@ -1,13 +0,0 @@ -.TH MESON "1" "July 2018" "meson 0.47.0" "User Commands" -.SH NAME -mesontest - test tool for the Meson build system -.SH DESCRIPTION - -This executable is deprecated and will be removed in the future. The -functionality that was in this executable can be invoked via the main Meson -command like this: - -.B meson test - -.SH SEE ALSO -http://mesonbuild.com/ diff --git a/man/wraptool.1 b/man/wraptool.1 deleted file mode 100644 index 7895e39e9..000000000 --- a/man/wraptool.1 +++ /dev/null @@ -1,13 +0,0 @@ -.TH WRAPTOOL "1" "July 2018" "meson 0.47.0" "User Commands" -.SH NAME -wraptool - source dependency downloader -.SH DESCRIPTION - -This executable is deprecated and will be removed in the future. The -functionality that was in this executable can be invoked via the main Meson -command like this: - -.B meson wrap - -.SH SEE ALSO -http://wrapdb.mesonbuild.com/ diff --git a/mesonconf.py b/mesonconf.py deleted file mode 100755 index 894ec013d..000000000 --- a/mesonconf.py +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python3 - -# Copyright 2016 The Meson development team - -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import sys - -if __name__ == '__main__': - sys.exit('Error: This executable is no more. Use "meson configure" instead.') diff --git a/mesonintrospect.py b/mesonintrospect.py deleted file mode 100755 index 9ef153577..000000000 --- a/mesonintrospect.py +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python3 - -# Copyright 2016 The Meson development team - -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import sys - -if __name__ == '__main__': - sys.exit('Error: This executable is no more. Use "meson introspect" instead.') diff --git a/mesonrewriter.py b/mesonrewriter.py deleted file mode 100755 index ef47e5715..000000000 --- a/mesonrewriter.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env python3 -# Copyright 2016 The Meson development team - -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# This class contains the basic functionality needed to run any interpreter -# or an interpreter-based tool. - -# This tool is used to manipulate an existing Meson build definition. -# -# - add a file to a target -# - remove files from a target -# - move targets -# - reindent? - -import sys - -if __name__ == '__main__': - sys.exit('Error: This executable is no more. Use "meson rewrite" instead.') diff --git a/mesontest.py b/mesontest.py deleted file mode 100755 index e973d56c3..000000000 --- a/mesontest.py +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env python3 - -# Copyright 2016-2017 The Meson development team - -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# A tool to run tests in many different ways. - -import sys - -if __name__ == '__main__': - sys.exit('Error: This executable is no more. Use "meson test" instead.') diff --git a/setup.py b/setup.py index bfa08df2e..8c267a32f 100644 --- a/setup.py +++ b/setup.py @@ -71,17 +71,9 @@ setup(name='meson', 'mesonbuild.modules', 'mesonbuild.scripts', 'mesonbuild.wrap'], - scripts=['meson.py', - 'mesonconf.py', - 'mesontest.py', - 'mesonintrospect.py', - 'wraptool.py'], + scripts=['meson.py'], cmdclass={'install_scripts': install_scripts}, - data_files=[('share/man/man1', ['man/meson.1', - 'man/mesonconf.1', - 'man/mesonintrospect.1', - 'man/mesontest.1', - 'man/wraptool.1']), + data_files=[('share/man/man1', ['man/meson.1']), ('share/polkit-1/actions', ['data/com.mesonbuild.install.policy'])], classifiers=['Development Status :: 5 - Production/Stable', 'Environment :: Console', diff --git a/wraptool.py b/wraptool.py deleted file mode 100755 index a5ee9ef4e..000000000 --- a/wraptool.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python3 - -# Copyright 2016 The Meson development team - -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from mesonbuild.wrap import wraptool -import sys - -if __name__ == '__main__': - print('Warning: This executable is deprecated. Use "meson wrap" instead.', - file=sys.stderr) - sys.exit(wraptool.run(sys.argv[1:])) -- cgit v1.2.3