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

Always try to generate a full patch -- take 2

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7780 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-11-27 21:52:02 +00:00
parent 7ad4e7afb4
commit e61bf879bc
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/build/buildshorewall
View File

@ -339,7 +339,7 @@ case $VERSION in
# #
# Beta or Release Candidate # Beta or Release Candidate
# #
SHOREWALLDIR=shorewall-common-${BASEVERSION} [ -n "$BUILDCOMMON" ] && SHOREWALLDIR=shorewall-common-${BASEVERSION} || SHOREWALLDIR=shorewall-common
SHOREWALLLITEDIR=shorewall-lite-${BASEVERSION} SHOREWALLLITEDIR=shorewall-lite-${BASEVERSION}
TARBALL=shorewall-common-${BASEVERSION}.tgz TARBALL=shorewall-common-${BASEVERSION}.tgz
LITETARBALL=shorewall-lite-${BASEVERSION}.tgz LITETARBALL=shorewall-lite-${BASEVERSION}.tgz
@ -374,7 +374,7 @@ case $VERSION in
# #
# Normal Release # Normal Release
# #
SHOREWALLDIR=shorewall-common-$VERSION [ -n "$BUILDCOMMON" ] && SHOREWALLDIR=shorewall-common-${BASEVERSION} || SHOREWALLDIR=shorewall-common
SHOREWALLLITEDIR=shorewall-lite-$VERSION SHOREWALLLITEDIR=shorewall-lite-$VERSION
TARBALL=shorewall-common-$VERSION.tgz TARBALL=shorewall-common-$VERSION.tgz
LITETARBALL=shorewall-lite-$VERSION.tgz LITETARBALL=shorewall-lite-$VERSION.tgz
@ -942,7 +942,8 @@ if [ -n "$OLDVERSION" ]; then
[ -d shorewall-common-$VERSION ] && diff -Naur -X $(dirname $0)/exclude.txt shorewall-common-$OLDVERSION shorewall-common-$VERSION >> patch-$VERSION || true [ -d shorewall-common-$VERSION ] && diff -Naur -X $(dirname $0)/exclude.txt shorewall-common-$OLDVERSION shorewall-common-$VERSION >> patch-$VERSION || true
[ -d shorewall-lite-$VERSION ] && diff -Naur -X $(dirname $0)/exclude.txt shorewall-lite-$OLDVERSION shorewall-lite-$VERSION >> patch-$VERSION || true [ -d shorewall-lite-$VERSION ] && diff -Naur -X $(dirname $0)/exclude.txt shorewall-lite-$OLDVERSION shorewall-lite-$VERSION >> patch-$VERSION || true
[ -d shorewall-perl-$VERSION ] && diff -Naur -X $(dirname $0)/exclude.txt shorewall-perl-$OLDVERSION shorewall-perl-$VERSION >> patch-$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 [ -d shorewall-shell-$VERSION ] && diff -Naur -X $(dirname $0)/exclude.txt shorewall-shell-$OLDVERSION shorewall-shell-$VERSION >> patch-$VERSION || true
fi
fi fi
progress_message "Shorewall $VERSION Build complete - $(date)" progress_message "Shorewall $VERSION Build complete - $(date)"