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

srcdist.mk: Make wd-upload work with upload-defs.mk

Browse source 
wd-upload doesn\'t work at all, because it clashed with rpmdist.mk defining
stuff used by the upload-*.mk files. The RPM-side of things is left untested.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-01-08 10:53:32 +00:00
commit c713793e16
8 changed files with 44 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

25
make/srcdist.mk
View file

@ -6,9 +6,28 @@ else ifeq ($(VCS),git)
WD_PKG_VCS_FILES = .git
endif
WD_PKG_DIR = $(TOPDIR)/dist/wd
WD_PKG_DIR = dist/wd
WD_PKG_BASE_NAME = $(RPM_PROJECT)$(WD_PKG_VCS_SUFFIX)-$(RPM_VERSION)
WD_PKG = $(WD_PKG_BASE_NAME).tar.bz2
WD_PKG_PATH = $(WD_PKG_DIR)/$(WD_PKG)
WD_PKG_UPLOAD_SERVER = pkg.janware.com
WD_PKG_UPLOAD_PATH = /srv/dav/pub/clients/jw
# -- upload-defs.mk variables
UPLOAD_FILES += $(WD_PKG_PATH)
UPLOAD_SRC_DIR = $(WD_PKG_DIR)
include $(MODDIR)/make/upload-defs.mk
all:
clean: wd-clean
wd-clean:
rm -rf $(WD_PKG_DIR)
$(WD_PKG_DIR):
mkdir -p $@
$(WD_PKG_PATH): | $(WD_PKG_DIR)
make -s list-files | xargs echo $(WD_PKG_VCS_FILES) | xargs tar --transform "s|^|$(WD_PKG_BASE_NAME)/|" -cjf $(WD_PKG_PATH)
wd-upload: $(WD_PKG_PATH)
make $(REMOTE_TARGETS)