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

defs.mk, proj.mk, upload-defs-rpm.mk: Simplified upload variable definitions

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2014-06-13 13:38:14 +00:00
commit 6f037b9382
3 changed files with 4 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
make/defs.mk
View file

@ -253,10 +253,6 @@ ALL_C += $(LOCAL_C) $(PREREQ_CPP)
ALL_CPP += $(LOCAL_CPP) $(PREREQ_CPP) ALL_CPP += $(LOCAL_CPP) $(PREREQ_CPP)
ALL_CSRC += $(LOCAL_CSRC) $(PREREQ_CSRC) ALL_CSRC += $(LOCAL_CSRC) $(PREREQ_CSRC)
FTP_PCKG_DIR = /pub/packages
JANNET_PROJ_DIR = rsync_ssh://ftp.jannet.de:/srv/ftp$(FTP_PCKG_DIR)
UPLOAD_URL_RPM_BIN = rsync_ssh://ftp.jannet.de:/srv/ftp/pub/packages/rpm/bin/
UPLOAD_URL_RPM_SRC = rsync_ssh://ftp.jannet.de:/srv/ftp/pub/packages/rpm/src/
PUBLIC_PATH_DEVEL_DOC = /proj/devel-docs PUBLIC_PATH_DEVEL_DOC = /proj/devel-docs
UPLOAD_URL_DEVEL_DOC = rsync_ssh://root@feitnix.jannet.de:/srv/www/htdocs/jannet.de_443/$(PUBLIC_PATH_DEVEL_DOC) UPLOAD_URL_DEVEL_DOC = rsync_ssh://root@feitnix.jannet.de:/srv/www/htdocs/jannet.de_443/$(PUBLIC_PATH_DEVEL_DOC)

13
make/proj.mk
View file

@ -25,23 +25,12 @@ REQUIRED = inst/pre \
lib include bin \ lib include bin \
inst/post inst/post
#VERSION = @PACKAGE_VERSION@ # rpmdist.mk variable overrides
#VERSION_STR = \"@PACKAGE_VERSION@\"
#DEVELOPMENT = @IS_DEVELOPMENT_VERSION@
# rpmdist.mk variables
MKSPEC_SH = $(MOD_SCRIPT_DIR)/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh
FTP_SRC_GROUP = ytsrc FTP_SRC_GROUP = ytsrc
FTP_SRC_USER = jan
FTP_RUN_GROUP = ytrun FTP_RUN_GROUP = ytrun
FTP_RUN_USER = jan
FTP_DEV_GROUP = ytdev FTP_DEV_GROUP = ytdev
FTP_DEV_USER = jan
FTP_HOST = ftp.jannet.de
FTP_FILE_MODE = 644 FTP_FILE_MODE = 644
FTP_DIR_MODE = 755 FTP_DIR_MODE = 755
#FTP_HOST = ftp.jannet.de
FTP_HOST_LOGIN = root
ifeq ($(DEVELOPMENT),true) ifeq ($(DEVELOPMENT),true)
include $(TOPDIR)/make/cfg_dev.mk include $(TOPDIR)/make/cfg_dev.mk

4
make/upload-defs-rpm.mk
View file

@ -3,7 +3,8 @@
# VERSION # VERSION
# MOD_SCRIPT_DIR # MOD_SCRIPT_DIR
UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
MKSPEC_SH = $(MOD_SCRIPT_DIR)/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh
FTP_FILE_MODE ?= 640 FTP_FILE_MODE ?= 640
FTP_DIR_MODE ?= 750 FTP_DIR_MODE ?= 750
@ -16,6 +17,7 @@ FTP_DEV_USER ?= $(shell whoami)
FTP_HOST ?= ftp.jannet.de FTP_HOST ?= ftp.jannet.de
FTP_HOST_LOGIN ?= root FTP_HOST_LOGIN ?= root
FTP_PCKG_DIR = /pub/packages
PCKG_ROOT = $(FTP_PCKG_DIR)/$(RPM_PROJECT) PCKG_ROOT = $(FTP_PCKG_DIR)/$(RPM_PROJECT)
CURRENT_SRC = $(PCKG_ROOT)/src/$(PCKG_TAR) CURRENT_SRC = $(PCKG_ROOT)/src/$(PCKG_TAR)
CURRENT_RPM_RUN_I386 = $(PCKG_ROOT)/rpm/run/$(PCKG_RPM_RUN_I386) CURRENT_RPM_RUN_I386 = $(PCKG_ROOT)/rpm/run/$(PCKG_RPM_RUN_I386)