External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-08 05:01:09 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13743 from TheRealHaoLiu/ui-next-non-phony

Browse Source 
Turn ui-next make targets non-PHONY
This commit is contained in:
Hao Liu
2023-03-22 21:05:18 -04:00
committed by GitHub
parent b4163dd00f 21b4755587
commit 4bf8366687
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
awx/ui_next/Makefile
View File

@@ -16,9 +16,10 @@ ui-next: ui-next/build
.PHONY: ui-next/build .PHONY: ui-next/build
## Build ui-next/build ## Build ui-next/build
ui-next/build: $(UI_NEXT_DIR)/build ui-next/build: $(UI_NEXT_DIR)/build
.PHONY: $(UI_NEXT_DIR)/build
## True build target for ui-next. ## True build target for ui-next.
$(UI_NEXT_DIR)/build: ui-next/src/build $(UI_NEXT_DIR)/build:
@$(MAKE) $(UI_NEXT_DIR)/src/build/awx
@echo "=== Copying $(UI_NEXT_DIR)/src/build to $(UI_NEXT_DIR)/build ===" @echo "=== Copying $(UI_NEXT_DIR)/src/build to $(UI_NEXT_DIR)/build ==="
@rm -rf $(UI_NEXT_DIR)/build @rm -rf $(UI_NEXT_DIR)/build
@cp -r $(UI_NEXT_DIR)/src/build $(UI_NEXT_DIR) @cp -r $(UI_NEXT_DIR)/src/build $(UI_NEXT_DIR)
@@ -26,11 +27,10 @@ $(UI_NEXT_DIR)/build: ui-next/src/build
.PHONY: ui-next/src/build .PHONY: ui-next/src/build
## Build ui-next/src/build ## Build ui-next/src/build
ui-next/src/build: $(UI_NEXT_DIR)/src/build ui-next/src/build: $(UI_NEXT_DIR)/src/build/awx
.PHONY: $(UI_NEXT_DIR)/src/build ## True target for ui-next/src/build. Build ui_next from source.
## True target for ui-next/src/build. $(UI_NEXT_DIR)/src/build/awx: $(UI_NEXT_DIR)/src $(UI_NEXT_DIR)/src/node_modules/webpack
$(UI_NEXT_DIR)/src/build: ui-next/src ui-next/src/webpack
@echo "=== Building ui_next ===" @echo "=== Building ui_next ==="
@cd $(UI_NEXT_DIR)/src && npm run build:awx @cd $(UI_NEXT_DIR)/src && npm run build:awx
@@ -39,7 +39,6 @@ $(UI_NEXT_DIR)/src/build: ui-next/src ui-next/src/webpack
ui-next/src: $(UI_NEXT_DIR)/src ui-next/src: $(UI_NEXT_DIR)/src
# TODO: Rewrite this big bash script in a more readable way. # TODO: Rewrite this big bash script in a more readable way.
.PHONY: $(UI_NEXT_DIR)/src
## True target for ui-next/src. ## True target for ui-next/src.
$(UI_NEXT_DIR)/src: $(UI_NEXT_DIR)/src:
@echo "=== Setting up $(UI_NEXT_DIR)/src ===" @echo "=== Setting up $(UI_NEXT_DIR)/src ==="
@@ -81,7 +80,6 @@ $(UI_NEXT_DIR)/src:
## Install webpack. ## Install webpack.
ui-next/src/webpack: $(UI_NEXT_DIR)/src/node_modules/webpack ui-next/src/webpack: $(UI_NEXT_DIR)/src/node_modules/webpack
.PHONY: $(UI_NEXT_DIR)/src/node_modules/webpack
## True target for ui-next/src/webpack. ## True target for ui-next/src/webpack.
$(UI_NEXT_DIR)/src/node_modules/webpack: $(UI_NEXT_DIR)/src/node_modules/webpack:
@echo "=== Installing webpack ===" @echo "=== Installing webpack ==="
@@ -100,3 +98,15 @@ clean/ui-next/src:
## Clean ui_next build ## Clean ui_next build
clean/ui-next/build: clean/ui-next/build:
rm -rf $(UI_NEXT_DIR)/build rm -rf $(UI_NEXT_DIR)/build
.PHONY: $(UI_NEXT_DIR)/clean
## Alias for clean/ui-next, so we can run `make clean` directly in ui_next
$(UI_NEXT_DIR)/clean: clean/ui-next
.PHONY: $(UI_NEXT_DIR)/clean/src
## Alias for clean/ui-next/src, so we can run `make clean/src` directly in ui_next
$(UI_NEXT_DIR)/clean/src: clean/ui-next/src
.PHONY: $(UI_NEXT_DIR)/clean/build
## Alias for clean/ui-next/build, so we can run `make clean/build` directly in ui_next
$(UI_NEXT_DIR)/clean/build: clean/ui-next/build

6
awx/ui_next/README.md
View File

@@ -34,6 +34,12 @@ export UI_NEXT_LOCAL = /path/to/your/ui_next
make ui-next make ui-next
``` ```
## Rebuild
```bash
make -B ui-next
```
## Clean ## Clean
```bash ```bash