From e5b7d31abae5ecfe9449279d54973021d4c372b0 Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Tue, 31 Jul 2018 11:19:02 +0200 Subject: tools/setup: avoid running `gn gen` twice in the same output directory --- tools/setup.py | 10 +++++++++- tools/util.py | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/setup.py b/tools/setup.py index 20271f4b3..19a5c07a3 100755 --- a/tools/setup.py +++ b/tools/setup.py @@ -33,7 +33,7 @@ def get_gn_args(): # gn gen. -for mode in ["release", "debug"]: +def gn_gen(mode): os.environ["DENO_BUILD_MODE"] = mode gn_args = get_gn_args() @@ -52,3 +52,11 @@ for mode in ["release", "debug"]: run([third_party.gn_path, "gen", build_path()], env=third_party.google_env()) + + +mode = build_mode(default=None) +if mode is not None: + gn_gen(mode) +else: + gn_gen("release") + gn_gen("debug") diff --git a/tools/util.py b/tools/util.py index 6a2da8033..77547c238 100644 --- a/tools/util.py +++ b/tools/util.py @@ -103,11 +103,11 @@ def rmtree(directory): shutil.rmtree(directory, onerror=rm_readonly) -def build_mode(): +def build_mode(default="debug"): if "DENO_BUILD_MODE" in os.environ: return os.environ["DENO_BUILD_MODE"] else: - return "debug" + return default # E.G. "out/debug" -- cgit v1.2.3