mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 03:53:32 +01:00
projects-dir[-minimal.mk]: Group PGIT_SH-related variables
Group variables related with pgit.sh (PGIT_SH and PGIT_SH_CLONE) closer together. Define CLONE_FROM_USER early on. Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
parent
b7833c928a
commit
d740f30226
2 changed files with 20 additions and 24 deletions
|
|
@ -16,19 +16,21 @@
|
|||
|
||||
PROJECTS_MAKEFILE_NAME := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
|
||||
|
||||
-include local.mk
|
||||
|
||||
ifeq ($(origin PROJECTS_DIR_REMOTE_BASE),undefined)
|
||||
ifneq ($(JANWARE_USER),)
|
||||
PROJECTS_DIR_REMOTE_BASE ?= ssh://$(JANWARE_USER)@git.janware.com/srv/git/jan$(PROJECTS_DIR_REMOTE_SUBPATH)/jw-build
|
||||
CLONE_FROM_USER ?= $(JANWARE_USER)
|
||||
PROJECTS_DIR_REMOTE_BASE ?= ssh://$(JANWARE_USER)@git.janware.com/srv/git
|
||||
else
|
||||
PROJECTS_DIR_REMOTE_BASE ?= https://janware.com/code/janware
|
||||
CLONE_FROM_USER ?= janware
|
||||
PROJECTS_DIR_REMOTE_BASE ?= https://janware.com/code
|
||||
endif
|
||||
endif
|
||||
JWBDIR_GIT_REMOTE ?= $(PROJECTS_DIR_REMOTE_BASE)/jw-build
|
||||
JWBDIR_GIT_REMOTE ?= $(PROJECTS_DIR_REMOTE_BASE)/$(CLONE_FROM_USER)/jw-build
|
||||
JWBDIR ?= $(notdir $(JWBDIR_GIT_REMOTE))
|
||||
PROJECTS_DIR_INCLUDE_MK = $(JWBDIR)/make/projects-dir-include.mk
|
||||
|
||||
-include local.mk
|
||||
|
||||
all:
|
||||
|
||||
include $(PROJECTS_DIR_INCLUDE_MK)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue