janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 20:13:32 +01:00
Code Activity

cfg_dev.mk, rpmdist.mk: Upload opts rpmdist.mk -> cfg_dev.mk

Browse source 
Move project specific upload options from rpmdist.mk into cfg_dev.mk.
This commit is contained in:
Jan Lindemann 2002-07-01 18:49:40 +00:00 • committed by Jan Lindemann
commit 3a525481d3
2 changed files with 22 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

12
make/cfg_dev.mk
View file

@ -38,6 +38,18 @@ CONFIG_FILE = $(CONFIG_DIR)/$(PROJECT).cfg
LIBTYPE = static
FTP_PUB_DIR_ABS = $(JANNET_PROJ_DIR)/$(PROJECT)
# rpmdist.mk variables
MKSPEC_SH = $(TOPDIR)/make/mkspec.sh
FTP_SRC_GROUP = ytsrc
FTP_SRC_USER = jan
FTP_RUN_GROUP = ytrun
FTP_RUN_USER = jan
FTP_DEV_GROUP = ytdev
FTP_DEV_USER = jan
FTP_HOST = nb02
#FTP_HOST = ftp.jannet.de
FTP_HOST_LOGIN = root
# -- debugging options
# for using the dbmalloc lib, before you will need to do:

57
make/rpmdist.mk
View file

@ -9,53 +9,26 @@ PCKG_RPM_RUN_I386 = $(PROJECT)-run-$(DIST_VERSION).i386.rpm
PCKG_RPM_DEVEL_I386 = $(PROJECT)-devel-$(DIST_VERSION).i386.rpm
PCKG_RPM_SRC = $(PROJECT)-$(DIST_VERSION).src.rpm
#TARGET_HOST = ftp.jannet.de
TARGET_HOST = nb02
TARGET_HOST_LOGIN = root
PCKG_ROOT = $(FTP_PCKG_DIR)/$(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)
test:
echo $(REMOTE_TARGETS)
REMOTE_TARGET_PREFIX = rsync_ssh://$(TARGET_HOST_LOGIN)@$(TARGET_HOST):/usr/local/ftp
REMOTE_TARGET_PREFIX = rsync_ssh://$(FTP_HOST_LOGIN)@$(FTP_HOST):/usr/local/ftp
REMOTE_TARGETS = \
$(REMOTE_TARGET_PREFIX)$(CURRENT_SRC):640:750:jan.ytsrc \
$(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_SRC:640:750:jan.ytsrc \
$(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_RUN_I386):640:750:jan.ytrun \
$(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_RPM_RUN_I386:640:750:jan.ytrun \
$(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_DEVEL_I386):640:750:jan.ytdev \
$(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_RPM_DEVEL_I386:640:750:jan.ytdev \
$(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_SRC):640:750:jan.ytsrc \
$(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_RPM_SRC:640:750:jan.ytsrc
$(REMOTE_TARGET_PREFIX)$(CURRENT_SRC):640:750:$(FTP_SRC_USER).$(FTP_SRC_GROUP) \
$(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_SRC:640:750:$(FTP_SRC_USER).$(FTP_SRC_GROUP) \
$(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_RUN_I386):640:750:$(FTP_RUN_USER).$(FTP_RUN_GROUP)\
$(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_RPM_RUN_I386:640:750:$(FTP_RUN_USER).$(FTP_RUN_GROUP) \
$(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_DEVEL_I386):640:750:$(FTP_DEV_USER).$(FTP_DEV_GROUP) \
$(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_RPM_DEVEL_I386:640:750:$(FTP_DEV_USER).$(FTP_DEV_GROUP) \
$(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_SRC):640:750:$(FTP_SRC_USER).$(FTP_SRC_GROUP) \
$(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_RPM_SRC:640:750:$(FTP_SRC_USER).$(FTP_SRC_GROUP)
DIST_FILES = $(shell echo $(REMOTE_TARGETS) | sed 's/\b.*\///g; s/:.*\b//g')
# $(DIST_FILE_TAR) \
# $(DIST_FILE_RPM_RUN_I386) \
# $(DIST_FILE_RPM_DEVEL_I386) \
# $(DIST_FILE_RPM_SRC)
#BUILD_ROOT = /usr/src/packages/BUILD
RPMS_DIR = /usr/src/packages/RPMS/i386
SRPMS_DIR = /usr/src/packages/SRPMS
#TARGET_DIR_SRC = $(FTP_PCKG_DIR)/src
#TARGET_DIR_RPM_RUN_I386 = $(FTP_PCKG_DIR)/rpm/run/i386
#TARGET_DIR_RPM_DEVEL_I386 = $(FTP_PCKG_DIR)/rpm/devel/i386
#TARGET_DIR_RPM_SRC = $(FTP_PCKG_DIR)/rpm/src
#TARGET_OWNER = jan
#TARGET_GROUP = jannet
#TARGET_FILE_MODE = 644
#TARGET_DIR_MODE = 755
#TARGET_DIR = $(TARGET_DIR_RPM)/$(PROJECT)
#REMOTE_FILES = \
# $(TARGET_DIR_RPM_SRC)/$(PCKG_RPM_SRC) \
# $(TARGET_DIR_RPM_I386)/, $(PCKG_RPM_I386)) \
# $(TARGET_DIR_SRC)/$(PCKG_TAR)
#REMOTE_TARGETS = \
# $(addsuffix :$(TARGET_FILE_MODE):$(TARGET_DIR_MODE):$(TARGET_OWNER).$(TARGET_GROUP),$(REMOTE_FILES))
DIST_DIRS = $(DIST_SRC_DIR) $(DIST_PCKG_DIR)
clean.dist:
@ -86,7 +59,7 @@ cpmod.dist:
cpfiles.dist:
mkdir -p $(DIST_SRC_DIR)
cp Makefile $(DIST_SRC_DIR)
sh make/mkspec.sh -V $(DIST_VERSION) -S $(notdir $(PCKG_TAR)) -N $(PROJECT) > $(DIST_SRC_DIR)/$(PROJECT)-$(DIST_VERSION).spec
sh $(MKSPEC_SH) -V $(DIST_VERSION) -S $(notdir $(PCKG_TAR)) -N $(PROJECT) > $(DIST_SRC_DIR)/$(PROJECT)-$(DIST_VERSION).spec
echo $(DIST_VERSION) > $(DIST_SRC_DIR)/VERSION
touch $@
@ -105,19 +78,9 @@ $(DIST_PCKG_DIR)/$(PCKG_RPM_RUN_I386) $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386): $
$(DIST_PCKG_DIR)/CURRENT_%:
echo $(CURRENT_$*) > $@
# set -e; \
# su - -m -c "cd `pwd`; rpm -ta --clean $<"
# --buildroot $(BUILD_ROOT) $<"
# --define _rpmdir$(PCKGDIR) \
# --define _builddir$(shell pwd)
#$(PROJECT).rpmrc: Makefile
# echo "%define _topdir $(shell cd $(TODPIR); pwd)" > $@
build.dist: $(DIST_FILES)
#upload.dist: build.dist rpm.dist
upload.dist:
make $(REMOTE_TARGETS)
touch $@.done