godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a `platform=list` SCons argument to list platforms 

This also improves the message display and makes an invalid selection
exit with a non-zero status code.
This commit is contained in:
Hugo Locurcio 2019-07-17 11:25:57 +02:00
parent 4d99e73967
commit b07e46c59f
No known key found for this signature in database
GPG Key ID: 39E8F8BE30B0A49C
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
SConstruct
View File

@ -422,7 +422,7 @@ if selected_platform in platform_list:
if (can_build): if (can_build):
config.configure(env) config.configure(env)
env.module_list.append(x) env.module_list.append(x)
# Get doc classes paths (if present) # Get doc classes paths (if present)
try: try:
doc_classes = config.get_doc_classes() doc_classes = config.get_doc_classes()
@ -522,13 +522,23 @@ if selected_platform in platform_list:
env.AppendUnique(CPPDEFINES=[header[1]]) env.AppendUnique(CPPDEFINES=[header[1]])
elif selected_platform != "": elif selected_platform != "":
if selected_platform == "list":
print("The following platforms are available:\n")
else:
print('Invalid target platform "' + selected_platform + '".')
print("The following platforms were detected:\n")
print("Invalid target platform: " + selected_platform)
print("The following platforms were detected:")
for x in platform_list: for x in platform_list:
print("\t" + x) print("\t" + x)
print("\nPlease run SCons again and select a valid platform: platform=<string>") print("\nPlease run SCons again and select a valid platform: platform=<string>")
if selected_platform == "list":
# Exit early to suppress the rest of the built-in SCons messages
sys.exit(0)
else:
sys.exit(255)
# The following only makes sense when the env is defined, and assumes it is # The following only makes sense when the env is defined, and assumes it is
if 'env' in locals(): if 'env' in locals():
screen = sys.stdout screen = sys.stdout