[kaffe] CVS kaffe-extras (dalibor): Updated to kaffe 1.1.2 and ant 1.5.4
Kaffe CVS
cvs-commits at kaffe.org
Mon Dec 1 01:40:03 PST 2003
PatchSet 22
Date: 2003/12/01 09:39:46
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Updated to kaffe 1.1.2 and ant 1.5.4
Members:
bootstrap-kaffe+ant.sh:1.2->1.3
patches/ant-kaffe-1.1.0.diff:1.1->1.2(DEAD)
patches/ant-kaffe-1.1.2.diff:INITIAL->1.1
Index: kaffe-extras/bootstrap-kaffe+ant.sh
diff -u kaffe-extras/bootstrap-kaffe+ant.sh:1.2 kaffe-extras/bootstrap-kaffe+ant.sh:1.3
--- kaffe-extras/bootstrap-kaffe+ant.sh:1.2 Mon Jul 21 04:28:45 2003
+++ kaffe-extras/bootstrap-kaffe+ant.sh Mon Dec 1 09:39:46 2003
@@ -6,8 +6,8 @@
TOPDIR=$(cd `dirname $0`; pwd)
PREFIX=$TOPDIR/install
-KAFFE=kaffe-1.1.0
-ANT=apache-ant-1.5.2
+KAFFE=kaffe-1.1.2
+ANT=apache-ant-1.5.4
export TOPDIR PREFIX KAFFE ANT
cd $TOPDIR
@@ -18,11 +18,11 @@
cd tarballs
if [ ! -f $KAFFE.tar.gz ]; then
- wget -N http://www.kaffe.org/ftp/pub/kaffe/v1.1.x-development/kaffe-1.1.0.tar.gz
+ wget -N http://www.kaffe.org/ftp/pub/kaffe/v1.1.x-development/$KAFFE.tar.gz
fi
if [ ! -f $ANT.tar.bz2 ]; then
- wget -N http://ant.apache.org/old-releases/v1.5.2/source/apache-ant-1.5.2-src.zip
+ wget -N http://www.apache.org/dist/ant/source/$ANT-src.tar.gz
fi
@@ -47,7 +47,7 @@
make install
)
-unzip ../tarballs/$ANT-src.zip
+tar zxvf ../tarballs/$ANT-src.tar.gz
(
set -e
===================================================================
Checking out kaffe-extras/patches/ant-kaffe-1.1.0.diff
RCS: /home/cvs/kaffe/kaffe-extras/patches/Attic/ant-kaffe-1.1.0.diff,v
VERS: 1.1
***************
--- kaffe-extras/patches/ant-kaffe-1.1.0.diff Mon Dec 1 09:39:48 2003
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,74 +0,0 @@
---- apache-ant-1.5.2/bootstrap.sh.jim 2003-04-06 19:22:42.000000000 -0700
-+++ apache-ant-1.5.2/bootstrap.sh 2003-04-06 19:23:31.000000000 -0700
-@@ -109,13 +109,7 @@
-
- echo ... Compiling Ant Classes
-
--"${JAVAC}" $BOOTJAVAC_OPTS -d ${CLASSDIR} ${TOOLS}/bzip2/*.java ${TOOLS}/tar/*.java ${TOOLS}/zip/*.java \
-- ${TOOLS}/ant/util/regexp/RegexpMatcher.java \
-- ${TOOLS}/ant/util/regexp/RegexpMatcherFactory.java \
-- ${TOOLS}/ant/util/*.java ${TOOLS}/ant/types/*.java \
-- ${TOOLS}/ant/*.java ${TOOLS}/ant/taskdefs/*.java \
-- ${TOOLS}/ant/taskdefs/compilers/*.java \
-- ${TOOLS}/ant/taskdefs/condition/*.java
-+"${JAVAC}" $BOOTJAVAC_OPTS -d ${CLASSDIR} `cat ../../patches/ant-kaffe-classlist.txt | sed "s,^./org/apache/tools,${TOOLS},"`
- ret=$?
- if [ $ret != 0 ]; then
- echo ... Failed compiling Ant classes !
---- apache-ant-1.5.2/build.sh.jim 2003-04-06 19:33:40.000000000 -0700
-+++ apache-ant-1.5.2/build.sh 2003-04-06 19:34:56.000000000 -0700
-@@ -13,7 +13,7 @@
- export ANT_HOME
-
- if test ! -f bootstrap/lib/ant.jar -o ! -x bootstrap/bin/ant -o ! -x bootstrap/bin/antRun ; then
-- /bin/sh ./bootstrap.sh
-+ /bin/sh ./bootstrap.sh -Dbuild.compiler=kjc
- fi
-
- if test ! -f bootstrap/lib/ant.jar -o ! -x bootstrap/bin/ant -o ! -x bootstrap/bin/antRun ; then
---- apache-ant-1.5.2/build.xml.jim 2003-04-06 19:35:01.000000000 -0700
-+++ apache-ant-1.5.2/build.xml 2003-04-06 19:56:28.000000000 -0700
-@@ -159,6 +159,10 @@
- <exclude name="${regexp.package}/Jdk14Regexp*.java"
- unless="jdk1.4+"/>
- </patternset>
-+ <patternset id="exclude.kaffe">
-+ <exclude name="${ant.package}/taskdefs/Rmic.java"/>
-+ <exclude name="${ant.package}/taskdefs/rmic/*.java"/>
-+ </patternset>
-
- <!-- classes that should be present in Sun based JVMs, but not in
- Kaffe for example -->
-@@ -341,7 +345,7 @@
- <target name="check_for_optional_packages">
- <available property="jdk1.2+" classname="java.lang.ThreadLocal"/>
- <available property="jdk1.3+" classname="java.lang.StrictMath"/>
-- <available property="jdk1.4+" classname="java.lang.CharSequence"/>
-+<!-- <available property="jdk1.4+" classname="java.lang.CharSequence"/> -->
- <available property="kaffe" classname="kaffe.util.NotImplemented"/>
- <available property="bsf.present"
- classname="com.ibm.bsf.BSFManager"
-@@ -591,6 +595,7 @@
- <patternset refid="needs.jdk1.2+"/>
- <patternset refid="needs.jdk1.3+"/>
- <patternset refid="needs.jdk1.4+"/>
-+ <patternset refid="exclude.kaffe"/>
-
- <patternset refid="needs.jakarta.regexp"/>
- <patternset refid="needs.jakarta.oro"/>
-@@ -1215,6 +1220,7 @@
- <patternset refid="needs.jdk1.2+"/>
- <patternset refid="needs.jdk1.3+"/>
- <patternset refid="needs.jdk1.4+"/>
-+ <patternset refid="exclude.kaffe"/>
-
- <patternset refid="needs.jakarta.regexp"/>
- <patternset refid="needs.jakarta.oro"/>
-@@ -1325,6 +1331,7 @@
- installed -->
- <patternset refid="needs.jdk1.2+"/>
- <patternset refid="needs.jdk1.4+"/>
-+ <patternset refid="exclude.kaffe"/>
- <patternset refid="needs.jakarta.regexp"/>
- <patternset refid="needs.jakarta.oro"/>
- <patternset refid="needs.vaj"/>
===================================================================
Checking out kaffe-extras/patches/ant-kaffe-1.1.2.diff
RCS: /home/cvs/kaffe/kaffe-extras/patches/ant-kaffe-1.1.2.diff,v
VERS: 1.1
***************
--- /dev/null Sun Aug 4 19:57:58 2002
+++ kaffe-extras/patches/ant-kaffe-1.1.2.diff Mon Dec 1 09:39:48 2003
@@ -0,0 +1,28 @@
+--- apache-ant-1.5.2/bootstrap.sh.jim 2003-04-06 19:22:42.000000000 -0700
++++ apache-ant-1.5.2/bootstrap.sh 2003-04-06 19:23:31.000000000 -0700
+@@ -109,13 +109,7 @@
+
+ echo ... Compiling Ant Classes
+
+-"${JAVAC}" $BOOTJAVAC_OPTS -d ${CLASSDIR} ${TOOLS}/bzip2/*.java ${TOOLS}/tar/*.java ${TOOLS}/zip/*.java \
+- ${TOOLS}/ant/util/regexp/RegexpMatcher.java \
+- ${TOOLS}/ant/util/regexp/RegexpMatcherFactory.java \
+- ${TOOLS}/ant/util/*.java ${TOOLS}/ant/types/*.java \
+- ${TOOLS}/ant/*.java ${TOOLS}/ant/taskdefs/*.java \
+- ${TOOLS}/ant/taskdefs/compilers/*.java \
+- ${TOOLS}/ant/taskdefs/condition/*.java
++"${JAVAC}" $BOOTJAVAC_OPTS -d ${CLASSDIR} `cat ../../patches/ant-kaffe-classlist.txt | sed "s,^./org/apache/tools,${TOOLS},"`
+ ret=$?
+ if [ $ret != 0 ]; then
+ echo ... Failed compiling Ant classes !
+--- apache-ant-1.5.2/build.sh.jim 2003-04-06 19:33:40.000000000 -0700
++++ apache-ant-1.5.2/build.sh 2003-04-06 19:34:56.000000000 -0700
+@@ -13,8 +13,8 @@
+ export ANT_HOME
+
+ if test ! -f bootstrap/lib/ant.jar -o ! -x bootstrap/bin/ant -o ! -x bootstrap/bin/antRun ; then
+- /bin/sh ./bootstrap.sh
++ /bin/sh ./bootstrap.sh -Dbuild.compiler=kjc
+ fi
+
+ if test ! -f bootstrap/lib/ant.jar -o ! -x bootstrap/bin/ant -o ! -x bootstrap/bin/antRun ; then
More information about the kaffe
mailing list