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

$(TOPDIR), make, scripts: Rename LAST_RPM_VERSION to RELEASES

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-12-16 11:07:20 +00:00
commit 74a62bfda9
4 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

0
LAST_RPM_VERSION → RELEASES
View file

2
make/projects-dir.mk
View file

@ -102,7 +102,7 @@ PGIT_SH = /bin/bash $(MOD_SCRIPT_DIR)/pgit.sh
PURGE_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/purge-stale-projects.sh /opt/jw-build/bin/purge-stale-projects.sh) purge-not-found) PURGE_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/purge-stale-projects.sh /opt/jw-build/bin/purge-stale-projects.sh) purge-not-found)
PKG_MANAGER_SH ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/pkg-manager.sh /opt/jw-build/bin/pkg-manager.sh) pkg-manager-not-found) PKG_MANAGER_SH ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/pkg-manager.sh /opt/jw-build/bin/pkg-manager.sh) pkg-manager-not-found)
CREATE_PROJECT_SH ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jw-build-create-project.sh /opt/jw-build/bin/jw-build-create-project.sh) jw-build-create-project-not-found) CREATE_PROJECT_SH ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jw-build-create-project.sh /opt/jw-build/bin/jw-build-create-project.sh) jw-build-create-project-not-found)
LIST_VCS_FILES_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/scm.sh ls-files /opt/jw-build/bin/scm.sh ls-files) list-vcs-files-not-found) LIST_VCS_FILES_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/scm.sh /opt/jw-build/bin/scm.sh) scm-sh-not-found) ls-files
JW_PKG = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jw-pkg /opt/jw-build/bin/jw-pkg) jw-pkg-not-found) JW_PKG = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jw-pkg /opt/jw-build/bin/jw-pkg) jw-pkg-not-found)
GIT_SRV_ADMIN_SH = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.janware.com /opt/jw-build/bin/git-srv-admin.sh GIT_SRV_ADMIN_SH = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.janware.com /opt/jw-build/bin/git-srv-admin.sh
CVS_ADMIN_SH = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.janware.com /opt/jw-build/bin/cvs-admin.sh CVS_ADMIN_SH = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.janware.com /opt/jw-build/bin/cvs-admin.sh

10
make/rpmdist.mk
View file

@ -16,9 +16,9 @@ FTP_DIR_MODE ?= 755
FTP_HOST ?= ftp.jannet.de FTP_HOST ?= ftp.jannet.de
FTP_HOST_LOGIN ?= root FTP_HOST_LOGIN ?= root
RPM_VERSION ?= $(DIST_VERSION) RPM_VERSION ?= $(DIST_VERSION)
LAST_RPM_VERSION_FILE = $(TOPDIR)/LAST_RPM_VERSION$(FLAVOUR_SUFFIX) RELEASES_FILE = $(TOPDIR)/RELEASES$(FLAVOUR_SUFFIX)
LAST_RPM_VERSION ?= $(shell $(PKG_SH_EXE) version \ RELEASES ?= $(shell $(PKG_SH_EXE) version \
-p $(OS)/$(RPM_ARCH) $(LAST_RPM_VERSION_FILE) read | $(SED) 's/-dev//') -p $(OS)/$(RPM_ARCH) $(RELEASES_FILE) read | $(SED) 's/-dev//')
RPMBUILD ?= pkgbuild RPMBUILD ?= pkgbuild
CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true
HASH = $(shell $(cvs_files) -z | \ HASH = $(shell $(cvs_files) -z | \
@ -269,8 +269,8 @@ define increase_build_number
if [ "$(CHECK_CVS_SYNC_BEFORE_RPM_RELEASE)" = true ]; then \ if [ "$(CHECK_CVS_SYNC_BEFORE_RPM_RELEASE)" = true ]; then \
$(check_scm_sync) ;\ $(check_scm_sync) ;\
fi ;\ fi ;\
if [ "$(LAST_RPM_VERSION)" != "$(RPM_VERSION)" ]; then \ if [ "$(RELEASES)" != "$(RPM_VERSION)" ]; then \
echo "+ no need to increase build number of $(RPM_VERSION), last rpm has $(LAST_RPM_VERSION)" ;\ echo "+ no need to increase build number of $(RPM_VERSION), last rpm has $(RELEASES)" ;\
exit 0 ;\ exit 0 ;\
fi ;\ fi ;\
echo -n "+ increasing build number to " ;\ echo -n "+ increasing build number to " ;\

14
scripts/pkg.sh
View file

@ -162,7 +162,7 @@ increase_build_no()
check_next_version() check_next_version()
{ {
local v=`read_map $TOPDIR/VERSION | sed 's/-dev//'` local v=`read_map $TOPDIR/VERSION | sed 's/-dev//'`
local n=`read_map -n $TOPDIR/LAST_RPM_VERSION | sed 's/-dev//'` local n=`read_map -n $TOPDIR/RELEASES | sed 's/-dev//'`
if [ "$n" != "$v" ]; then if [ "$n" != "$v" ]; then
echo "+ $RPM_PROJECT version is already at $v, no need to increase for release" >&2 echo "+ $RPM_PROJECT version is already at $v, no need to increase for release" >&2
echo $v echo $v
@ -258,8 +258,8 @@ check_release_is_current()
done done
shift shift
if ! read_map -n $TOPDIR/LAST_RPM_VERSION | grep -Fq $next; then if ! read_map -n $TOPDIR/RELEASES | grep -Fq $next; then
echo "next version $next is not in LAST_RPM_VERSION, needs release" >&2 echo "next version $next is not in RELEASES, needs release" >&2
return 1 return 1
fi fi
@ -610,13 +610,13 @@ upload_pkg()
;; ;;
esac esac
write_map $TOPDIR/LAST_RPM_VERSION $v write_map $TOPDIR/RELEASES $v
$SCM add $TOPDIR/LAST_RPM_VERSION || true $SCM add $TOPDIR/RELEASES || true
write_map $TOPDIR/HASH $h write_map $TOPDIR/HASH $h
$SCM add $TOPDIR/HASH || true $SCM add $TOPDIR/HASH || true
echo "+ scheduling rebuild" echo "+ scheduling rebuild"
$SSH -l root $server /opt/packager-server/bin/packager-server schedule-rebuild $SSH -l root $server /opt/packager-server/bin/packager-server schedule-rebuild
scm_commit -m "Release $v@`platform`" $TOPDIR/LAST_RPM_VERSION $TOPDIR/HASH scm_commit -m "Release $v@`platform`" $TOPDIR/RELEASES $TOPDIR/HASH
if [ "$SCM" = git ]; then if [ "$SCM" = git ]; then
git push || true git push || true
fi fi
@ -1008,7 +1008,7 @@ trap goodbye SIGINT SIGKILL
TOPDIR=. TOPDIR=.
MOD_SCRIPT_DIR=`dirname $0` MOD_SCRIPT_DIR=`dirname $0`
CHECK_CVS_SYNC_BEFORE_RPM_RELEASE=false CHECK_CVS_SYNC_BEFORE_RPM_RELEASE=false
#LAST_RPM_VERSION=`read_map $TOPDIR/LAST_RPM_VERSION` #RELEASES=`read_map $TOPDIR/RELEASES`
myname=`basename $0` myname=`basename $0`
cmdline="$0 $@" cmdline="$0 $@"
tmp_mkdef_sh="" tmp_mkdef_sh=""