RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-08 16:53:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

more internal tidying

Browse Source
This commit is contained in:
Eric Froemling 2021-06-12 15:40:31 -05:00
parent aa82d9fd7e
commit 6091014a66
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -900,8 +900,8 @@ cmake-server-clean:
# if using this on other platforms. # if using this on other platforms.
CPUS = $(shell getconf _NPROCESSORS_ONLN || echo 8) CPUS = $(shell getconf _NPROCESSORS_ONLN || echo 8)
PROJ_DIR = ${abspath ${CURDIR}} PROJ_DIR = ${abspath ${CURDIR}}
VERSION = $(shell tools/version_utils version) VERSION = $(shell tools/pcommand version_utils version)
BUILD_NUMBER = $(shell tools/version_utils build) BUILD_NUMBER = $(shell tools/pcommand version_utils build)
BUILD_DIR = ${PROJ_DIR}/build BUILD_DIR = ${PROJ_DIR}/build
LAZYBUILDDIR = .cache/lazybuild LAZYBUILDDIR = .cache/lazybuild
STAGE_ASSETS = ${PROJ_DIR}/tools/pcommand stage_assets STAGE_ASSETS = ${PROJ_DIR}/tools/pcommand stage_assets

2
tools/batools/build.py
View File

@ -181,7 +181,7 @@ def lazybuild(target: str, category: SourceCategory, command: str) -> None:
# Everything possibly affecting asset builds. # Everything possibly affecting asset builds.
elif category is SourceCategory.ASSETS: elif category is SourceCategory.ASSETS:
paths = ['Makefile', 'tools/convert_util', 'assets/src'] paths = ['Makefile', 'tools/pcommand', 'convert_util', 'assets/src']
# Everything possibly affecting CMake builds. # Everything possibly affecting CMake builds.
elif category is SourceCategory.CMAKE: elif category is SourceCategory.CMAKE:

13
tools/batools/pcommand.py
View File

@ -169,8 +169,9 @@ def lazy_increment_build() -> None:
if not update_hash_only: if not update_hash_only:
# Just go ahead and bless; this will increment the build as needed. # Just go ahead and bless; this will increment the build as needed.
# subprocess.run(['make', 'bless'], check=True) # subprocess.run(['make', 'bless'], check=True)
subprocess.run(['tools/version_utils', 'incrementbuild'], subprocess.run(
check=True) ['tools/pcommand', 'version_utils', 'incrementbuild'],
check=True)
# We probably just changed code, so we need to re-calc the hash. # We probably just changed code, so we need to re-calc the hash.
codehash = get_files_hash(codefiles) codehash = get_files_hash(codefiles)
@ -436,8 +437,12 @@ def warm_start_asset_build() -> None:
# For internal builds we don't use efrocache but we do use an # For internal builds we don't use efrocache but we do use an
# internal build cache. Download an initial cache/etc. if need be. # internal build cache. Download an initial cache/etc. if need be.
subprocess.run( subprocess.run(
[str(Path(PROJROOT, 'tools/convert_util')), '--init-asset-cache'], [
check=True) str(Path(PROJROOT, 'tools/pcommand')), 'convert_util',
'--init-asset-cache'
],
check=True,
)
def gendocs() -> None: def gendocs() -> None:

4
tools/batools/updateproject.py
View File

@ -403,9 +403,7 @@ class Updater:
# differ) # differ)
if contents.startswith('#!/'): if contents.startswith('#!/'):
copyrightline = 1 copyrightline = 1
if fname not in [ if fname not in ['tools/vmshell']:
'tools/devtool', 'tools/version_utils', 'tools/vmshell'
]:
if not contents.startswith(f'#!/usr/bin/env python{PYVER}'): if not contents.startswith(f'#!/usr/bin/env python{PYVER}'):
raise CleanError(f'Incorrect shebang (first line) for ' raise CleanError(f'Incorrect shebang (first line) for '
f'{fname}.') f'{fname}.')