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

topdir.mk: Derive remote Git dir from RPM_PROJECT

Browse source 
- Derive remote Git dir from RPM_PROJECT instead of PROJECT
  - Add support for existing git dirs

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-04-30 16:38:32 +00:00
commit 158070988d
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
make/topdir.mk
View file

@ -11,7 +11,7 @@ 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/$(PROJECT) REMOTE_GIT_DIR = /srv/git/$(WHOAMI)/proj/$(RPM_PROJECT)
REMOTE_GIT_URL = ssh://$(WHOAMI)@git.jannet.de$(REMOTE_GIT_DIR) REMOTE_GIT_URL = ssh://$(WHOAMI)@git.jannet.de$(REMOTE_GIT_DIR)
@ -97,27 +97,27 @@ git-init-from-cvs: git-init
git commit -m "initial checkin of $(RPM_VERSION)" git commit -m "initial checkin of $(RPM_VERSION)"
git-config: git-config:
git config --global user.name $(FULL_NAME) git config --global user.name "$(FULL_NAME)"
git config --global user.email $(WHOAMI)@janware.com git config --global user.email $(WHOAMI)@janware.com
git remote add origin $(REMOTE_GIT_URL) git remote add origin $(REMOTE_GIT_URL)
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 $(PROJECT)" ssh git.jannet.de "/opt/ytools/bin/git-srv-admin.sh -j 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)
git-import: git-init git-config git-import: git-init git-config
git add -A git add -A
git commit -am "initial checkin" git status || git commit -am "initial checkin"
git-init-remote: git-import git-clone-to-remote git-init-remote: git-import git-clone-to-remote
git-descr: $(GIT_DESCR) git-descr: $(GIT_DESCR)
projects-%: projects-%:
python $(MOD_SCRIPT_DIR)/build.py $* $(PROJECT) python $(MOD_SCRIPT_DIR)/build.py $* $(RPM_PROJECT)
install-deps-devel: install-deps-devel:
sudo zypper in $(shell echo $(RPM_REQUIRES_DEVEL) | sed "s/ *= */-/g; s/ [^ ]\+-__NEXT_VERSION__//") sudo zypper in $(shell echo $(RPM_REQUIRES_DEVEL) | sed "s/ *= */-/g; s/ [^ ]\+-__NEXT_VERSION__//")