janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

projects-dir-minimal.mk: Use get-auth-info for JANWARE_USER

Browse source 
Default JANWARE_USER to the user retrieved by jw-projects.py get-auth-info.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2025-11-19 08:37:07 +01:00
commit e1a4746ad5
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
make/projects-dir-minimal.mk
View file

@ -18,6 +18,13 @@ PROJECTS_MAKEFILE_NAME := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)
-include local.mk
JWBDIR ?= jw-build
ifeq ($(JANWARE_USER),)
ifneq ($(wildcard $(JWBDIR)),)
JANWARE_USER := $(shell /usr/bin/python3 $(JWBDIR)/scripts/jw-projects.py -t . get-auth-info --username --only-values)
endif
endif
ifeq ($(origin PROJECTS_DIR_REMOTE_BASE),undefined)
ifneq ($(JANWARE_USER),)
CLONE_FROM_USER ?= $(JANWARE_USER)
@ -27,8 +34,7 @@ ifeq ($(origin PROJECTS_DIR_REMOTE_BASE),undefined)
PROJECTS_DIR_REMOTE_BASE ?= https://janware.com/code
endif
endif
JWBDIR_GIT_REMOTE ?= $(PROJECTS_DIR_REMOTE_BASE)/$(CLONE_FROM_USER)/jw-build
JWBDIR ?= $(notdir $(JWBDIR_GIT_REMOTE))
JWBDIR_GIT_REMOTE ?= $(PROJECTS_DIR_REMOTE_BASE)/$(CLONE_FROM_USER)/$(notdir $(JWBDIR))
PROJECTS_DIR_INCLUDE_MK = $(JWBDIR)/make/projects-dir-include.mk
all:

2
make/projects-dir.mk
View file

@ -35,7 +35,7 @@ PROJECTS_TXT ?= projects.txt
JW_BUILD_VERBOSE ?= false
BASE_PKGS = git make sudo time xdg-utils python3
PREREQ_RELEASE ?= pull
ifneq ($(origin JANWARE_USER),undefined)
ifneq ($(JANWARE_USER),)
export JANWARE_USER
endif