extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-30 11:33:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

More changes to build tools for ever-moving patch release target

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7895 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-12-11 00:03:02 +00:00
parent 954c1f00ba
commit 7402fb137a
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/build/buildshorewall
View File

@ -213,9 +213,10 @@ while [ -z "$done" ]; do
option=$1 option=$1
case $option in case $option in
-*) -*)
shift
option=${option#-} option=${option#-}
[ -z "$option" ] && shift && break 2 [ -z "$option" ] && done=Yes && break
while [ -n "$option" ]; do while [ -n "$option" ]; do
case $option in case $option in
@ -261,7 +262,6 @@ while [ -z "$done" ]; do
;; ;;
esac esac
done done
shift
;; ;;
*) *)
done=Yes done=Yes
@ -269,6 +269,8 @@ while [ -z "$done" ]; do
esac esac
done done
echo "Arguments are $*"
case $# in case $# in
1) 1)
;; ;;
@ -879,7 +881,7 @@ fi
do_or_die "$GPG $betaball" do_or_die "$GPG $betaball"
fi fi
if [ -n "$BUILDSHELL" ]; then if [ -n "$BUILDPERL" ]; then
betaball=shorewall-perl-$VERSION.${shoresuffix} betaball=shorewall-perl-$VERSION.${shoresuffix}
report "GPG signing $DIR/$betaball tarball" report "GPG signing $DIR/$betaball tarball"
rm -f ${betaball}.asc rm -f ${betaball}.asc
@ -946,12 +948,10 @@ if [ -n "$OLDVERSION" ]; then
progress_message "Creating patch-$VERSION ..." progress_message "Creating patch-$VERSION ..."
> patch-$VERSION [ -d shorewall-common-$VERSION ] && diff -Naur -X $(dirname $0)/exclude.txt shorewall-common-$OLDVERSION shorewall-common-$VERSION > patch-common-$VERSION || true
[ -d shorewall-lite-$VERSION ] && diff -Naur -X $(dirname $0)/exclude.txt shorewall-lite-$OLDVERSION shorewall-lite-$VERSION > patch-lite-$VERSION || true
[ -d shorewall-common-$VERSION ] && diff -Naur -X $(dirname $0)/exclude.txt shorewall-common-$OLDVERSION shorewall-common-$VERSION >> patch-$VERSION || true [ -d shorewall-perl-$VERSION ] && diff -Naur -X $(dirname $0)/exclude.txt shorewall-perl-$OLDVERSION shorewall-perl-$VERSION > patch-perl-$VERSION || true
[ -d shorewall-lite-$VERSION ] && diff -Naur -X $(dirname $0)/exclude.txt shorewall-lite-$OLDVERSION shorewall-lite-$VERSION >> patch-$VERSION || true [ -d shorewall-shell-$VERSION ] && diff -Naur -X $(dirname $0)/exclude.txt shorewall-shell-$OLDVERSION shorewall-shell-$VERSION > patch-shell-$VERSION || true
[ -d shorewall-perl-$VERSION ] && diff -Naur -X $(dirname $0)/exclude.txt shorewall-perl-$OLDVERSION shorewall-perl-$VERSION >> patch-$VERSION || true
[ -d shorewall-shell-$VERSION ] && diff -Naur -X $(dirname $0)/exclude.txt shorewall-shell-$OLDVERSION shorewall-shell-$VERSION >> patch-$VERSION || true
fi fi

2
tools/build/stage
View File

@ -191,7 +191,7 @@ else
DEST=${USER}:${DEST} DEST=${USER}:${DEST}
fi fi
files="errata known_problems.txt releasenotes.txt patch-$1 ${1}.*" files="errata known_problems.txt releasenotes.txt patch-*-$1 ${1}.*"
base= base=
[ -n "$UPLOADPERL" ] && base="shorewall-perl-${1}.tar.*" && files="$files shorewall-perl-${1}.* $perlrpm" [ -n "$UPLOADPERL" ] && base="shorewall-perl-${1}.tar.*" && files="$files shorewall-perl-${1}.* $perlrpm"

2
tools/build/upload
View File

@ -201,7 +201,7 @@ else
DEST=${USER}:${DEST} DEST=${USER}:${DEST}
fi fi
files="errata known_problems.txt releasenotes.txt patch-$1 ${1}.*" files="errata known_problems.txt releasenotes.txt patch-*-$1 ${1}.*"
base= base=
[ -n "$UPLOADPERL" ] && base="shorewall-perl-${1}.tar.*" && files="$files shorewall-perl-${1}.* $perlrpm" [ -n "$UPLOADPERL" ] && base="shorewall-perl-${1}.tar.*" && files="$files shorewall-perl-${1}.* $perlrpm"