janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-23 06:30:38 +01:00
Code Activity

topdir.mk: Add support for OPT_JANWARE_PROJECT

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-11-27 15:55:08 +00:00
commit 90157c6802
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
make/topdir.mk
View file

@ -11,7 +11,17 @@ SUBDIRS ?= $(wildcard inst/pre make scripts contrib src libsrc \
PROJECT_DESCR = $(TOPDIR)/make/project.conf PROJECT_DESCR = $(TOPDIR)/make/project.conf
GIT_DESCR = $(TOPDIR)/.git/description GIT_DESCR = $(TOPDIR)/.git/description
WHOAMI = $(shell whoami) WHOAMI = $(shell whoami)
REMOTE_GIT_DIR = /srv/git/$(WHOAMI)/proj/$(RPM_PROJECT)
OPT_JANWARE_PROJECT ?= -j
ifeq ($(OPT_JANWARE_PROJECT),-j)
REMOTE_GIT_FLAVOUR ?= proj
else
OPT_JANWARE_PROJECT =
REMOTE_GIT_FLAVOUR ?= priv
endif
REMOTE_GIT_DIR = /srv/git/$(WHOAMI)/$(REMOTE_GIT_FLAVOUR)/$(RPM_PROJECT)
REMOTE_GIT_URL = ssh://$(WHOAMI)@git.jannet.de$(REMOTE_GIT_DIR) REMOTE_GIT_URL = ssh://$(WHOAMI)@git.jannet.de$(REMOTE_GIT_DIR)
@ -103,7 +113,7 @@ git-config:
git remote set-url --push origin $(REMOTE_GIT_URL) git remote set-url --push origin $(REMOTE_GIT_URL)
git-clone-to-remote: git-clone-to-remote:
ssh git.jannet.de "/opt/ytools/bin/git-srv-admin.sh -j create-personal-project $(RPM_PROJECT)" ssh git.jannet.de "/opt/ytools/bin/git-srv-admin.sh $(OPT_JANWARE_PROJECT) create-personal-project $(RPM_PROJECT)"
git remote set-url --push origin $(REMOTE_GIT_URL) git remote set-url --push origin $(REMOTE_GIT_URL)
git push --set-upstream origin master git push --set-upstream origin master
git push --all $(REMOTE_GIT_URL) git push --all $(REMOTE_GIT_URL)