aya/myos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move docker and stack dir

Browse Source
This commit is contained in:
Yann Autissier
2026-07-23 04:06:36 +02:00
parent afa9990f6b
commit 0e09506efd
28 changed files with 848 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
make/common.mk
+4 -3
View File
@@ -15,12 +15,13 @@ $(APP) $(APP_DIR):
## it includes apps/$(app)/*.mk file and hydrates APP_* variables
## ex: APP_REPOSITORY_URL is set with value from variable $(APP)_REPOSITORY_URL
.PHONY: app-%
app-%: APP_DIR := $(RELATIVE)$(APP)
app-%: APP_DIR := $(or $(WORKDIR), $(RELATIVE)$(APP))
app-%: $(APP_DIR)
$(eval APP_REPOSITORY_URL :=)
$(eval COMPOSE_FILE :=)
$(eval STACK :=)
$(eval app := $(subst -$(lastword $(subst -, ,$*)),,$*))
$(eval app_dir := $(or $(WORKDIR), $(RELATIVE)$(app)))
$(eval command := $(lastword $(subst -, ,$*)))
$(eval include $(wildcard $(foreach stack_dir,$(STACK_DIR),$(stack_dir)/$(app).mk $(stack_dir)/$(app)/*.mk)))
$(foreach var,$(filter $(call UPPERCASE,$(app))_%,$(MAKE_FILE_VARS)), \
@@ -28,7 +29,7 @@ app-%: $(APP_DIR)
$(eval $(subst $(call UPPERCASE,$(app))_,APP_,$(var)) := $($(var))) \
) \
)
$(if $(wildcard $(RELATIVE)$(app)), \
$(if $(wildcard $(app_dir)), \
$(if $(filter app-$(command),$(.VARIABLES)), \
$(call app-bootstrap,$(app)) \
$(call app-$(command)) \
@@ -43,7 +44,7 @@ app-%: $(APP_DIR)
$(if $(APP_REPOSITORY_URL), \
$(call app-install) \
$(call app-bootstrap) \
,$(call WARNING,Unable to find app,$(app),in dir,$(RELATIVE)$(app)) \
,$(call WARNING,Unable to find app,$(app),in dir,$(app_dir)) \
) \
)