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

rpmdist.mk: Move some stuff to other *.mk

Browse source 
Move stuff from rpmdist.mk into

  tag-defs.mk
  tag-rules.mk
  upload-defs.mk
  upload-rules.mk
This commit is contained in:
Jan Lindemann 2005-10-17 11:42:36 +00:00 • committed by Jan Lindemann
commit 00d6572f8f
1 changed files with 8 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

42
make/rpmdist.mk
View file

@ -13,7 +13,9 @@ FTP_DIR_MODE = 750
endif
RPM_VERSION = $(VERSION)
TAG_VERSION = V_$(shell echo $(VERSION) | sed 's/[\.-]/_/g')
include $(MODDIR)/make/tag-defs.mk
include $(MODDIR)/make/upload-defs.mk
CLEAN += $(wildcard *.spec *.rpm *~ *.rpmrc *.dist .*.swp)
DIST_SRC_DIR = dist/src/$(RPM_PROJECT)-$(RPM_VERSION)
@ -24,21 +26,7 @@ PCKG_RPM_RUN_I386 = $(RPM_PROJECT)-run-$(RPM_VERSION).i386.rpm
PCKG_RPM_DEVEL_I386 = $(RPM_PROJECT)-devel-$(RPM_VERSION).i386.rpm
PCKG_RPM_SRC = $(RPM_PROJECT)-$(RPM_VERSION).src.rpm
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_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) \
$(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)
include $(MODDIR)/make/upload-defs.mk
DIST_FILES = $(shell echo $(REMOTE_TARGETS) | sed 's/\b.*\///g; s/:.*\b//g')
@ -47,13 +35,12 @@ SRPMS_DIR = /usr/src/packages/SRPMS
DIST_DIRS = $(DIST_SRC_DIR) $(DIST_PCKG_DIR)
DIST_PCKG_RPM = $(DIST_PCKG_DIR)/$(PCKG_RPM_RUN_I386) $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386)
include $(MODDIR)/make/tag-rules.mk
include $(MODDIR)/make/upload-rules.mk
rpmclean:
rm -rf $(DIST_SRC_DIR) $(PCKG_TAR) *.dist
rsync_ssh\://% ftp\://% scp\://%:
make $(shell echo $(addprefix $(DIST_PCKG_DIR)/,$(notdir $@)) | sed 's/:.*//g')
$(UPLOAD_SH) $(shell echo $(addprefix $(DIST_PCKG_DIR)/,$(notdir $@)) $@ | sed 's/:.*//g') $@
cpmod.dist:
for mod in $(SUBDIRS); do \
make -C $$mod distclean ;\
@ -101,25 +88,12 @@ $(DIST_PCKG_DIR)/CURRENT_%: $(TOPDIR)/VERSION
build.dist: $(DIST_FILES)
upload.dist:
if [ -f configure -o -f configure.ac -o -f configure.ac.tmpl ]; then make config; fi
make $(REMOTE_TARGETS)
touch $@.done
include $(MODDIR)/upload-rules.mk
rpminstall.dist: $(DIST_PCKG_RPM)
sudo /bin/rpm -U $<
touch $@
yupdate.%.dist:
sudo -u root $(HOME)/bin/yupdate.sh -f $(HOME)/.yupdaterc -s $*
touch $@
tag.dist:
cvs tag $(TAG_VERSION)
ftag.dist:
cvs tag -F $(TAG_VERSION)
tgz: $(PCKG_TAR)
distclean: rpmclean
clean: rpmclean