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

14
scripts/pkg.sh
View file

@ -162,7 +162,7 @@ increase_build_no()
check_next_version()
{
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
echo "+ $RPM_PROJECT version is already at $v, no need to increase for release" >&2
echo $v
@ -258,8 +258,8 @@ check_release_is_current()
done
shift
if ! read_map -n $TOPDIR/LAST_RPM_VERSION | grep -Fq $next; then
echo "next version $next is not in LAST_RPM_VERSION, needs release" >&2
if ! read_map -n $TOPDIR/RELEASES | grep -Fq $next; then
echo "next version $next is not in RELEASES, needs release" >&2
return 1
fi
@ -610,13 +610,13 @@ upload_pkg()
;;
esac
write_map $TOPDIR/LAST_RPM_VERSION $v
$SCM add $TOPDIR/LAST_RPM_VERSION || true
write_map $TOPDIR/RELEASES $v
$SCM add $TOPDIR/RELEASES || true
write_map $TOPDIR/HASH $h
$SCM add $TOPDIR/HASH || true
echo "+ scheduling 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
git push || true
fi
@ -1008,7 +1008,7 @@ trap goodbye SIGINT SIGKILL
TOPDIR=.
MOD_SCRIPT_DIR=`dirname $0`
CHECK_CVS_SYNC_BEFORE_RPM_RELEASE=false
#LAST_RPM_VERSION=`read_map $TOPDIR/LAST_RPM_VERSION`
#RELEASES=`read_map $TOPDIR/RELEASES`
myname=`basename $0`
cmdline="$0 $@"
tmp_mkdef_sh=""