[kaffe] CVS kaffe-extras (dalibor): Fixed bootstrap
Kaffe CVS
cvs-commits at kaffe.org
Mon Aug 16 07:15:57 PDT 2004
PatchSet 42
Date: 2004/08/16 14:15:55
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Fixed bootstrap
The only reliable ant source code archive type seems to be zip, so use that.
Removed possibly broken build.sysclasspath bit from build.xml
Members:
bootstrap-kaffe+ant.sh:1.10->1.11
build.xml:1.19->1.20
Index: kaffe-extras/bootstrap-kaffe+ant.sh
diff -u kaffe-extras/bootstrap-kaffe+ant.sh:1.10 kaffe-extras/bootstrap-kaffe+ant.sh:1.11
--- kaffe-extras/bootstrap-kaffe+ant.sh:1.10 Mon Jul 19 17:03:25 2004
+++ kaffe-extras/bootstrap-kaffe+ant.sh Mon Aug 16 14:15:55 2004
@@ -21,9 +21,10 @@
wget -N http://www.kaffe.org/ftp/pub/kaffe/v1.1.x-development/$KAFFE.tar.gz
fi
-if [ ! -f $ANT-src.tar.gz ]; then
- wget -N http://www.apache.org/dist/ant/source/$ANT-src.tar.gz \
- || wget -N http://archive.apache.org/dist/ant/source/$ANT-src.tar.gz
+# Use zip archives for ant, since anything else is very unreliable on
+# ant archive site.
+if [ ! -f $ANT-src.zip ]; then
+ wget -N http://archive.apache.org/dist/ant/source/$ANT-src.zip
fi
@@ -48,7 +49,7 @@
make install
)
-tar zxf ../tarballs/$ANT-src.tar.gz
+unzip ../tarballs/$ANT-src.zip
(
set -e
Index: kaffe-extras/build.xml
diff -u kaffe-extras/build.xml:1.19 kaffe-extras/build.xml:1.20
--- kaffe-extras/build.xml:1.19 Mon Jul 19 17:03:26 2004
+++ kaffe-extras/build.xml Mon Aug 16 14:15:55 2004
@@ -182,7 +182,6 @@
<ant dir="${getopt_dir}"
antfile="gnu/getopt/buildx.xml"
target="jar">
- <property name="build.sysclasspath" value="${libapp_dir}/kjc.jar"/>
</ant>
<copy file="${getopt_dir}/build/lib/gnu.getopt.jar" todir="${libapp_dir}"/>
<touch file="${getopt_built_stamp}"/>
More information about the kaffe
mailing list