From db043404576a32b284b44738d3d61afe193ca815 Mon Sep 17 00:00:00 2001 From: Hao Liu Date: Tue, 7 Mar 2023 22:15:36 -0500 Subject: [PATCH] add default build target for ui_next --- .gitignore | 1 + awx/ui_next/Makefile | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0e8fb5c60f..0ecdb823a2 100644 --- a/.gitignore +++ b/.gitignore @@ -164,3 +164,4 @@ use_dev_supervisor.txt /Dockerfile.kube-dev awx/ui_next/src +awx/ui_next/build diff --git a/awx/ui_next/Makefile b/awx/ui_next/Makefile index 490dbeaa61..d40790742f 100644 --- a/awx/ui_next/Makefile +++ b/awx/ui_next/Makefile @@ -29,6 +29,9 @@ UI_NEXT_GIT_BRANCH ?= main # UI_NEXT_BUILT_FILE is here so that we can use it as the non-phony build target UI_NEXT_BUILT_FILE = $(UI_NEXT_REL_DIR).ui-built +## Default target of this Makefile build the ui_next/build from source +ui-next: ui_next/build + .PHONY: ui_next/clone-https ## Shallow clone the ui_next repo via https skip if UI_NEXT_GIT_REPO_HTTPS is undefined ui_next/clone-https: @@ -96,9 +99,9 @@ ui_next/src/node_modules/webpack: $(UI_NEXT_SRC_DIR) $(UI_NEXT_SRC_DIR)/node_modules/webpack: $(MAKE) ui_next/src/node_modules/webpack -.PHONY: ui_next/build ## Copy ui_next/src/build to ui_next/build -ui_next/build: $(UI_NEXT_SRC_DIR)/build +ui_next/build: + $(MAKE) $(UI_NEXT_SRC_DIR)/build @cp -r $(UI_NEXT_SRC_DIR)/build $(UI_NEXT_DIR_ABS) &&\ touch $(UI_NEXT_BUILT_FILE)