From 08e43e8bfd150252b3e05ff62ee25cdf0e519f20 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sat, 1 Oct 2016 22:06:54 +0300 Subject: Revert #830 because it broke the case when the main script is not in path. --- meson.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'meson.py') diff --git a/meson.py b/meson.py index 7f2c49d..bc448ad 100755 --- a/meson.py +++ b/meson.py @@ -17,4 +17,18 @@ from mesonbuild import mesonmain import sys, os -sys.exit(mesonmain.run(sys.argv[0], sys.argv[1:])) +def main(): + thisfile = __file__ + if not os.path.isabs(thisfile): + thisfile = os.path.normpath(os.path.join(os.getcwd(), thisfile)) + if __package__ == '': + thisfile = os.path.dirname(thisfile) + + # The first argument *must* be an absolute path because + # the user may have launched the program from a dir + # that is not in path. + sys.exit(mesonmain.run(thisfile, sys.argv[1:])) + +if __name__ == '__main__': + main() + -- cgit v1.1