diff options
| author | Christoph Burger-Scheidlin <7289824+cburger-scheidlin@users.noreply.github.com> | 2018-08-03 15:17:21 +0200 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-08-07 03:55:35 -0700 |
| commit | e4a83e47d4402d6fede8b284f079529fb78c2cbb (patch) | |
| tree | 4245b25bd6156a1604267264d6c44ab3a8c1604d /__main__.py | |
| parent | c9aea4e11c648f1051454132626bcb4aef976d6d (diff) | |
| download | meson-e4a83e47d4402d6fede8b284f079529fb78c2cbb.zip meson-e4a83e47d4402d6fede8b284f079529fb78c2cbb.tar.gz meson-e4a83e47d4402d6fede8b284f079529fb78c2cbb.tar.bz2 | |
Fix __main__.py for zipapp to work
0a035de removed main from meson.py breaking the call from __main__.py.
This causes zipapps to fail, since the call to meson.main() fails.
Copying the invocation from meson.py fixes this issue.
Additionally, add a test to run_meson_command_tests.py that
builds a zipapp from the source and attempts executing this
zipapp with --help to ensure that the resulting zipapp is
properly executable.
Diffstat (limited to '__main__.py')
| -rw-r--r-- | __main__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/__main__.py b/__main__.py index c412e37..27cd4c0 100644 --- a/__main__.py +++ b/__main__.py @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import meson +from mesonbuild import mesonmain import sys -sys.exit(meson.main()) +sys.exit(mesonmain.main()) |