[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bootstrap change to not require wget, for the buildbot
From: |
Paul Eggert |
Subject: |
bootstrap change to not require wget, for the buildbot |
Date: |
Sat, 26 Aug 2006 11:38:55 -0700 |
User-agent: |
Gnus/5.1008 (Gnus v5.10.8) Emacs/21.4 (gnu/linux) |
I observed the test failure due to the recent dircolors fix on
Solaris 10, so it's not just an HP-UX thing. Jim is the expert in
that area, though.
I also noticed that the buildbot was failing on ia64 hpux11.23 hpcc
32-bit and 64-bit due to a failed configure, because these platforms
lacked 'wget'. 'wget' is needed only for translations, and I think
it's better to keep going and build with zero translations if 'wget'
isn't working, so I installed the following patch to 'bootstrap':
2006-08-26 Paul Eggert <address@hidden>
* bootstrap (get_translations): Skip this if WGET_COMMAND is empty.
Fail if the first "echo" fails. Suppress diagnostics from "ls po/*.po"
since there might not be any .po files.
(WGET_COMMAND): Set to empty if wget doesn't
seem to be available. Don't export; shouldn't be needed.
--- bootstrap 23 Aug 2006 18:09:40 -0000 1.4
+++ bootstrap 26 Aug 2006 18:32:56 -0000
@@ -159,9 +159,13 @@ get_translations() {
subdir=$1
domain=$2
- echo "$0: getting translations into $subdir for $domain..."
- (cd $subdir && rm -f dummy `ls | sed -n '/\.gmo$/p; /\.po/p'`) &&
+ case $WGET_COMMAND in
+ '')
+ echo "$0: wget not available; skipping translations";;
+ ?*)
+ echo "$0: getting translations into $subdir for $domain..." &&
+ (cd $subdir && rm -f dummy `ls | sed -n '/\.gmo$/p; /\.po/p'`) &&
$WGET_COMMAND -O "$subdir/$domain.html" "$TP_URL$domain" &&
sed -n
's|.*"http://[^"]*/translation/teams/PO/\([^/"]*\)/'"$domain"'-\([^/"]*\)\.[^."]*\.po".*|\1.\2|p'
<"$subdir/$domain.html" |
@@ -181,25 +185,26 @@ get_translations() {
printf " rm -f %s/%s.po; }; } &&\n", subdir, lang
}
END { print ":" }
- ' | sh &&
- ls "$subdir"/*.po | sed 's|.*/||; s|\.po$||' >"$subdir/LINGUAS" &&
- rm "$subdir/$domain.html"
+ ' | sh;;
+ esac &&
+ ls "$subdir"/*.po 2>/dev/null |
+ sed 's|.*/||; s|\.po$||' >"$subdir/LINGUAS" &&
+ rm -f "$subdir/$domain.html"
}
case $SKIP_PO in
'')
case `wget --help` in
*'--no-cache'*)
- no_cache='--no-cache';;
+ WGET_COMMAND='wget -nv --no-cache';;
*'--cache=on/off'*)
- no_cache='--cache=off';;
+ WGET_COMMAND='wget -nv --cache=off';;
+ *'--non-verbose'*)
+ WGET_COMMAND='wget -nv';;
*)
- no_cache='';;
+ WGET_COMMAND='';;
esac
- WGET_COMMAND="wget -nv $no_cache"
- export WGET_COMMAND
-
get_translations po $package || exit
if test -d runtime-po; then
- bootstrap change to not require wget, for the buildbot,
Paul Eggert <=