[kaffe] CVS kaffe-extras (dalibor): Updated to ant 1.6.2. Use jikes
to bootstrap ant
Kaffe CVS
cvs-commits at kaffe.org
Wed Aug 18 10:07:19 PDT 2004
PatchSet 45
Date: 2004/08/18 16:23:27
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Updated to ant 1.6.2. Use jikes to bootstrap ant
Members:
bootstrap-kaffe+ant.sh:1.13->1.14
patches/ant-kaffe-1.1.3.diff:1.1->1.2
Index: kaffe-extras/bootstrap-kaffe+ant.sh
diff -u kaffe-extras/bootstrap-kaffe+ant.sh:1.13 kaffe-extras/bootstrap-kaffe+ant.sh:1.14
--- kaffe-extras/bootstrap-kaffe+ant.sh:1.13 Wed Aug 18 14:33:37 2004
+++ kaffe-extras/bootstrap-kaffe+ant.sh Wed Aug 18 16:23:27 2004
@@ -7,7 +7,7 @@
TOPDIR=$(cd `dirname $0`; pwd)
PREFIX=$TOPDIR/install
KAFFE=kaffe-1.1.4
-ANT=apache-ant-1.6.1
+ANT=apache-ant-1.6.2
JIKESVER=1.21
JIKES=jikes-$JIKESVER
export TOPDIR PREFIX KAFFE ANT JIKES JIKESVER
@@ -73,7 +73,9 @@
patch -p1 < ../../patches/ant-kaffe-1.1.3.diff
JAVA_HOME=$PREFIX
JAVACMD=$JAVA_HOME/bin/java
-export CLASSPATH JAVA_HOME JAVACMD KAFFELIBRARYPATH
+JAVAC=jikes
+BOOTJAVAC_OPTS="-bootclasspath $PREFIX/jre/lib/rt.jar"
+export CLASSPATH JAVA_HOME JAVACMD KAFFELIBRARYPATH JAVAC BOOTJAVAC_OPTS
./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
Index: kaffe-extras/patches/ant-kaffe-1.1.3.diff
diff -u kaffe-extras/patches/ant-kaffe-1.1.3.diff:1.1 kaffe-extras/patches/ant-kaffe-1.1.3.diff:1.2
--- kaffe-extras/patches/ant-kaffe-1.1.3.diff:1.1 Sat Feb 14 18:48:57 2004
+++ kaffe-extras/patches/ant-kaffe-1.1.3.diff Wed Aug 18 16:23:27 2004
@@ -1,121 +1,3 @@
-diff -ur apache-ant-1.6.0/bootstrap.sh apache-ant-1.6.0.new/bootstrap.sh
---- apache-ant-1.6.0/bootstrap.sh 2003-12-18 21:16:06.000000000 +0100
-+++ apache-ant-1.6.0.new/bootstrap.sh 2004-02-14 14:04:14.000000000 +0100
-@@ -115,13 +115,111 @@
-
- echo ... Compiling Ant Classes
-
--"${JAVAC}" $BOOTJAVAC_OPTS -d ${CLASSDIR} ${TOOLS}/bzip2/*.java ${TOOLS}/tar/*.java ${TOOLS}/zip/*.java \
-+"${JAVAC}" $BOOTJAVAC_OPTS -d ${CLASSDIR} ${TOOLS}/bzip2/*.java ${TOOLS}/tar/*.java ${TOOLS}/zip/*.java ${TOOLS}/mail/*.java \
- ${TOOLS}/ant/util/regexp/RegexpMatcher.java \
- ${TOOLS}/ant/util/regexp/RegexpMatcherFactory.java \
- ${TOOLS}/ant/types/*.java \
- ${TOOLS}/ant/*.java ${TOOLS}/ant/taskdefs/*.java \
- ${TOOLS}/ant/taskdefs/compilers/*.java \
-- ${TOOLS}/ant/taskdefs/condition/*.java
-+ ${TOOLS}/ant/taskdefs/condition/*.java \
-+ ${TOOLS}/ant/filters/util/ChainReaderHelper.java \
-+ ${TOOLS}/ant/filters/BaseFilterReader.java \
-+ ${TOOLS}/ant/filters/ChainableReader.java \
-+ ${TOOLS}/ant/launch/Locator.java \
-+ ${TOOLS}/ant/util/ResourceUtils.java \
-+ ${TOOLS}/ant/util/JavaEnvUtils.java \
-+ ${TOOLS}/ant/util/FileNameMapper.java \
-+ ${TOOLS}/ant/util/MergingMapper.java \
-+ ${TOOLS}/ant/util/IdentityMapper.java \
-+ ${TOOLS}/ant/util/GlobPatternMapper.java \
-+ ${TOOLS}/ant/util/SourceFileScanner.java \
-+ ${TOOLS}/ant/taskdefs/email/EmailTask.java \
-+ ${TOOLS}/ant/taskdefs/email/Mailer.java \
-+ ${TOOLS}/ant/taskdefs/email/PlainMailer.java \
-+ ${TOOLS}/ant/util/facade/ImplementationSpecificArgument.java \
-+ ${TOOLS}/ant/util/facade/FacadeTaskHelper.java \
-+ ${TOOLS}/ant/taskdefs/rmic/RmicAdapterFactory.java \
-+ ${TOOLS}/ant/taskdefs/rmic/RmicAdapter.java \
-+ ${TOOLS}/ant/taskdefs/rmic/DefaultRmicAdapter.java \
-+ ${TOOLS}/ant/taskdefs/rmic/SunRmic.java \
-+ ${TOOLS}/ant/taskdefs/rmic/KaffeRmic.java \
-+ ${TOOLS}/ant/taskdefs/rmic/WLRmic.java \
-+ ${TOOLS}/ant/util/StringUtils.java \
-+ ${TOOLS}/ant/util/TeeOutputStream.java \
-+ ${TOOLS}/ant/util/LazyFileOutputStream.java \
-+ ${TOOLS}/ant/types/selectors/SelectorContainer.java \
-+ ${TOOLS}/ant/types/selectors/modifiedselector/ModifiedSelector.java \
-+ ${TOOLS}/ant/types/selectors/BaseExtendSelector.java \
-+ ${TOOLS}/ant/types/selectors/modifiedselector/PropertiesfileCache.java \
-+ ${TOOLS}/ant/types/selectors/modifiedselector/DigestAlgorithm.java \
-+ ${TOOLS}/ant/types/selectors/modifiedselector/EqualComparator.java \
-+ ${TOOLS}/ant/util/JAXPUtils.java \
-+ ${TOOLS}/ant/types/selectors/BaseSelectorContainer.java \
-+ ${TOOLS}/ant/helper/AntXMLContext.java \
-+ ${TOOLS}/ant/helper/ProjectHelperImpl.java \
-+ ${TOOLS}/ant/types/selectors/BaseSelector.java \
-+ ${TOOLS}/ant/types/selectors/ExtendFileSelector.java \
-+ ${TOOLS}/ant/types/selectors/FileSelector.java \
-+ ${TOOLS}/ant/types/selectors/TypeSelector.java \
-+ ${TOOLS}/ant/types/selectors/SizeSelector.java \
-+ ${TOOLS}/ant/types/selectors/SelectSelector.java \
-+ ${TOOLS}/ant/types/selectors/PresentSelector.java \
-+ ${TOOLS}/ant/types/selectors/MappingSelector.java \
-+ ${TOOLS}/ant/types/selectors/OrSelector.java \
-+ ${TOOLS}/ant/types/selectors/NotSelector.java \
-+ ${TOOLS}/ant/types/selectors/NoneSelector.java \
-+ ${TOOLS}/ant/types/selectors/MajoritySelector.java \
-+ ${TOOLS}/ant/types/selectors/FilenameSelector.java \
-+ ${TOOLS}/ant/types/selectors/ExtendSelector.java \
-+ ${TOOLS}/ant/types/selectors/DifferentSelector.java \
-+ ${TOOLS}/ant/types/selectors/DepthSelector.java \
-+ ${TOOLS}/ant/types/selectors/DependSelector.java \
-+ ${TOOLS}/ant/types/selectors/DateSelector.java \
-+ ${TOOLS}/ant/types/selectors/ContainsSelector.java \
-+ ${TOOLS}/ant/types/selectors/ContainsRegexpSelector.java \
-+ ${TOOLS}/ant/util/regexp/Regexp.java \
-+ ${TOOLS}/ant/types/selectors/AndSelector.java \
-+ ${TOOLS}/ant/util/CollectionUtils.java \
-+ ${TOOLS}/ant/input/MultipleChoiceInputRequest.java \
-+ ${TOOLS}/ant/input/InputRequest.java \
-+ ${TOOLS}/ant/types/selectors/SelectorUtils.java \
-+ ${TOOLS}/ant/util/TimeoutObserver.java \
-+ ${TOOLS}/ant/taskdefs/email/Message.java \
-+ ${TOOLS}/ant/types/selectors/modifiedselector/Algorithm.java \
-+ ${TOOLS}/ant/types/selectors/modifiedselector/Cache.java \
-+ ${TOOLS}/ant/util/Watchdog.java \
-+ ${TOOLS}/ant/util/ClasspathUtils.java \
-+ ${TOOLS}/ant/filters/ClassConstants.java \
-+ ${TOOLS}/ant/filters/EscapeUnicode.java \
-+ ${TOOLS}/ant/filters/ExpandProperties.java \
-+ ${TOOLS}/ant/filters/HeadFilter.java \
-+ ${TOOLS}/ant/filters/LineContains.java \
-+ ${TOOLS}/ant/filters/LineContainsRegExp.java \
-+ ${TOOLS}/ant/filters/PrefixLines.java \
-+ ${TOOLS}/ant/filters/ReplaceTokens.java \
-+ ${TOOLS}/ant/filters/StripJavaComments.java \
-+ ${TOOLS}/ant/filters/StripLineBreaks.java \
-+ ${TOOLS}/ant/filters/StripLineComments.java \
-+ ${TOOLS}/ant/filters/TabsToSpaces.java \
-+ ${TOOLS}/ant/filters/BaseParamFilterReader.java \
-+ ${TOOLS}/ant/filters/TailFilter.java \
-+ ${TOOLS}/ant/util/Tokenizer.java \
-+ ${TOOLS}/ant/util/LineTokenizer.java \
-+ ${TOOLS}/ant/filters/TokenFilter.java \
-+ ${TOOLS}/ant/util/regexp/RegexpFactory.java \
-+ ${TOOLS}/ant/util/DateUtils.java \
-+ ${TOOLS}/ant/types/selectors/SelectorScanner.java \
-+ ${TOOLS}/ant/launch/AntMain.java \
-+ ${TOOLS}/ant/util/LoaderUtils.java \
-+ ${TOOLS}/ant/util/KeepAliveInputStream.java \
-+ ${TOOLS}/ant/input/DefaultInputHandler.java \
-+ ${TOOLS}/ant/taskdefs/email/EmailAddress.java \
-+ ${TOOLS}/ant/input/InputHandler.java \
-+ ${TOOLS}/ant/util/DOMElementWriter.java \
-+ ${TOOLS}/ant/util/FlatFileNameMapper.java \
-+ ${TOOLS}/ant/helper/ProjectHelper2.java \
-+ ${TOOLS}/ant/util/FileUtils.java \
-+ ${TOOLS}/ant/taskdefs/optional/Test.java
- ret=$?
- if [ $ret != 0 ]; then
- echo ... Failed compiling Ant classes !
-Only in apache-ant-1.6.0.new/: bootstrap.sh~
diff -ur apache-ant-1.6.0/build.sh apache-ant-1.6.0.new/build.sh
--- apache-ant-1.6.0/build.sh 2003-12-18 21:16:06.000000000 +0100
+++ apache-ant-1.6.0.new/build.sh 2004-01-29 19:29:02.000000000 +0100
@@ -124,7 +6,7 @@
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
++ /bin/sh ./bootstrap.sh -Dbuild.compiler=jikes -Djikes.class.path=$PREFIX/jre/lib/rt.jar:.
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