More prefab tidying

This commit is contained in:
Eric Froemling 2020-04-22 01:28:15 -07:00
parent 62e8549286
commit e3b5557a0d
2 changed files with 7 additions and 11 deletions

View File

@ -123,27 +123,27 @@ prefab-release: prefab-release-build
# Assemble a debug build for this platform. # Assemble a debug build for this platform.
prefab-debug-build: prefab-debug-build:
@tools/snippets make_prefab debug-build @tools/snippets make_prefab debug
# Assemble a release build for this platform. # Assemble a release build for this platform.
prefab-release-build: prefab-release-build:
@tools/snippets make_prefab release-build @tools/snippets make_prefab release
# Assemble/run a server debug build for this platform. # Assemble/run a server debug build for this platform.
prefab-server-debug: prefab-server-debug-build prefab-server-debug: prefab-server-debug-build
${${shell tools/snippets prefab_run_var server-debug}} ${${shell tools/snippets prefab_run_var server-debug}}
# Assemble/run a server release build for this platform. # Assemble/run a server release build for this platform.
prefab-server-release: prefab-server-release: prefab-server-release-build
@tools/snippets make_prefab server-release ${${shell tools/snippets prefab_run_var server-release}}
# Assemble a server debug build for this platform. # Assemble a server debug build for this platform.
prefab-server-debug-build: prefab-server-debug-build:
@tools/snippets make_prefab server-debug-build @tools/snippets make_prefab server-debug
# Assemble a server release build for this platform. # Assemble a server release build for this platform.
prefab-server-release-build: prefab-server-release-build:
@tools/snippets make_prefab server-release-build @tools/snippets make_prefab server-release
# Specific platform prefab targets: # Specific platform prefab targets:

View File

@ -84,13 +84,9 @@ class SourceCategory(Enum):
class PrefabTarget(Enum): class PrefabTarget(Enum):
"""Types of prefab builds able to be run.""" """Types of prefab builds able to be run."""
DEBUG = 'debug' DEBUG = 'debug'
DEBUG_BUILD = 'debug-build'
SERVER_DEBUG = 'server-debug' SERVER_DEBUG = 'server-debug'
SERVER_DEBUG_BUILD = 'server-debug-build'
RELEASE = 'release' RELEASE = 'release'
RELEASE_BUILD = 'release-build'
SERVER_RELEASE = 'server-release' SERVER_RELEASE = 'server-release'
SERVER_RELEASE_BUILD = 'server-release-build'
def _checkpaths(inpaths: List[str], category: SourceCategory, def _checkpaths(inpaths: List[str], category: SourceCategory,
@ -463,7 +459,7 @@ def make_prefab(target: PrefabTarget) -> None:
"""Make a prefab build for the current platform.""" """Make a prefab build for the current platform."""
from efrotools import run from efrotools import run
platform = get_current_prefab_platform() platform = get_current_prefab_platform()
run(f'make prefab-{platform}-{target.value}') run(f'make prefab-{platform}-{target.value}-build')
def _vstr(nums: Sequence[int]) -> str: def _vstr(nums: Sequence[int]) -> str: