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

Always export common from SVN

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7750 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-11-24 18:49:30 +00:00
parent a97517c364
commit 13b51c7309
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/build/buildshorewall
View File

@ -337,7 +337,7 @@ case $VERSION in
# Patch Release # Patch Release
# #
PATCHRELEASE=Yes PATCHRELEASE=Yes
SHOREWALLDIR=shorewall-common-${VERSION%-*} [ -n "$BUILDCOMMON" ] && SHOREWALLDIR=shorewall-common-${VERSION} || SHOREWALLDIR=shorewall-common-${VERSION%-*}
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
@ -388,13 +388,13 @@ fi
if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
[ -n "$BUILDCOMMON" ] && rm -rf $SHOREWALLDIR rm -rf $SHOREWALLDIR
[ -n "$BUILDLITE" ] && rm -rf $SHOREWALLLITEDIR [ -n "$BUILDLITE" ] && rm -rf $SHOREWALLLITEDIR
[ -n "$BUILDPERL" ] && rm -rf $PERLDIR [ -n "$BUILDPERL" ] && rm -rf $PERLDIR
[ -n "$BUILDSHELL" ] && rm -rf $SHELLDIR [ -n "$BUILDSHELL" ] && rm -rf $SHELLDIR
progress_message "Exporting $SVNBRANCH from SVN..." && do_or_die "svn export --non-interactive --force ${SVN}/$SVNBRANCH $SHOREWALLDIR >> $LOGFILE 2>&1"
[ -n "$BUILDCOMMON" ] && progress_message "Exporting $SVNBRANCH from SVN..." && do_or_die "svn export --non-interactive --force ${SVN}/$SVNBRANCH $SHOREWALLDIR >> $LOGFILE 2>&1"
[ -n "$BUILDLITE" ] && progress_message "Exporting $LITESVNBRANCH from SVN..." && do_or_die "svn export --non-interactive --force ${SVN}/$LITESVNBRANCH $SHOREWALLLITEDIR >> $LOGFILE 2>&1" [ -n "$BUILDLITE" ] && progress_message "Exporting $LITESVNBRANCH from SVN..." && do_or_die "svn export --non-interactive --force ${SVN}/$LITESVNBRANCH $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
@ -403,7 +403,7 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
[ -n "$BUILDSHELL" ] && progress_message "Exporting $SHELLBRANCH from SVN..." && do_or_die "svn export --non-interactive --force ${SVN}/$SHELLBRANCH $SHELLDIR >> $LOGFILE 2>&1" [ -n "$BUILDSHELL" ] && progress_message "Exporting $SHELLBRANCH from SVN..." && do_or_die "svn export --non-interactive --force ${SVN}/$SHELLBRANCH $SHELLDIR >> $LOGFILE 2>&1"
if [ -n "$BUILDCOMMON" ]; then if [ -n "$BUILDLITE" ]; then
do_or_die "cp $SHOREWALLDIR/modules $SHOREWALLLITEDIR >> $LOGFILE 2>&1" do_or_die "cp $SHOREWALLDIR/modules $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
do_or_die "cp $SHOREWALLDIR/lib.base $SHOREWALLLITEDIR >> $LOGFILE 2>&1" do_or_die "cp $SHOREWALLDIR/lib.base $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
if [ -f $SHOREWALLDIR/lib.cli ]; then if [ -f $SHOREWALLDIR/lib.cli ]; then
@ -412,10 +412,6 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
if [ -f $SHOREWALLDIR/wait4ifup ]; then if [ -f $SHOREWALLDIR/wait4ifup ]; then
do_or_die "cp $SHOREWALLDIR/wait4ifup $SHOREWALLLITEDIR >> $LOGFILE 2>&1" do_or_die "cp $SHOREWALLDIR/wait4ifup $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
fi fi
elif [ -n "$OLDVERSION" ]; then
SHOREWALLDIR=shorewall-common-${OLDVERSION}
else
SHOREWALLDIR=shorewall-common-${VERSION}
fi fi
[ -n "$BUILDLITE" ] && do_or_die "cp $SHOREWALLDIR/changelog.txt $SHOREWALLDIR/releasenotes.txt $SHOREWALLLITEDIR >> $LOGFILE 2>&1" [ -n "$BUILDLITE" ] && do_or_die "cp $SHOREWALLDIR/changelog.txt $SHOREWALLDIR/releasenotes.txt $SHOREWALLLITEDIR >> $LOGFILE 2>&1"