Author: af
Date: Tue Nov 29 15:46:04 2011
New Revision: 1207929
URL: http://svn.apache.org/viewvc?rev=1207929&view=rev
Log:
Fixed boostrap build breakers.
Modified:
incubator/ooo/trunk/main/bootstrap.1
incubator/ooo/trunk/main/fetch_tarballs.sh
Modified: incubator/ooo/trunk/main/bootstrap.1
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/bootstrap.1?rev=1207929&r1=1207928&r2=1207929&view=diff
==============================================================================
--- incubator/ooo/trunk/main/bootstrap.1 (original)
+++ incubator/ooo/trunk/main/bootstrap.1 Tue Nov 29 15:46:04 2011
@@ -10,18 +10,6 @@ export EXEEXT
mkdir -p "$SOLARENV/$OUTPATH/bin"
-if test "$GUI" = "WNT" -a ! -x "$SOLARENV/$OUTPATH/bin/guw$EXEEXT"; then
- echo ""
- echo "Calling $GNUMAKE in guw"
- cd "$SRC_ROOT/guw" || exit
- $GNUMAKE || exit
- echo ""
- echo "guw has been successfully made"
- cp -f "$SRC_ROOT/guw/guw$EXEEXT" "$SOLARENV/$OUTPATH/bin/guw$EXEEXT" || exit
- echo ""
- echo "guw copied to $SOLARENV/$OUTPATH/bin/guw$EXEEXT"
-fi
-
#make sure build.pl is executable
chmod +x "$SRC_ROOT/solenv/bin/build.pl"
Modified: incubator/ooo/trunk/main/fetch_tarballs.sh
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/fetch_tarballs.sh?rev=1207929&r1=1207928&r2=1207929&view=diff
==============================================================================
--- incubator/ooo/trunk/main/fetch_tarballs.sh (original)
+++ incubator/ooo/trunk/main/fetch_tarballs.sh Tue Nov 29 15:46:04 2011
@@ -48,7 +48,7 @@ fi
# Downloader method selection
fetch_bin=
-#fetch_args=
+fetch_args=
#Look for FreeBSD's fetch(1) first
if [ -x /usr/bin/fetch ]; then
@@ -58,11 +58,11 @@ if [ -x /usr/bin/fetch ]; then
break 2
else
for wg in wget /usr/bin/wget /usr/local/bin/wget /usr/sfw/bin/wget
/opt/sfw/bin/wget /opt/local/bin/wget; do
- eval "$i --version" > /dev/null 2>&1
+ eval "$wg --version" > /dev/null 2>&1
ret=$?
if [ $ret -eq 0 ]; then
fetch_bin=$wg
- fetch_args="-nv -N"
+ fetch_args="-nv -N"
echo found wget: $fetch_bin
break 2
fi
@@ -73,15 +73,15 @@ else
# eval "$i --version" > /dev/null 2>&1
# ret=$?
# if [ $ret -eq 0 ]; then
- if [ -x $i ]; then
+ if [ -x $c ]; then
fetch_bin=$c
- fetch_args="$file_date_check -O"
+ fetch_args="$file_date_check -O"
echo found curl: $fetch_bin
break 2
fi
done
fi
- if [ -z "$fetch_bin"]; then
+ if [ -z "$fetch_bin" ]; then
echo "ERROR: neither wget nor curl found!"
exit
fi
