[kaffe] CVS kaffe-extras (dalibor): Use jikes during bootstrap, too.
Kaffe CVS
cvs-commits at kaffe.org
Mon Aug 16 14:18:44 PDT 2004
PatchSet 43
Date: 2004/08/16 21:18:41
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Use jikes during bootstrap, too.
Use jikes for bootstrap and download and build it during the bootstrap phase.
Use jikes to build targets in build.xml
Removed jikes download and build from build.xml
Total build time for kjc should be very reduced now.
Members:
ant.sh:1.1->1.2
bootstrap-kaffe+ant.sh:1.11->1.12
build.xml:1.20->1.21
Index: kaffe-extras/ant.sh
diff -u kaffe-extras/ant.sh:1.1 kaffe-extras/ant.sh:1.2
--- kaffe-extras/ant.sh:1.1 Mon Jul 21 04:03:36 2003
+++ kaffe-extras/ant.sh Mon Aug 16 21:18:41 2004
@@ -3,5 +3,5 @@
TOPDIR=$(cd `dirname $0`; pwd)
. BUILD_ENVIRONMENT
-$TOPDIR/install/bin/ant -Dbuild.compiler=kjc "$@"
+$TOPDIR/install/bin/ant -Dbuild.compiler=jikes -Djikes.class.path=$PREFIX/jre/lib/rt.jar:. "$@"
Index: kaffe-extras/bootstrap-kaffe+ant.sh
diff -u kaffe-extras/bootstrap-kaffe+ant.sh:1.11 kaffe-extras/bootstrap-kaffe+ant.sh:1.12
--- kaffe-extras/bootstrap-kaffe+ant.sh:1.11 Mon Aug 16 14:15:55 2004
+++ kaffe-extras/bootstrap-kaffe+ant.sh Mon Aug 16 21:18:41 2004
@@ -8,7 +8,9 @@
PREFIX=$TOPDIR/install
KAFFE=kaffe-1.1.4
ANT=apache-ant-1.6.1
-export TOPDIR PREFIX KAFFE ANT
+JIKESVER=1.18
+JIKES=jikes-$JIKESVER
+export TOPDIR PREFIX KAFFE ANT JIKES JIKESVER
cd $TOPDIR
@@ -27,10 +29,12 @@
wget -N http://archive.apache.org/dist/ant/source/$ANT-src.zip
fi
+if [ ! -f $JIKES.tar.bz2 ]; then
+ wget -N ftp://www-126.ibm.com/pub/jikes/$JIKESVER/$JIKES.tar.bz2
+fi
)
-
rm -rf build
mkdir build
(
@@ -38,17 +42,29 @@
cd build
+# Build jikes and install it
+tar xjvf ../tarballs/$JIKES.tar.bz2
+(
+set -e
+
+cd $JIKES
+./configure --prefix=$PREFIX
+make
+make install
+)
+
# Build kaffe and install it
tar xzvf ../tarballs/$KAFFE.tar.gz
(
set -e
cd $KAFFE
-./configure --prefix=$PREFIX
+./configure --prefix=$PREFIX --with-jikes=$PREFIX/bin/jikes
make
make install
)
+# Build ant and install it
unzip ../tarballs/$ANT-src.zip
(
set -e
@@ -58,7 +74,7 @@
JAVA_HOME=$PREFIX
JAVACMD=$JAVA_HOME/bin/java
export CLASSPATH JAVA_HOME JAVACMD KAFFELIBRARYPATH
-./build.sh -Dbuild.compiler=kjc
+./build.sh -Dbuild.compiler=jikes -Djikes.class.path=$PREFIX/jre/lib/rt.jar:.
cp -f dist/bin/ant $PREFIX/bin
cp -f dist/lib/ant.jar $PREFIX/lib
cp -f dist/lib/ant-launcher.jar $PREFIX/lib
Index: kaffe-extras/build.xml
diff -u kaffe-extras/build.xml:1.20 kaffe-extras/build.xml:1.21
--- kaffe-extras/build.xml:1.20 Mon Aug 16 14:15:55 2004
+++ kaffe-extras/build.xml Mon Aug 16 21:18:41 2004
@@ -13,7 +13,7 @@
<property name="lib_dir" location="${install_dir}/lib"/>
<property name="libapp_dir" location="${install_dir}/lib/app"/>
<property name="timestamps_dir" location="timestamps"/>
- <property name="rtjar_file" location="rt.jar"/>
+ <property name="rtjar_file" location="${install_dir}/jre/lib/rt.jar"/>
<target name="init">
<tstamp/>
@@ -24,66 +24,6 @@
<mkdir dir="${libapp_dir}"/>
</target>
- <!-- Jikes -->
-
- <property name="jikes_ver" value="jikes-1.18"/>
- <property name="jikes_dir" location="${build_dir}/${jikes_ver}"/>
- <property name="jikes_tarball" value="${jikes_ver}.tar.bz2"/>
- <property name="jikes_unpacked_stamp" location="${timestamps_dir}/jikes-unpacked.stamp"/>
- <property name="jikes_built_stamp" location="${timestamps_dir}/jikes-built.stamp"/>
-
- <target name="jikes-check" depends="init">
- <available property="jikes-download.not-required"
- file="${tarballs_dir}/${jikes_tarball}"/>
- <available property="jikes-unpack.not-required"
- file="${jikes_unpacked_stamp}"/>
- <available property="jikes-build.not-required"
- file="${jikes_built_stamp}"/>
- </target>
-
- <target name="jikes-download" depends="jikes-check"
- unless="jikes-download.not-required"
- description="download jikes" >
- <!-- FIXME: Getting files via ftp doesn't work with kaffe
- <get src="ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.bz2"
- dest="${tarballs_dir}/${jikes_tarball}"
- verbose="true"/> -->
- <exec executable="wget"
- dir="${tarballs_dir}"
- failonerror="true">
- <arg line="ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.bz2"/>
- </exec>
- </target>
-
- <target name="jikes-unpack" depends="jikes-check, jikes-download"
- unless="jikes-unpack.not-required"
- description="unpack jikes" >
- <delete dir="${jikes_dir}"/>
- <untar src="${tarballs_dir}/${jikes_tarball}"
- dest="${build_dir}"
- compression="bzip2"/>
- <chmod file="${jikes_dir}/configure" perm="+x"/>
- <touch file="${jikes_unpacked_stamp}"/>
- </target>
-
- <target name="jikes-build" depends="jikes-check, jikes-unpack"
- unless="jikes-build.not-required"
- description="compile and install jikes" >
- <exec executable="${jikes_dir}/configure"
- dir="${jikes_dir}"
- failonerror="true">
- <arg line="--prefix=${install_dir}"/>
- </exec>
- <exec executable="make"
- dir="${jikes_dir}"
- failonerror="true">
- <arg line="install"/>
- </exec>
- <touch file="${jikes_built_stamp}"/>
- </target>
-
- <target name="jikes" depends="jikes-build"/>
-
<!-- JFlex -->
<property name="jflex_ver" value="jflex-1.4"/>
@@ -179,10 +119,19 @@
<target name="getopt-build" depends="getopt-check, getopt-unpack"
unless="getopt-build.not-required"
description="compile and install getopt" >
+
<ant dir="${getopt_dir}"
antfile="gnu/getopt/buildx.xml"
target="jar">
</ant>
+
+<!--
+ <exec executable="ant.sh"
+ resolveExecutable="true"
+ failonerror="true">
+ <arg line="-buildfile ${getopt_dir}/gnu/getopt/buildx.xml" />
+ </exec>
+-->
<copy file="${getopt_dir}/build/lib/gnu.getopt.jar" todir="${libapp_dir}"/>
<touch file="${getopt_built_stamp}"/>
</target>
@@ -257,7 +206,7 @@
</copy>
</target>
- <target name="kjcsuite-build" depends="kjcsuite-check, kjcsuite-unpack, jikes, jflex, getopt"
+ <target name="kjcsuite-build" depends="kjcsuite-check, kjcsuite-unpack, jflex, getopt"
unless="kjcsuite-build.not-required"
description="compile and install kjcsuite" >
<!-- FIXME: Dies when this target is run using Kaffe -->
@@ -271,7 +220,7 @@
<!-- <env key="CLASSPATH" path="${lib_dir}/gnu.getopt.jar:${lib_dir}/JFlex.jar:${install_dir}/jre/lib/rt.jar:${lib_dir}/kjc.jar"/> -->
<env key="CLASSPATH" path="${kjcsuite_dir}/classroot:${libapp_dir}/gnu.getopt.jar:${libapp_dir}/JFlex.jar:${rtjar_file}"/>
</exec>
- <unzip src="${lib_dir}/gnu.getopt.jar"
+ <unzip src="${libapp_dir}/gnu.getopt.jar"
dest="${kjcsuite_dir}/classroot">
</unzip>
<jar destfile="${lib_dir}/kjc-rebuilt.jar"
@@ -287,7 +236,7 @@
<!-- Install target (default) -->
- <target name="install" depends="jikes, jflex, getopt, kjcsuite"/>
+ <target name="install" depends="jflex, getopt, kjcsuite"/>
<!-- Clean targets -->
More information about the kaffe
mailing list