Andrew Geissler | 3eeda90 | 2023-05-19 10:14:02 -0500 | [diff] [blame] | 1 | There's no need to hunt around source or install trees when we're just running ninja |
| 2 | from PATH. |
| 3 | |
| 4 | Upstream-Status: Inappropriate |
| 5 | Signed-off-by: Ross Burton <ross.burton@arm.com> |
| 6 | |
| 7 | diff --git a/src/ninja/__init__.py b/src/ninja/__init__.py |
| 8 | index f83767e..31bb926 100644 |
| 9 | --- a/src/ninja/__init__.py |
| 10 | +++ b/src/ninja/__init__.py |
| 11 | @@ -19,32 +19,9 @@ except ImportError: |
| 12 | os.path.dirname(__file__), '../../Ninja-src/misc'))) |
| 13 | from ninja_syntax import Writer, escape, expand # noqa: F401 |
Andrew Geissler | fc113ea | 2023-03-31 09:59:46 -0500 | [diff] [blame] | 14 | |
Andrew Geissler | 3eeda90 | 2023-05-19 10:14:02 -0500 | [diff] [blame] | 15 | -DATA = os.path.join(os.path.dirname(__file__), 'data') |
| 16 | - |
| 17 | -# Support running tests from the source tree |
| 18 | -if not os.path.exists(DATA): |
| 19 | - from skbuild.constants import CMAKE_INSTALL_DIR as SKBUILD_CMAKE_INSTALL_DIR |
| 20 | - from skbuild.constants import set_skbuild_plat_name |
| 21 | - |
| 22 | - if platform.system().lower() == "darwin": |
| 23 | - # Since building the project specifying --plat-name or CMAKE_OSX_* variables |
| 24 | - # leads to different SKBUILD_DIR, the code below attempt to guess the most |
| 25 | - # likely plat-name. |
| 26 | - _skbuild_dirs = os.listdir(os.path.join(os.path.dirname(__file__), '..', '..', '_skbuild')) |
| 27 | - if _skbuild_dirs: |
| 28 | - _likely_plat_name = '-'.join(_skbuild_dirs[0].split('-')[:3]) |
| 29 | - set_skbuild_plat_name(_likely_plat_name) |
| 30 | - |
| 31 | - _data = os.path.abspath(os.path.join( |
| 32 | - os.path.dirname(__file__), '..', '..', SKBUILD_CMAKE_INSTALL_DIR(), 'src/ninja/data')) |
| 33 | - if os.path.exists(_data): |
| 34 | - DATA = _data |
| 35 | - |
| 36 | -BIN_DIR = os.path.join(DATA, 'bin') |
| 37 | - |
Andrew Geissler | fc113ea | 2023-03-31 09:59:46 -0500 | [diff] [blame] | 38 | |
| 39 | def _program(name, args): |
| 40 | - return subprocess.call([os.path.join(BIN_DIR, name)] + args, close_fds=False) |
| 41 | + return subprocess.call([name] + args, close_fds=False) |
| 42 | |
| 43 | |
| 44 | def ninja(): |