Update of /cvsroot/wisp/wisp/tools
In directory sc8-pr-cvs1:/tmp/cvs-serv31369/tools
Modified Files:
build.sh
Log Message:
cleanup of configure.in and build.sh
Index: build.sh
===================================================================
RCS file: /cvsroot/wisp/wisp/tools/build.sh,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- build.sh 7 Feb 2003 00:36:53 -0000 1.14
+++ build.sh 8 Feb 2003 11:08:21 -0000 1.15
@@ -14,50 +14,40 @@
*) echo "build.sh: I'm lost!"; exit 1 ;;
esac
-makefiles="`sed -e 's,$,/Makefile,' <<EOD
-.
-src
-src/builtin
-src/native
-doc
-doc/examples
-modules
-modules/cpu
-modules/format
-tests
-tools
-users
-users/dig
-users/pisi
-wa
-web
-debian
-EOD
-`"
+run ()
+{
+ echo "$@"
+ "$@"
+}
+
+makefiles="`sed -e '1,/@begin-Makefiles@/d' -e '/@end-Makefiles@/,$d' \
+ configure.in`"
test "$1" = "automake" &&
- exec automake --add-missing --copy --foreign $makefiles
-test -r aclocal.m4 || aclocal
-test -r src/config.h.in || autoheader
-test -r Makefile.in || automake --add-missing --copy --foreign $makefiles
-test -x configure || autoconf
+ run automake --add-missing --copy --foreign $makefiles && exit
+test -r aclocal.m4 || run aclocal
+test -r src/config.h.in || run autoheader
+test -r Makefile.in || run automake --add-missing --copy --foreign $makefiles
+test -x configure || run autoconf
test -z "$MAKE" && MAKE=make
-touch src/native/*.s # so make wouldn't want to regenerate them using
- # yet untranslated Wisp
+run touch src/native/*.s # so make wouldn't want to regenerate them
+ # using the yet-untranslated Wisp
test "$1" = "config" && exit 0
-./configure && $MAKE
+run ./configure && run $MAKE
if test "$1" = "dist"
then
- make distcheck
+ run make distcheck
tarball="`ls -tr wisp-*.tar.gz | tail -1`"
distdir="`basename "$tarball" .tar.gz`"
- rm -rf "$distdir"
- tar xzf "$tarball"
- ( cd "$distdir" ; dpkg-buildpackage -us -uc -rfakeroot )
- rm -rf "$distdir"
- lintian -v -i "`ls -tr wisp_*.dsc | tail -1`"
- lintian -v -i "`ls -tr wisp_*.deb | tail -1`"
+ run rm -rf "$distdir"
+ run tar xzf "$tarball"
+ run cd "$distdir"
+ run dpkg-buildpackage -us -uc -rfakeroot
+ run cd ..
+ run rm -rf "$distdir"
+ run lintian -v -i "`ls -tr wisp_*.dsc | tail -1`"
+ run lintian -v -i "`ls -tr wisp_*.deb | tail -1`"
fi
|
