usb-tools/amaranth
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

build.plat: allow spaces in environment variables on Windows.

Browse source 
Specifically, allow spaces in:
- set AMARANTH_ENV_<toolchain>=c:\program files\...
- set <tool>=c:\program files\...
This commit is contained in:
Catherine 2024-05-18 01:47:57 +01:00
parent 77dab7884c
commit c1666adf30
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
amaranth/build/plat.py
View file

@ -184,7 +184,8 @@ class TemplatedPlatform(Platform):
"build_{{name}}.bat": """ "build_{{name}}.bat": """
@rem {{autogenerated}} @rem {{autogenerated}}
{{quiet("@echo off")}} {{quiet("@echo off")}}
if defined {{platform._toolchain_env_var}} call %{{platform._toolchain_env_var}}% SetLocal EnableDelayedExpansion
if defined {{platform._toolchain_env_var}} call "%{{platform._toolchain_env_var}}%"
{{emit_commands("bat")}} {{emit_commands("bat")}}
""", """,
} }
@ -283,8 +284,8 @@ class TemplatedPlatform(Platform):
template = ": ${{{env_var}:={name}}}" template = ": ${{{env_var}:={name}}}"
elif syntax == "bat": elif syntax == "bat":
template = \ template = \
"if [%{env_var}%] equ [\"\"] set {env_var}=\n" \ "if [!{env_var}!] equ [\"\"] set {env_var}=\n" \
"if [%{env_var}%] equ [] set {env_var}={name}" "if [!{env_var}!] equ [] set {env_var}={name}"
else: else:
assert False assert False
commands.append(template.format(env_var=env_var, name=name)) commands.append(template.format(env_var=env_var, name=name))
@ -308,7 +309,7 @@ class TemplatedPlatform(Platform):
if context.parent["syntax"] == "sh": if context.parent["syntax"] == "sh":
return f"\"${env_var}\"" return f"\"${env_var}\""
elif context.parent["syntax"] == "bat": elif context.parent["syntax"] == "bat":
return f"%{env_var}%" return f"\"%{env_var}%\""
else: else:
assert False assert False