aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-03-02 21:49:29 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2016-03-02 21:49:29 +0200
commit455e55f8e51c328400c36d65a15d76e7c4be08eb (patch)
tree9c24b72729009a4f9fbeb9eb15ee79795639d348
parent52b66edb6cfb891e3a6b8c18d50d98e98dd100ec (diff)
downloadmeson-455e55f8e51c328400c36d65a15d76e7c4be08eb.zip
meson-455e55f8e51c328400c36d65a15d76e7c4be08eb.tar.gz
meson-455e55f8e51c328400c36d65a15d76e7c4be08eb.tar.bz2
Back to .py suffix in files. Closes #394.
-rwxr-xr-xmeson.py (renamed from meson)0
-rwxr-xr-xmesonconf.py (renamed from mesonconf)0
-rwxr-xr-xmesongui.py (renamed from mesongui)0
-rwxr-xr-xmesonintrospect.py (renamed from mesonintrospect)0
-rwxr-xr-xrun_tests.py4
-rw-r--r--setup.py6
-rwxr-xr-xwraptool.py (renamed from wraptool)0
7 files changed, 9 insertions, 1 deletions
diff --git a/meson b/meson.py
index b977368..b977368 100755
--- a/meson
+++ b/meson.py
diff --git a/mesonconf b/mesonconf.py
index 2b0a1a6..2b0a1a6 100755
--- a/mesonconf
+++ b/mesonconf.py
diff --git a/mesongui b/mesongui.py
index 9e16b00..9e16b00 100755
--- a/mesongui
+++ b/mesongui.py
diff --git a/mesonintrospect b/mesonintrospect.py
index 4d20548..4d20548 100755
--- a/mesonintrospect
+++ b/mesonintrospect.py
diff --git a/run_tests.py b/run_tests.py
index e85a6d6..7e799cb 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -46,6 +46,10 @@ print_debug = 'MESON_PRINT_TEST_OUTPUT' in os.environ
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
index 0ccd81f..0acce4d 100644
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,11 @@ setup(name='meson',
'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 b/wraptool.py
index 5e03efd..5e03efd 100755
--- a/wraptool
+++ b/wraptool.py