From e494be9b02cf0dccbc2b7010a6c5063c77bbada7 Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz@archlinux.org>
Date: Mon, 8 Mar 2021 23:28:15 -0500
Subject: [PATCH] setuptools: don't hardcode list of modules to install, use
 find_packages

And don't run a pointless test to verify that the hardcoded list has
been manually maintained correctly. The same test rules used there can
translate directly to find_packages pattern rules.
---
 run_meson_command_tests.py | 15 ---------------
 setup.py                   | 19 +++++--------------
 2 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/run_meson_command_tests.py b/run_meson_command_tests.py
index 750e09d48..c84e415ce 100755
--- a/run_meson_command_tests.py
+++ b/run_meson_command_tests.py
@@ -136,21 +136,6 @@ class CommandTests(unittest.TestCase):
         # Check that all the files were installed correctly
         self.assertTrue(bindir.is_dir())
         self.assertTrue(pylibdir.is_dir())
-        from setup import packages
-        # Extract list of expected python module files
-        expect = set()
-        for pkg in packages:
-            expect.update([p.as_posix() for p in Path(pkg.replace('.', '/')).glob('*.py')])
-        # Check what was installed, only count files that are inside 'mesonbuild'
-        have = set()
-        for p in Path(pylibdir).glob('**/*.py'):
-            s = p.as_posix()
-            if 'mesonbuild' not in s:
-                continue
-            if '/data/' in s:
-                continue
-            have.add(s[s.rfind('mesonbuild'):])
-        self.assertEqual(have, expect)
         # Run `meson`
         os.chdir('/')
         resolved_meson_command = [str(bindir / 'meson')]
diff --git a/setup.py b/setup.py
index 17a00b34d..fd396c060 100644
--- a/setup.py
+++ b/setup.py
@@ -21,23 +21,11 @@ if sys.version_info < (3, 6):
                      '\nMeson requires Python 3.6.0 or greater'.format(sys.version))
 
 from mesonbuild.coredata import version
-from setuptools import setup
+from setuptools import setup, find_packages
 
 # On windows, will create Scripts/meson.exe and Scripts/meson-script.py
 # Other platforms will create bin/meson
 entries = {'console_scripts': ['meson=mesonbuild.mesonmain:main']}
-packages = ['mesonbuild',
-            'mesonbuild.ast',
-            'mesonbuild.backend',
-            'mesonbuild.cmake',
-            'mesonbuild.compilers',
-            'mesonbuild.compilers.mixins',
-            'mesonbuild.dependencies',
-            'mesonbuild.mesonlib',
-            'mesonbuild.modules',
-            'mesonbuild.scripts',
-            'mesonbuild.templates',
-            'mesonbuild.wrap']
 data_files = []
 if sys.platform != 'win32':
     # Only useful on UNIX-like systems
@@ -47,6 +35,9 @@ if sys.platform != 'win32':
 if __name__ == '__main__':
     setup(name='meson',
           version=version,
-          packages=packages,
+          packages=find_packages(
+              include=['mesonbuild', 'mesonbuild.*'],
+              exclude=['*.data']
+          ),
           entry_points=entries,
           data_files=data_files,)