Change build script to reflect new CVS structure

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2292 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
paulgear 2005-07-09 08:07:40 +00:00
parent 13c7bcb6d8
commit 5a62cce275

View File

@ -65,8 +65,8 @@ SOURCEDIR=
LRPPROJ= LRPPROJ=
LRPDIR= LRPDIR=
LRP= LRP=
CVSPROJ= CVSTAG=
CVSSTABLE= #CVSSTABLE=
XMLPROJ= XMLPROJ=
RPMNAME= RPMNAME=
TARBALL= TARBALL=
@ -122,6 +122,11 @@ usage()
################################################################################ ################################################################################
# E X E C U T I O N S T A R T S H E R E # E X E C U T I O N S T A R T S H E R E
################################################################################ ################################################################################
# Added by Paul Gear 2005-07-09, just in case i've screwed up the CVS changes.
set -e
set -u
done= done=
case $1 in case $1 in
@ -203,24 +208,24 @@ progress_message "Build of Shorewall $VERSION on $(date)"
case $VERSION in case $VERSION in
2.0.*) 2.0.*)
CVSPROJ=STABLE CVSTAG=SHOREWALL-2_0
XMLPROJ=Shorewall-docs XMLPROJ=Shorewall-docs
LRP=shorwall-${VERSION}.lrp LRP=shorwall-${VERSION}.lrp
LRPPROJ=Lrp LRPPROJ=Lrp
;; ;;
2.2.*) 2.2.*)
CVSPROJ=STABLE2 CVSTAG=SHOREWALL-2_0
XMLPROJ=Shorewall-docs2 XMLPROJ=Shorewall-docs2
LRP=shorewall-lrp-${VERSION}.tgz LRP=shorewall-lrp-${VERSION}.tgz
LRPPROJ=Lrp2 LRPPROJ=Lrp2
;; ;;
2.3.*) 2.4.*)
CVSPROJ=Shorewall2 CVSTAG=SHOREWALL-2_4
XMLPROJ=Shorewall-docs2 XMLPROJ=Shorewall-docs2
BUILDLRP= BUILDLRP=
;; ;;
2.4.*) 2.5.*)
CVSPROJ=Shorewall2 CVSTAG=HEAD
XMLPROJ=Shorewall-docs2 XMLPROJ=Shorewall-docs2
BUILDLRP= BUILDLRP=
;; ;;
@ -260,7 +265,7 @@ LRPDIR=shorewall-lrp-$VERSION
if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
report "Shorewall directory is $DIR/$SHOREWALLDIR" report "Shorewall directory is $DIR/$SHOREWALLDIR"
report "CVS Project is $CVSPROJ" report "CVS tag is $CVSTAG"
[ -n "$BUILDTARBALL" ] && report "TARBALL is $TARBALL" [ -n "$BUILDTARBALL" ] && report "TARBALL is $TARBALL"
[ -n "$BUILDRPM" ] && report "RPM is $RPMNAME" [ -n "$BUILDRPM" ] && report "RPM is $RPMNAME"
fi fi
@ -269,13 +274,11 @@ fi
[ -n "$BUILDLRP" ] && report "LRP Directory is $LRPDIR" [ -n "$BUILDLRP" ] && report "LRP Directory is $LRPDIR"
if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
progress_message "Exporting $CVSPROJ from CVS..." progress_message "Exporting $CVSTAG from CVS..."
rm -rf $SHOREWALLDIR rm -rf $SHOREWALLDIR
rm -rf $CVSPROJ
do_or_die "cvs -d :pserver:anonymous@cvs.sourceforge.net:/cvsroot/shorewall export -D now $CVSPROJ >> $LOGFILE 2>&1" do_or_die "cvs -d :pserver:anonymous@cvs.sourceforge.net:/cvsroot/shorewall export -r $CVSTAG -d $SHOREWALLDIR Shorewall >> $LOGFILE 2>&1"
do_or_die mv $CVSPROJ $SHOREWALLDIR
fgrep VERSION=$VERSION $SHOREWALLDIR/install.sh > /dev/null 2>&1 || fatal_error "install.sh has wrong version" fgrep VERSION=$VERSION $SHOREWALLDIR/install.sh > /dev/null 2>&1 || fatal_error "install.sh has wrong version"
fgrep VERSION=$VERSION $SHOREWALLDIR/uninstall.sh > /dev/null 2>&1 || fatal_error "uninstall.sh has wrong version" fgrep VERSION=$VERSION $SHOREWALLDIR/uninstall.sh > /dev/null 2>&1 || fatal_error "uninstall.sh has wrong version"