Changeset: bcfe117e5d73 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bcfe117e5d73
Modified Files:
buildtools/conf/Mdebootstrap
de-bootstrap
Branch: default
Log Message:
(re-)added top-level `./de-bootstrap`
for now by simply iterating over all subdirectories
and doing there the same as Mdebootstrap used to do before
diffs (80 lines):
diff -r 20e2731911bf -r bcfe117e5d73 buildtools/conf/Mdebootstrap
--- a/buildtools/conf/Mdebootstrap Sun Jan 09 12:06:34 2011 +0100
+++ b/buildtools/conf/Mdebootstrap Sun Jan 09 14:56:38 2011 +0100
@@ -57,9 +57,25 @@
fi
}
-what=""
-if [ -f CVS/Repository ]; then
- # first, try the CVS repository name to guess the value for $what
+cvs=""
+whats=""
+if [ -d .hg ]; then
+ # top-level Mecurial (HG) directory;
+ # hence we need to loop over all qualifying subdirectories
+ for i in */ ; do
+ if [ -f $i/CVS/Repository ]; then
+ what="`cat $i/CVS/Repository | tr -d '\r'`"
+ what="`basename $what | tr -d '\r'`"
+ whats="$whats $what"
+ cvs="$cvs $what"
+ else
+ what="${i%/}"
+ whats="$whats $what"
+ fi
+ done
+ what=""
+elif [ -f CVS/Repository ]; then
+ # then, try the CVS repository name to guess the value for $whats
what="`cat CVS/Repository | tr -d '\r'`"
what="`basename $what | tr -d '\r'`"
elif [ -f autogen/autogen.py -a -f mel/mel.mx -a -f Mx/Mx.h -a -f
burg/burs.c ]; then
@@ -72,12 +88,22 @@
what="`pwd`"
what="`basename $what | tr -d '\r'`"
fi
+if [ "$whats" = "" -a "$what" != "" ]; then
+ whats="$what"
+fi
-if [ "$what" = "buildtools" ] ; then
- RM -rf
{,*/}{autom4te.cache,build,configure,depcomp,INSTALL,install-sh,missing,*_config.h.in,aclocal.m4,Makefile.in}
config.guess config.sub ltmain.sh `find .[^.]* [^_]* -name \*.class -o -name
\*.orig -o -name \*.rej -o -name .cache -o -name .incs.\* -o -name \*.pyc -o
-name \*~ -o -name .\*~ -o -name .#\* -o -name \*.bak | grep -v
'burg/Makefile.orig$'` ./install.lst ./doc.lst */*.obj
-else
- RM -rf autom4*.cache `find .[^.]* [^_]* -name Makefile.\* | egrep -v
'(\.(|ag|standalone|rules|bsd|svr4|sun4|PL|inc|svn-base)|burg/Makefile.orig)$'
; find .[^.]* [^_]* -name \*.class -o -name \*.orig -o -name \*.rej -o -name
.cache -o -name .incs.\* -o -name \*.pyc -o -name \*~ -o -name .\*~ -o -name
.#\* -o -name \*.bak | grep -v 'burg/Makefile.orig$'` ./install.lst ./doc.lst
./acout.in ./configure.in ./aclocal.m4 ./configure ./stamp-h.in ./conf/depcomp
./conf/mkinstalldirs ./conf/stamp-h.in ./conf/config.h.in ./conf/install-sh
./conf/config.guess ./conf/config.sub ./conf/ltconfig ./conf/ltmain.sh
./conf/missing ./conf/compile ./acconfig.h ./*_config.h.in
-fi
+for what in $whats ; do
+ echo
+ echo $what
+ ( { { test -d .hg && cd "$what" ; } || test "${PWD##*/}" = "$what" ; }
&&
+ if [ "$what" = "buildtools" ] ; then
+ RM -rf
{,*/}{autom4te.cache,build,configure,depcomp,INSTALL,install-sh,missing,*_config.h.in,aclocal.m4,Makefile.in}
config.guess config.sub ltmain.sh `find .[^.]* [^_]* -name \*.class -o -name
\*.orig -o -name \*.rej -o -name .cache -o -name .incs.\* -o -name \*.pyc -o
-name \*~ -o -name .\*~ -o -name .#\* -o -name \*.bak | grep -v
'burg/Makefile.orig$'` ./install.lst ./doc.lst */*.obj
+ elif [ "$what" != "NT" ] ; then
+ RM -rf autom4*.cache `find .[^.]* [^_]* -name
Makefile.\* | egrep -v
'(\.(|ag|standalone|rules|bsd|svr4|sun4|PL|inc|svn-base)|burg/Makefile.orig)$'
; find .[^.]* [^_]* -name \*.class -o -name \*.orig -o -name \*.rej -o -name
.cache -o -name .incs.\* -o -name \*.pyc -o -name \*~ -o -name .\*~ -o -name
.#\* -o -name \*.bak | grep -v 'burg/Makefile.orig$'` ./install.lst ./doc.lst
./acout.in ./configure.in ./aclocal.m4 ./configure ./stamp-h.in ./conf/depcomp
./conf/mkinstalldirs ./conf/stamp-h.in ./conf/config.h.in ./conf/install-sh
./conf/config.guess ./conf/config.sub ./conf/ltconfig ./conf/ltmain.sh
./conf/missing ./conf/compile ./acconfig.h ./*_config.h.in
+ fi
+ )
+ echo
+done
if [ -d CVS ]; then
echo '
@@ -91,4 +117,12 @@
to check whether required files have been removed accidentally.
If so, these files can be restored by "hg revert <file>".
'
+ if [ "$cvs" ]; then
+ echo '
+It might also be a good idea to run "cvs -q diff --brief", now,
+in the following directories: "'"${cvs# }"'"
+to check whether required files have been removed accidentally.
+If so, these files can be restored by "cvs update <file>".
+'
+ fi
fi
diff -r 20e2731911bf -r bcfe117e5d73 de-bootstrap
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/de-bootstrap Sun Jan 09 14:56:38 2011 +0100
@@ -0,0 +1,3 @@
+# -*-shell-script-*-
+
+./buildtools/conf/Mdebootstrap
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
