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

upload-*.mk: Support more than just rpms

Browse source 
upload-[defs|rules].mk currently only support RPM packages. Make them
more generally usable.
This commit is contained in:
Jan Lindemann 2010-07-03 16:20:06 +00:00 • committed by Jan Lindemann
commit 2443c78623
2 changed files with 19 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

51
make/upload-defs.mk
View file

@ -1,38 +1,15 @@
# this makefile needs UPLOAD_SH ?= $(MOD_SCRIPT_DIR)/upload.sh
# PCKG_ROOT UPLOAD_PROJECT ?= $(PROJECT)
# VERSION UPLOAD_MODULE ?= $(UPLOAD_PROJECT)
# MOD_SCRIPT_DIR UPLOAD_FILE_MODE ?= 640
UPLOAD_DIR_MODE ?= 750
UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh UPLOAD_GROUP ?= $(shell id -ng)
UPLOAD_USER ?= $(shell id -nu)
FTP_FILE_MODE ?= 640 UPLOAD_HOST_LOGIN ?= root
FTP_DIR_MODE ?= 750 UPLOAD_HOST ?= www.jannet.de
FTP_SRC_GROUP ?= spidsrc UPLOAD_FILE_ROOT ?= /srv/www/htdocs/jannet.de_443/proj/$(UPLOAD_MODULE)
FTP_SRC_USER ?= $(shell whoami) UPLOAD_TARGET_PREFIX ?= rsync_ssh://$(UPLOAD_HOST_LOGIN)@$(UPLOAD_HOST):$(UPLOAD_FILE_ROOT)/
FTP_RUN_GROUP ?= spidrun UPLOAD_FILES ?=
FTP_RUN_USER ?= $(shell whoami) REMOTE_TARGETS ?= \
FTP_DEV_GROUP ?= spiddev $(foreach f,$(UPLOAD_FILES),$(UPLOAD_TARGET_PREFIX)$f:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP))
FTP_DEV_USER ?= $(shell whoami)
FTP_HOST ?= ftp.jannet.de
FTP_HOST_LOGIN ?= root
PCKG_ROOT = $(FTP_PCKG_DIR)/$(RPM_PROJECT)
CURRENT_SRC = $(PCKG_ROOT)/src/$(PCKG_TAR)
CURRENT_RPM_RUN_I386 = $(PCKG_ROOT)/rpm/run/$(PCKG_RPM_RUN_I386)
CURRENT_RPM_DEVEL_I386 = $(PCKG_ROOT)/rpm/devel/$(PCKG_RPM_DEVEL_I386)
CURRENT_RPM_SRC = $(PCKG_ROOT)/rpm/src/$(PCKG_RPM_SRC)
REMOTE_TARGET_PREFIX = rsync_ssh://$(FTP_HOST_LOGIN)@$(FTP_HOST):/home/ftp/dat
REMOTE_TARGETS = \
$(REMOTE_TARGET_PREFIX)$(CURRENT_SRC):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_SRC_USER).$(FTP_SRC_GROUP) \
$(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_SRC:$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_SRC_USER).$(FTP_SRC_GROUP) \
$(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_RUN_I386):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_RUN_USER).$(FTP_RUN_GROUP)\
$(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_RPM_RUN_I386:$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_RUN_USER).$(FTP_RUN_GROUP) \
$(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_SRC):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_SRC_USER).$(FTP_SRC_GROUP) \
$(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_RPM_SRC:$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_SRC_USER).$(FTP_SRC_GROUP)
ifeq ($(CREATE_DEVEL),true)
REMOTE_TARGETS += \
$(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_DEVEL_I386):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_DEV_USER).$(FTP_DEV_GROUP) \
$(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_RPM_DEVEL_I386:$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_DEV_USER).$(FTP_DEV_GROUP)
endif

5
make/upload-rules.mk
View file

@ -14,3 +14,8 @@ yupdate.%.dist:
CURRENT_%: CURRENT_%:
echo $($(notdir $@)) > $@ echo $($(notdir $@)) > $@
clean: upload.clean
upload.clean:
rm -f upload.dist yupdate.*.dist