zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-03-20 07:43:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

switch to CURDIR

Browse Source
This commit is contained in:
Hao Liu
2023-02-23 14:48:10 -05:00
parent de69761fa1
commit 5fbb6c79b3
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -1,6 +1,3 @@
mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
current_dir := $(dir $(mkfile_path))
include awx/ui-next/Makefile
PYTHON ?= python3.9
@@ -402,7 +399,7 @@ bulk_data:
# UI TASKS
# --------------------------------------
UI_BUILD_FLAG_FILE = $(current_dir)ui/.ui-built
UI_BUILD_FLAG_FILE = $(CURDIR)/ui/.ui-built
clean-ui:
rm -rf node_modules

11
awx/ui-next/Makefile
View File

@@ -1,21 +1,14 @@
ui_next_mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
ui_next_dir := $(dir $(ui_next_mkfile_path))
ui_next_dir := $(shell realpath --relative-to $(CURDIR) $(dir $(ui_next_mkfile_path)))
ifeq ($(current_dir), undefined)
ui_next_dir := $(dir $(ui_next_mkfile_path))
else
ui_next_dir := $(shell realpath --relative-to $(current_dir) $(ui_next_dir))/
endif
ANSIBLE_UI_DIR ?= $(ui_next_dir)/src
ANSIBLE_UI_GIT_REPO_HTTPS ?=
ANSIBLE_UI_GIT_REPO_SSH ?=
ANSIBLE_UI_GIT_BRANCH ?= main
ANSIBLE_UI_LOCAL ?=
ANSIBLE_UI_DIR ?= $(ui_next_dir)ansible-ui
.PHONY: ui-next/clone-https
## Shallow clone the ui-next repo via https skip if ANSIBLE_UI_GIT_REPO_HTTPS is undefined
ui-next/clone-https: