extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-01-22 21:48:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix breakage to build script inflicted during modularization in 3.3

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4420 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-08-25 14:34:41 +00:00
parent 1c76d5b110
commit 23b6c19f94
1 changed files with 58 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
tools/build/makeshorewall
View File

@ -115,6 +115,7 @@ BUILDHTML=
SAMPLESTAG= SAMPLESTAG=
HASLITE= HASLITE=
SIGN= SIGN=
MODULAR=
################################################################################ ################################################################################
# F U N C T I O N S # F U N C T I O N S
################################################################################ ################################################################################
@ -164,60 +165,6 @@ usage()
set -e set -e
set -u set -u
#
# Include Samples
#
if [ -n "$SAMPLES" ]; then
case $SAMPLES in
Y*|y*)
;;
N*|n*)
SAMPLES=
;;
*)
echo " ERROR: Invalid value ($SAMPLES) for SAMPLES" >&2
exit 2
;;
esac
else
SAMPLES=Yes
fi
#
# Include configfiles
#
if [ -n "$CONFIGFILES" ]; then
case $CONFIGFILES in
Y*|y*)
;;
N*|n*)
CONFIGFILES=
;;
*)
echo " ERROR: Invalid value ($CONFIGFILES) for CONFIGFILES" >&2
exit 2
;;
esac
else
CONFIGFILES=Yes
fi
#
# Include macros
#
if [ -n "$MACROS" ]; then
case $MACROS in
Y*|y*)
;;
N*|n*)
MACROS=
;;
*)
echo " ERROR: Invalid value ($MACROS) for MACROS" >&2
exit 2
;;
esac
else
MACROS=Yes
fi
done= done=
@ -321,6 +268,7 @@ case $VERSION in
XMLPROJ="docs-3.3" XMLPROJ="docs-3.3"
SAMPLESTAG="trunk/Samples" SAMPLESTAG="trunk/Samples"
HASLITE=Yes HASLITE=Yes
MODULAR=Yes
;; ;;
*) *)
echo "Unsupported Version: $VERSION" echo "Unsupported Version: $VERSION"
@ -328,6 +276,60 @@ case $VERSION in
;; ;;
esac esac
if [ -n "$MODULAR" ]; then
#
# Include Samples
#
case ${SAMPLES:=Yes} in
Y*|y*)
;;
N*|n*)
SAMPLES=
;;
*)
echo " ERROR: Invalid value ($SAMPLES) for SAMPLES" >&2
exit 2
;;
esac
#
# Include configfiles
#
case ${CONFIGFILES:=Yes} in
Y*|y*)
;;
N*|n*)
CONFIGFILES=
;;
*)
echo " ERROR: Invalid value ($CONFIGFILES) for CONFIGFILES" >&2
exit 2
;;
esac
#
# Include macros
#
case ${MACROS:=Yes} in
Y*|y*)
;;
N*|n*)
MACROS=
;;
*)
echo " ERROR: Invalid value ($MACROS) for MACROS" >&2
exit 2
;;
esac
[ -n "${XLIBS:=}" ] || true
[ -n "${XCLIBS:=}" ] || true
else
XLIBS=
XCLIBS=
SAMPLES=Yes
CONFIGFILES=Yes
MACROS=Yes
fi
[ -d $DIR ] || { echo "Directory $DIR does not exist or is unaccessible" ; exit 2 ; } [ -d $DIR ] || { echo "Directory $DIR does not exist or is unaccessible" ; exit 2 ; }
progress_message "Distribution directory is $DIR" progress_message "Distribution directory is $DIR"
@ -389,6 +391,7 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
progress_message "Exporting $LITESVNBRANCH from SVN..." progress_message "Exporting $LITESVNBRANCH from SVN..."
do_or_die "svn export --non-interactive --force https://svn.sourceforge.net/svnroot/shorewall/$LITESVNBRANCH $SHOREWALLLITEDIR >> $LOGFILE 2>&1" do_or_die "svn export --non-interactive --force https://svn.sourceforge.net/svnroot/shorewall/$LITESVNBRANCH $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
do_or_die "cp $SHOREWALLDIR/functions $SHOREWALLDIR/modules $SHOREWALLDIR/xmodules $SHOREWALLLITEDIR >> $LOGFILE 2>&1" do_or_die "cp $SHOREWALLDIR/functions $SHOREWALLDIR/modules $SHOREWALLDIR/xmodules $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
[ -n "$MODULAR" ] && do_or_die "cp $SHOREWALLDIR/lib.* $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
fi fi
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"
@ -448,7 +451,7 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
fi fi
if [ -n "$HASLITE" ]; then if [ -n "$HASLITE" ]; then
progress_message "Creating $DIR/$LITETARBALL..." progress_message "Creating $DIR/$LITETARBALL..."
do_or_die "cp $SHOREWALLDIR/lib.* $SHOREWALLLITEDIR >> $LOGFILE 2>&1" [ -n "$MODULAR" ] && do_or_die "cp $SHOREWALLDIR/lib.* $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
do_or_die "tar -zcvf $LITETARBALL $SHOREWALLLITEDIR >> $LOGFILE 2>&1" do_or_die "tar -zcvf $LITETARBALL $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
do_or_die "tar -jcvf shorewall-lite-${VERSION%-*}.tar.bz2 $SHOREWALLLITEDIR >> $LOGFILE 2>&1" do_or_die "tar -jcvf shorewall-lite-${VERSION%-*}.tar.bz2 $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
if [ -n "$SIGN" ]; then if [ -n "$SIGN" ]; then