Back to .py suffix in files. Closes mesonbuild#394.

pbo-linaro · Mar 2, 2016 · 455e55f · 455e55f
1 parent 52b66ed
commit 455e55f
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 1 deletion.
diff --git a/meson → meson.py b/meson → meson.py
diff --git a/mesonconf → mesonconf.py b/mesonconf → mesonconf.py
diff --git a/mesongui → mesongui.py b/mesongui → mesongui.py
diff --git a/mesonintrospect → mesonintrospect.py b/mesonintrospect → mesonintrospect.py
diff --git a/run_tests.py b/run_tests.py
@@ -46,6 +46,10 @@ def __init__(self, msg, stdo, stde, conftime=0, buildtime=0, testtime=0):
 test_build_dir = 'work area'
 install_dir = os.path.join(os.path.split(os.path.abspath(__file__))[0], 'install dir')
 meson_command = os.path.join(os.getcwd(), 'meson')
+if not os.path.exists(meson_command):
+    meson_command += '.py'
+    if not os.path.exists(meson_command):
+        raise RuntimeError('Could not find main Meson script to run.')
 
 class StopException(Exception):
     def __init__(self):

diff --git a/setup.py b/setup.py
@@ -37,7 +37,11 @@
                 'mesonbuild.backend',
                 'mesonbuild.wrap'],
       package_data={'mesonbuild': ['*.ui']},
-      scripts=['meson', 'mesonconf', 'mesongui', 'mesonintrospect', 'wraptool'],
+      scripts=['meson.py',
+               'mesonconf.py',
+               'mesongui.py',
+               'mesonintrospect.py',
+               'wraptool.py'],
       data_files=[('share/man/man1', ['man/meson.1',
                                       'man/mesonconf.1',
                                       'man/mesongui.1',

diff --git a/wraptool → wraptool.py b/wraptool → wraptool.py