diff options
Diffstat (limited to 'src_doit')
| -rw-r--r-- | src_doit/__init__.py | 9 | ||||
| -rw-r--r-- | src_doit/c.py | 13 |
2 files changed, 10 insertions, 12 deletions
diff --git a/src_doit/__init__.py b/src_doit/__init__.py index 8c2498d..8402cfc 100644 --- a/src_doit/__init__.py +++ b/src_doit/__init__.py @@ -44,11 +44,10 @@ json_schema_repo_path = src_py_dir / 'opcut/json_schema_repo.json' def task_clean_all(): """Clean all""" - return {'actions': [(common.rm_rf, [ - build_dir, - ui_dir, - json_schema_repo_path, - *(src_py_dir / 'opcut').glob('*-opcut-calculate*')])]} + return {'actions': [(common.rm_rf, [build_dir, + ui_dir, + json_schema_repo_path, + src_py_dir / 'opcut/bin'])]} def task_wheel(): diff --git a/src_doit/c.py b/src_doit/c.py index 7c7162a..df767ac 100644 --- a/src_doit/c.py +++ b/src_doit/c.py @@ -1,8 +1,7 @@ from pathlib import Path -from hat.doit.c import (local_platform, - get_exe_suffix, - Platform, +from hat.doit import common +from hat.doit.c import (get_exe_suffix, CBuild) @@ -18,9 +17,9 @@ src_py_dir = Path('src_py') build_c_dir = build_dir / 'c' -platforms = [local_platform] -if local_platform == Platform.LINUX: - platforms.append(Platform.WINDOWS) +platforms = [common.local_platform] +if common.local_platform == common.Platform.LINUX: + platforms.append(common.Platform.WINDOWS) builds = [CBuild(src_paths=[*src_c_dir.rglob('*.c'), deps_dir / 'argparse/argparse.c'], @@ -32,7 +31,7 @@ builds = [CBuild(src_paths=[*src_c_dir.rglob('*.c'), task_dep=['deps']) for platform in platforms] -exe_paths = [src_py_dir / (f'opcut/{platform.name.lower()}-' +exe_paths = [src_py_dir / (f'opcut/bin/{platform.name.lower()}-' f'opcut-calculate' f'{get_exe_suffix(platform)}') for platform in platforms] |