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

fix makeshorewall to use Subversion (now working,please test :D)

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3564 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
judas_iscariote 2006-02-24 00:10:47 +00:00
parent b6257d4201
commit 0d0f01fce8
1 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
tools/build/makeshorewall
View File

@ -1,6 +1,8 @@
#!/bin/sh #!/bin/sh
# #
# Shorewall Release Processing -- (C) 2003,2004,2005 -- Tom Eastep (teastep@shorewall.net) # Shorewall Release Processing -- (C) 2003,2004,2005 -- Tom Eastep (teastep@shorewall.net)
# -- (C) 2005,2006 -- Cristian Rodriguez (webmaster@shorewall.net)
# Version : $Id$
# #
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm] # This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
# #
@ -54,10 +56,6 @@ RPMDIR=~/rpm/
# Directory where you want the release to be built # Directory where you want the release to be built
# #
DIR=$PWD DIR=$PWD
#
# CVS Root
#
export CVSROOT=:ext:${USER}@cvs.sourceforge.net:/cvsroot/shorewall
################################################################################ ################################################################################
# V A R I A B L E S # V A R I A B L E S
################################################################################ ################################################################################
@ -65,8 +63,7 @@ VERSION=
OLDVERSION= OLDVERSION=
SHOREWALLDIR= SHOREWALLDIR=
SOURCEDIR= SOURCEDIR=
CVSTAG= SVNBRANCH=
#CVSSTABLE=
XMLPROJ= XMLPROJ=
RPMNAME= RPMNAME=
TARBALL= TARBALL=
@ -205,21 +202,21 @@ progress_message "Build of Shorewall $VERSION on $(date)"
case $VERSION in case $VERSION in
2.4.*) 2.4.*)
CVSTAG="branches/SHOREWALL-2_4/Shorewall" SVNBRANCH="branches/2.4/Shorewall"
DOCTAG="branches/SHOREWALL_2_4/Shorewall-docs2" DOCTAG="branches/2.4/docs"
XMLPROJ=Shorewall-docs2 XMLPROJ="docs-2.4"
;; ;;
3.0.*) 3.0.*)
CVSTAG=SHOREWALL-3_0 SVNBRANCH="branches/3.0/Shorewall"
DOCTAG=HEAD DOCTAG="trunk/docs"
XMLPROJ=Shorewall-docs2 XMLPROJ="docs-3.0"
SAMPLESTAG=HEAD SAMPLESTAG="trunk/Samples"
;; ;;
3.1.*) 3.1.*)
CVSTAG=HEAD SVNBRANCH="trunk/Shorewall"
DOCTAG=HEAD DOCTAG="trunk/docs"
XMLPROJ=Shorewall-docs2 XMLPROJ="docs-3.1"
SAMPLESTAG=HEAD SAMPLESTAG="trunk/Samples"
;; ;;
*) *)
echo "Unsupported Version: $VERSION" echo "Unsupported Version: $VERSION"
@ -256,7 +253,7 @@ HTMLDIR=shorewall-docs-html-$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 tag is $CVSTAG" report "SVN tag is $SVNBRANCH"
[ -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
@ -264,13 +261,11 @@ fi
[ -n "$BUILDHTML" ] && report "HTML Directory is $HTMLDIR" [ -n "$BUILDHTML" ] && report "HTML Directory is $HTMLDIR"
if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
progress_message "Exporting $CVSTAG from CVS..." progress_message "Exporting $SVNBRANCH from SVN..."
rm -rf $SHOREWALLDIR rm -rf $SHOREWALLDIR
do_or_die "cvs -z3 export -r $CVSTAG -d $SHOREWALLDIR Shorewall >> $LOGFILE 2>&1" do_or_die "svn export --non-interactive --force https://svn.sourceforge.net/svnroot/shorewall/$SVNBRANCH $SHOREWALLDIR >> $LOGFILE 2>&1"
do_or_die "svn export --non-interactive https://svn.sourceforge.net/svnroot/shorewall/$CVSTAG $SHOREWALLDIR >> $LOGFILE 2>&1"
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"
@ -280,7 +275,7 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
if [ -n "$SAMPLESTAG" ]; then if [ -n "$SAMPLESTAG" ]; then
cd $SHOREWALLDIR cd $SHOREWALLDIR
do_or_die "cvs -z3 export -r $SAMPLESTAG Samples >> $LOGFILE 2>&1" do_or_die "svn export --non-interactive --force https://svn.sourceforge.net/svnroot/shorewall/$SAMPLESTAG Samples >> $LOGFILE 2>&1"
cd $DIR cd $DIR
fi fi
@ -307,12 +302,12 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
fi fi
if [ -n "${BUILDXML}${BUILDHTML}" ]; then if [ -n "${BUILDXML}${BUILDHTML}" ]; then
progress_message "Exporting $XMLPROJ from CVS..." progress_message "Exporting $XMLPROJ from SVN..."
rm -rf $XMLPROJ rm -rf $XMLPROJ
rm -rf shorewall-docs-xml-$VERSION rm -rf shorewall-docs-xml-$VERSION
do_or_die "cvs -z3 export -r $DOCTAG $XMLPROJ >> $LOGFILE 2>&1" do_or_die "svn export --non-interactive --force https://svn.sourceforge.net/svnroot/shorewall/$DOCTAG $XMLPROJ >> $LOGFILE 2>&1"
do_or_die mv $XMLPROJ shorewall-docs-xml-$VERSION do_or_die mv $XMLPROJ shorewall-docs-xml-$VERSION
rm -f shorewall-docs-xml-$VERSION/images/*.vsd rm -f shorewall-docs-xml-$VERSION/images/*.vsd