From c6360837bb8273478e267502893a32e5960fae80 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Thu, 25 Jul 2019 14:07:36 -0700 Subject: [PATCH] Deprecate ONE_SHOT_MAKEFILE mm is now doing the same thing as mma. Now print a deprecation message for other tools that may be setting ONE_SHOT_MAKEFILE directly (or users that are still using a very old envsetup.sh). Test: mm # does not print Test: ONE_SHOT_MAKEFILE=bionic m Change-Id: I98221657024d824a61c0d721d5c7dd1a2ea2fb1e --- cmd/soong_ui/main.go | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/cmd/soong_ui/main.go b/cmd/soong_ui/main.go index 0eaed76ce..0bc36066a 100644 --- a/cmd/soong_ui/main.go +++ b/cmd/soong_ui/main.go @@ -416,7 +416,26 @@ func make(ctx build.Context, config build.Config, _ []string, logsDir string) { fmt.Fprintln(writer, "!") fmt.Fprintln(writer, "! Older versions are saved in verbose.log.#.gz files") fmt.Fprintln(writer, "") - time.Sleep(5 * time.Second) + select { + case <-time.After(5 * time.Second): + case <-ctx.Done(): + return + } + } + + if _, ok := config.Environment().Get("ONE_SHOT_MAKEFILE"); ok { + writer := ctx.Writer + fmt.Fprintln(writer, "! The variable `ONE_SHOT_MAKEFILE` is deprecated, and will be removed shortly.") + fmt.Fprintln(writer, "!") + fmt.Fprintln(writer, "! If you're using `mm`, you'll need to run `source build/envsetup.sh` to update.") + fmt.Fprintln(writer, "!") + fmt.Fprintln(writer, "! Otherwise, either specify a module name with m, or use mma / MODULES-IN-...") + fmt.Fprintln(writer, "") + select { + case <-time.After(30 * time.Second): + case <-ctx.Done(): + return + } } toBuild := build.BuildAll