diff options
| author | Jack Rosenthal <jrosenth@chromium.org> | 2022-03-25 13:50:15 -0600 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-03-25 20:56:56 +0000 |
| commit | 652b86a6bd649896b7504041893c404fa59e3753 (patch) | |
| tree | 9c73b85914d7165cead420d3143d92865214fd6f | |
| parent | 1885b2c30d0c82813f631ed6b24706c650618ab3 (diff) | |
| download | chrome-ec-652b86a6bd649896b7504041893c404fa59e3753.tar.gz | |
zephyr: zmake: Drop -b/--build and --test flags to configure
These flags have been deprecated and are now being removed.
BUG=b:225379781
BRANCH=none
TEST=unit tests pass
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: Ib3dc35100df7946b0d48543eda6a17dfb3b56730
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3551651
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
| -rw-r--r-- | zephyr/zmake/README.md | 4 | ||||
| -rw-r--r-- | zephyr/zmake/zmake/__main__.py | 22 |
2 files changed, 1 insertions, 25 deletions
diff --git a/zephyr/zmake/README.md b/zephyr/zmake/README.md index 602fb5006d..12125d8213 100644 --- a/zephyr/zmake/README.md +++ b/zephyr/zmake/README.md @@ -35,7 +35,7 @@ Chromium OS's meta-build tool for Zephyr ### zmake configure -**Usage:** `zmake configure [-h] [-b] [--test] [-t TOOLCHAIN] [--bringup] [--clobber] [--allow-warnings] [-B BUILD_DIR] [-c] [--extra-cflags EXTRA_CFLAGS] (-a | --host-tests-only | project_name [project_name ...])` +**Usage:** `zmake configure [-h] [-t TOOLCHAIN] [--bringup] [--clobber] [--allow-warnings] [-B BUILD_DIR] [-c] [--extra-cflags EXTRA_CFLAGS] (-a | --host-tests-only | project_name [project_name ...])` #### Positional Arguments @@ -48,8 +48,6 @@ Chromium OS's meta-build tool for Zephyr | | | |---|---| | `-h`, `--help` | show this help message and exit | -| `-b`, `--build` | Run the build after configuration | -| `--test` | Test the .elf file after building | | `-t TOOLCHAIN`, `--toolchain TOOLCHAIN` | Name of toolchain to use | | `--bringup` | Enable bringup debugging features | | `--clobber` | Delete existing build directories, even if configuration is unchanged | diff --git a/zephyr/zmake/zmake/__main__.py b/zephyr/zmake/zmake/__main__.py index 54e199c812..9ad509dfc5 100644 --- a/zephyr/zmake/zmake/__main__.py +++ b/zephyr/zmake/zmake/__main__.py @@ -180,19 +180,6 @@ def get_argparser(): "configure", help="Set up a build directory to be built later by the build subcommand", ) - configure.add_argument( - "-b", - "--build", - action="store_true", - dest="build_after_configure", - help="Run the build after configuration", - ) - configure.add_argument( - "--test", - action="store_true", - dest="test_after_configure", - help="Test the .elf file after building", - ) add_common_configure_args(configure) build = sub.add_parser( @@ -357,15 +344,6 @@ def main(argv=None): logging.basicConfig(format=log_format, level=opts.log_level) - if opts.subcommand == "configure" and opts.build_after_configure: - logging.warning( - '"zmake configure -b/--build" is deprecated. Run "zmake build" instead.' - ) - if opts.subcommand == "configure" and opts.test_after_configure: - logging.warning( - '"zmake configure --test" is deprecated. Run "zmake test" instead.' - ) - try: zmake = call_with_namespace(zm.Zmake, opts) subcommand_method = getattr(zmake, opts.subcommand.replace("-", "_")) |