mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00
Code Issues Releases Activity

SERVER-58904 update ninja tool to support $ in scons command line args.

Browse Source
This commit is contained in:
Daniel Moody 2021-08-03 12:09:31 -05:00 committed by Evergreen Agent
parent 4963780f64
commit dee0f733cd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
site_scons/site_tools/next/ninja.py
View File

@ -423,9 +423,9 @@ class SConsToNinjaTranslator:
class NinjaState: class NinjaState:
"""Maintains state of Ninja build system as it's translated from SCons.""" """Maintains state of Ninja build system as it's translated from SCons."""
def __init__(self, env, writer_class): def __init__(self, env, ninja_syntax):
self.env = env self.env = env
self.writer_class = writer_class self.writer_class = ninja_syntax.Writer
self.__generated = False self.__generated = False
self.translator = SConsToNinjaTranslator(env) self.translator = SConsToNinjaTranslator(env)
self.generated_suffixes = env.get("NINJA_GENERATED_SOURCE_SUFFIXES", []) self.generated_suffixes = env.get("NINJA_GENERATED_SOURCE_SUFFIXES", [])
@ -442,18 +442,18 @@ class NinjaState:
# shell quoting on whatever platform it's run on. Here we use it # shell quoting on whatever platform it's run on. Here we use it
# to make the SCONS_INVOCATION variable properly quoted for things # to make the SCONS_INVOCATION variable properly quoted for things
# like CCFLAGS # like CCFLAGS
escape = env.get("ESCAPE", lambda x: x) scons_escape = env.get("ESCAPE", lambda x: x)
self.variables = { self.variables = {
"COPY": "cmd.exe /c 1>NUL copy" if sys.platform == "win32" else "cp", "COPY": "cmd.exe /c 1>NUL copy" if sys.platform == "win32" else "cp",
"SCONS_INVOCATION": "{} {} __NINJA_NO=1 $out".format( "SCONS_INVOCATION": "{} {} __NINJA_NO=1 $out".format(
sys.executable, sys.executable,
" ".join( " ".join(
[escape(arg) for arg in sys.argv if arg not in COMMAND_LINE_TARGETS] [ninja_syntax.escape(scons_escape(arg)) for arg in sys.argv if arg not in COMMAND_LINE_TARGETS]
), ),
), ),
"SCONS_INVOCATION_W_TARGETS": "{} {}".format( "SCONS_INVOCATION_W_TARGETS": "{} {}".format(
sys.executable, " ".join([escape(arg) for arg in sys.argv]) sys.executable, " ".join([ninja_syntax.escape(scons_escape(arg)) for arg in sys.argv])
), ),
# This must be set to a global default per: # This must be set to a global default per:
# https://ninja-build.org/manual.html # https://ninja-build.org/manual.html
@ -1612,7 +1612,7 @@ def generate(env):
ninja_syntax = importlib.import_module(ninja_syntax_mod_name.replace(".py", "")) ninja_syntax = importlib.import_module(ninja_syntax_mod_name.replace(".py", ""))
global NINJA_STATE global NINJA_STATE
NINJA_STATE = NinjaState(env, ninja_syntax.Writer) NINJA_STATE = NinjaState(env, ninja_syntax)
# Here we will force every builder to use an emitter which makes the ninja # Here we will force every builder to use an emitter which makes the ninja
# file depend on it's target. This forces the ninja file to the bottom of # file depend on it's target. This forces the ninja file to the bottom of