holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Yet another go-around with patch versions

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7883 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-12-10 17:17:25 +00:00
parent 98827c3957
commit b2d899a2d0
2 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
tools/build/buildshorewall
View File

@ -281,24 +281,26 @@ case $# in
esac esac
VERSION=$1 VERSION=$1
BASEVERSION=${VERSION%-*} BASEVERSION=$1
LOGFILE=$LOGDIR/shorewall_build_${VERSION}.log LOGFILE=$LOGDIR/shorewall_build_${VERSION}.log
touch $LOGFILE touch $LOGFILE
progress_message "Build of Shorewall $VERSION on $(date)" progress_message "Build of Shorewall $VERSION on $(date)"
case $VERSION in case $VERSION in
4.1.*-*) 4.1.*.*)
PATCHNUM=${VERSION#*-} PATCHRELEASE=Yes
PATCHNUM=${VERSION##*.}
BASEVERSION=${VERSION%.*}
SVNBRANCH="tags/${BASEVERSION}/Shorewall-common-${PATCHNUM}" SVNBRANCH="tags/${BASEVERSION}/Shorewall-common-${PATCHNUM}"
LITESVNBRANCH="/tags/${BASEVERSION}/Shorewall-lite-${PATCHNUM}" LITESVNBRANCH="/tags/${BASEVERSION}/Shorewall-lite-${PATCHNUM}"
PERLBRANCH="tags/${BASEVERSION}/Shorewall-perl-${PATCHNUM}" PERLBRANCH="tags/${BASEVERSION}/Shorewall-perl-${PATCHNUM}"
SHELLBRANCH="tags/${BASEVERSION}/Shorewall-shell-${PATCHNUM}" SHELLBRANCH="tags/${BASEVERSION}/Shorewall-shell-${PATCHNUM}"
DOCTAG="trunk/docs" DOCTAG="trunk/docs"
XMLPROJ="docs-4.0" XMLPROJ="docs-4.1"
SAMPLESTAG="trunk/Samples" SAMPLESTAG="tags/${BASEVERSION}/Samples"
MANPAGETAG=trunk/manpages MANPAGETAG=="tags/${BASEVERSION}/manpages"
LITEMANPAGETAG=trunk/manpages-lite LITEMANPAGETAG="tags/${BASEVERSION}/manpages-lite"
;; ;;
4.1.*) 4.1.*)
SVNBRANCH="trunk/Shorewall-common" SVNBRANCH="trunk/Shorewall-common"
@ -311,8 +313,10 @@ case $VERSION in
MANPAGETAG=trunk/manpages MANPAGETAG=trunk/manpages
LITEMANPAGETAG=trunk/manpages-lite LITEMANPAGETAG=trunk/manpages-lite
;; ;;
4.0.*-*) 4.0.*.*)
PATCHNUM=${VERSION#*-} PATCHRELEASE=Yes
PATCHNUM=${VERSION##*.}
BASEVERSION=${VERSION%.*}
SVNBRANCH="tags/${BASEVERSION}/Shorewall-common-${PATCHNUM}" SVNBRANCH="tags/${BASEVERSION}/Shorewall-common-${PATCHNUM}"
LITESVNBRANCH="/tags/${BASEVERSION}/Shorewall-lite-${PATCHNUM}" LITESVNBRANCH="/tags/${BASEVERSION}/Shorewall-lite-${PATCHNUM}"
PERLBRANCH="tags/${BASEVERSION}/Shorewall-perl-${PATCHNUM}" PERLBRANCH="tags/${BASEVERSION}/Shorewall-perl-${PATCHNUM}"
@ -340,6 +344,12 @@ case $VERSION in
;; ;;
esac esac
case $VERSION in
*.*.*.*)
PATCHRELEASE=Yes
;;
esac
[ -d $DIR ] || { echo "Directory $DIR does not exist or is unaccessible" ; exit 2 ; } [ -d $DIR ] || { echo "Directory $DIR does not exist or is unaccessible" ; exit 2 ; }
progress_message "Distribution directory is $DIR" progress_message "Distribution directory is $DIR"
@ -364,24 +374,6 @@ case $VERSION in
SHELLTARBALL=shorewall-shell-${BASEVERSION}.tgz SHELLTARBALL=shorewall-shell-${BASEVERSION}.tgz
SHELLDIR=shorewall-shell-${BASEVERSION} SHELLDIR=shorewall-shell-${BASEVERSION}
;; ;;
*-*)
#
# Patch Release
#
PATCHRELEASE=Yes
[ -n "$BUILDCOMMON" ] && SHOREWALLDIR=shorewall-common-${BASEVERSION} || SHOREWALLDIR=shorewall-common
SHOREWALLLITEDIR=shorewall-lite-${BASEVERSION}
TARBALL=shorewall-common-${BASEVERSION}.tgz
LITETARBALL=shorewall-lite-${BASEVERSION}.tgz
RPMNAME=shorewall-common-${VERSION}.noarch.rpm
LITERPMNAME=shorewall-lite-${VERSION}.noarch.rpm
PERLRPMNAME=shorewall-perl-${VERSION}.noarch.rpm
PERLTARBALL=shorewall-perl-${BASEVERSION}.tgz
PERLDIR=shorewall-perl-${BASEVERSION}
SHELLRPMNAME=shorewall-shell-${VERSION}.noarch.rpm
SHELLTARBALL=shorewall-shell-${BASEVERSION}.tgz
SHELLDIR=shorewall-shell-${BASEVERSION}
;;
*) *)
# #
# Normal Release # Normal Release
@ -932,8 +924,8 @@ if [ -n "$PATCHRELEASE" ]; then
svn update ~/shorewall/tags/${BASEVERSION} svn update ~/shorewall/tags/${BASEVERSION}
if [ -f ~/shorewall/tags/${BASEVERSION}/known_problems.txt ]; then if [ -f ~/shorewall/tags/${BASEVERSION}/known_problems.txt ]; then
cp ~/shorewall/tags/${BASEVERSION}/known_problems.txt . cp ~/shorewall/tags/${BASEVERSION}/known_problems.txt .
else else
echo "There are no known problems in Shorewall version $VERSION" > known_problems.txt [ -f known_problems.txt ] || echo "There are no known problems in Shorewall version $VERSION" > known_problems.txt
fi fi
else else
echo "There are no known problems in Shorewall version $VERSION" > known_problems.txt echo "There are no known problems in Shorewall version $VERSION" > known_problems.txt

4
tools/build/stage
View File

@ -113,6 +113,10 @@ case $1 in
shellrpm=shorewall-shell-${1}-1.noarch.rpm shellrpm=shorewall-shell-${1}-1.noarch.rpm
BASE=Yes BASE=Yes
;; ;;
4.1.*-*)
DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-${1%-*}"
SHOREWALL=shorewall-common
;;
4.1.*) 4.1.*)
DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1" DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1"
SHOREWALL=shorewall-common SHOREWALL=shorewall-common