PatchSet 28
Date: 2004/02/14 18:48:56
Author: guilhem
Branch: HEAD
Tag: (none)
Log:
Fixed initializers in KJC. Circular definitions of fields is now supported.
Added a patch for ant-1.6.0 to compile.
Members:
bootstrap-kaffe+ant.sh:1.5-1.6
patches/ant-kaffe-1.1.3.diff:INITIAL-1.1
patches/kjc-initializers.diff:1.1-1.2
Index: kaffe-extras/bootstrap-kaffe+ant.sh
diff -u kaffe-extras/bootstrap-kaffe+ant.sh:1.5 kaffe-extras/bootstrap-kaffe+ant.sh:1.6
--- kaffe-extras/bootstrap-kaffe+ant.sh:1.5 Fri Jan 30 08:12:46 2004
+++ kaffe-extras/bootstrap-kaffe+ant.sh Sat Feb 14 18:48:56 2004
@@ -6,7 +6,7 @@
TOPDIR=$(cd `dirname $0`; pwd)
PREFIX=$TOPDIR/install
-KAFFE=kaffe-1.1.2
+KAFFE=kaffe-1.1.3
ANT=apache-ant-1.5.4
export TOPDIR PREFIX KAFFE ANT
===
Checking out kaffe-extras/patches/ant-kaffe-1.1.3.diff
RCS: /home/cvs/kaffe/kaffe-extras/patches/ant-kaffe-1.1.3.diff,v
VERS: 1.1
***
--- /dev/null Sun Aug 4 19:57:58 2002
+++ kaffe-extras/patches/ant-kaffe-1.1.3.diff Sat Feb 14 18:48:58 2004
@@ -0,0 +1,130 @@
+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.0 +0100
apache-ant-1.6.0.new/bootstrap.sh 2004-02-14 14:04:14.0 +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 \
++