Commit e40c8f00 authored by Per Cederqvist's avatar Per Cederqvist
Browse files

Removed old Xenofarm compatibility stuff, including the --compat

argument and the ability to give the compiler to use as an argument.
Added the --make argument.
parent 19e99ee8
...@@ -38,25 +38,20 @@ ...@@ -38,25 +38,20 @@
# lyskom-server CVS module will trigger the creation of a source # lyskom-server CVS module will trigger the creation of a source
# distribution. # distribution.
compiler=default
compat=false
cfgargs= cfgargs=
makeargs=
while [ $# -gt 0 ] while [ $# -gt 0 ]
do do
case "$1" in case "$1" in
--compat) compat=true; shift;;
--cfg) shift; cfgargs="$1"; shift;; --cfg) shift; cfgargs="$1"; shift;;
*) compiler="$1"; shift;; --make) shift; makeargs="$1"; shift;;
*) echo $0: unsupported argument $1 >&2; exit 1;;
esac esac
done done
if $compat rm -rf r
then : mkdir r
else exec > r/shlog.txt 2>&1
rm -rf r
mkdir r
exec > r/shlog.txt 2>&1
fi
VERS=`echo lyskom-server*tar.gz|sed s/lyskom-server-//|sed s/.tar.gz//` VERS=`echo lyskom-server*tar.gz|sed s/lyskom-server-//|sed s/.tar.gz//`
BASE=lyskom-server-$VERS BASE=lyskom-server-$VERS
...@@ -101,27 +96,13 @@ dotask() { ...@@ -101,27 +96,13 @@ dotask() {
pfx=`pwd`/pfx pfx=`pwd`/pfx
status=good status=good
if test $compiler = default
then
:
else
cfgargs="$cfgargs CC=$compiler"
fi
dotask 1 "unzip" "gzip -d $BASE.tar.gz" dotask 1 "unzip" "gzip -d $BASE.tar.gz"
if test $compiler = default
then :
else
echo old-style compiler spec >> r/unziplog.txt
touch r/unzip.warn
fi
dotask 1 "unpack" "tar xf $BASE.tar" dotask 1 "unpack" "tar xf $BASE.tar"
dotask 1 "cfg" "cd $BASE && ./configure -C --prefix=$pfx $cfgargs" dotask 1 "cfg" "cd $BASE && ./configure -C --prefix=$pfx $cfgargs"
dotask 0 "id-cc" "cd $BASE && make ident-cc" dotask 0 "id-cc" "cd $BASE && make ident-cc"
dotask 0 "id-tx" "cd $BASE/doc && make ident-makeinfo" dotask 0 "id-tx" "cd $BASE/doc && make ident-makeinfo"
dotask 1 "make" "cd $BASE && make" dotask 1 "make" "cd $BASE && make $makeargs"
# #
# "make check" requirements # "make check" requirements
...@@ -316,28 +297,9 @@ echo $PATH > r/path.txt ...@@ -316,28 +297,9 @@ echo $PATH > r/path.txt
makeinfo --version > r/makeinfo.txt makeinfo --version > r/makeinfo.txt
type makeinfo >> r/makeinfo.txt 2>&1 type makeinfo >> r/makeinfo.txt 2>&1
# FIXME: we should not create machineid.txt. We only do so
# since we are not sure what version of the Xenofarm client grubba is running.
if test $compiler = default
then
uname -s -r -m > r/machineid.txt
else
uname -s -r -m $compiler > r/machineid.txt
fi
uname -n >> r/machineid.txt
cp buildid.txt r/buildid.txt cp buildid.txt r/buildid.txt
# FIXME: the next two lines are only here because of the current (cd r && tar cf - *) > xenofarm_result.tar
# confusion regarding the name of the build id file. Once we have gzip -1 xenofarm_result.tar
# settled on a name, and all clients are updated, it can be removed.
cp export.stamp r/export.stamp
cp exportstamp.txt r/exportstamp.txt
if $compat
then :
else
(cd r && tar cf - *) > xenofarm_result.tar
gzip -1 xenofarm_result.tar
fi
exit 0 exit 0
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment