re PR libgcj/37636 (java tools are unable to find resource files)

libjava/ChangeLog:

2008-10-21  Andrew John Hughes  <gnu_andrew@member.fsf.org>

        * sources.am, Makfile.in: Regenerate.

2008-10-17  Matthias Klose  <doko@ubuntu.com>

	* configure.ac: Fix bashisms.
	* configure: Regenerate.

2008-10-15  Matthias Klose  <doko@ubuntu.com>

	* configure.ac: Disable build of gjdoc, if configured without
	--with-antlr-jar or if no antlr.jar found.
	* configure: Regenerate.

2008-10-09  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* classpath/configure.ac,
	* classpath/m4/ac_prog_antlr.m4,
	* classpath/m4/ac_prog_java.m4,
	* classpath/tools/Makefile.am:
	Ported --regen-gjdoc-parser patch and
	cantlr support from GNU Classpath.

2008-10-06  Andrew Haley  <aph@redhat.com>

	* java/lang/Thread.java (Thread): Always create the ThreadLocalMap
	when creating a thread.
	(getThreadLocals) Don't lazily create the ThreadLocalMap.

2008-09-28  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* classpath/java/lang/ThreadLocalMap.java,
	* java/lang/ThreadLocalMap$Entry.h,
	* java/lang/ThreadLocalMap.h,
	* lib/java/lang/ThreadLocalMap.class,
	* lib/java/lang/ThreadLocalMap$Entry.class:
	Add the new files for the ThreadLocal patch.

2008-09-28  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* classpath/ChangeLog,
	* classpath/java/lang/InheritableThreadLocal.java,
	* classpath/java/lang/Thread.java,
	* classpath/java/lang/ThreadLocal.java:
	Merge Daniel Frampton's ThreadLocal patch.
	* gcj/javaprims.h: Updated.
	* java/lang/Thread.h: Regenerated.
	* java/lang/Thread.java:
	Replace WeakIdentityHashMap with ThreadLocalMap.
	(getThreadLocals()): Likewise.
	* java/lang/ThreadLocal.h: Regenerated.
	* java/lang/ThreadLocal.java:
	(computeNextHash()): New method.
	(ThreadLocal()): Initialise fastHash.
	(internalGet()): Updated to match Classpath's get().
	(internalSet(Object)): Likewise for set(Object).
	(internalRemove()): Likewise for remove().
	
2008-09-25  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* classpath/configure,
	* classpath/configure.ac:
	Resynchronise with Classpath's configure.
	* classpath/examples/Makefile.in:
	Add equivalent support for building as in
	tools/Makefile.in.
	* classpath/java/nio/Buffer.java,
	* classpath/java/nio/ByteBuffer.java,
	* classpath/java/nio/ByteBufferImpl.java,
	* classpath/java/nio/CharBuffer.java,
	* classpath/java/nio/CharBufferImpl.java,
	* classpath/java/nio/CharSequenceBuffer.java,
	* classpath/java/nio/CharViewBufferImpl.java,
	* classpath/java/nio/DirectByteBufferImpl.java,
	* classpath/java/nio/DoubleBuffer.java,
	* classpath/java/nio/DoubleBufferImpl.java,
	* classpath/java/nio/DoubleViewBufferImpl.java,
	* classpath/java/nio/FloatBuffer.java,
	* classpath/java/nio/FloatBufferImpl.java,
	* classpath/java/nio/FloatViewBufferImpl.java,
	* classpath/java/nio/IntBuffer.java,
	* classpath/java/nio/IntBufferImpl.java,
	* classpath/java/nio/IntViewBufferImpl.java,
	* classpath/java/nio/LongBuffer.java,
	* classpath/java/nio/LongBufferImpl.java,
	* classpath/java/nio/LongViewBufferImpl.java,
	* classpath/java/nio/MappedByteBuffer.java,
	* classpath/java/nio/MappedByteBufferImpl.java,
	* classpath/java/nio/ShortBuffer.java,
	* classpath/java/nio/ShortBufferImpl.java,
	* classpath/java/nio/ShortViewBufferImpl.java:
	Replace use of gnu.classpath.Pointer with gnu.gcj.RawData,
	and fix some formatting issues.
	* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.java,
	* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.smap,
	* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java,
	* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.smap,
	* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java,
	* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.txt:
	Regenerated (later version of antlr).
	* java/nio/Buffer.h: Regenerated.
	* java/nio/Buffer.java: Ported changes from Classpath.
	* java/nio/ByteBuffer.h,
	* java/nio/CharBuffer.h: Regenerated.
	* java/nio/DirectByteBufferImpl.java: Ported changes from
	Classpath.
	* java/nio/DoubleBuffer.h,
	* java/nio/FloatBuffer.h,
	* java/nio/IntBuffer.h,
	* java/nio/LongBuffer.h,
	* java/nio/MappedByteBuffer.h,
	* java/nio/MappedByteBufferImpl.h: Regenerated.
	* java/nio/MappedByteBufferImpl.java: Ported changes from
	Classpath.
	* java/nio/ShortBuffer.h: Regenerated.

2008-09-24  Matthias Klose  <doko@ubuntu.com>

	* configure.ac: Search for antlr.jar, if not configured.
	* configure: Regenerate.

2008-09-24  Matthias Klose  <doko@ubuntu.com>

	* Makefile.am: Build a gjdoc binary, if enabled.
	* configure.ac: Add options --disable-gjdoc, --with-antlr-jar=file.
	* Makefile.in, */Makefile.in, configure: Regenerate.

2008-09-22  Andrew Haley  <aph@redhat.com>

	* java/lang/String.java (toString(char[], int, int)): New method.

2008-09-14  Matthias Klose  <doko@ubuntu.com>

	Import GNU Classpath (libgcj-import-20080914).

	* Regenerate class and header files.
	* Regenerate auto* files.
	* configure.ac: Don't pass --disable-gjdoc to classpath.
	* sources.am: Regenerated.
	* HACKING: Mention to build gjdoc in maintainer builds.
	* gnu/classpath/Configuration.java: Update classpath version.
	* gcj/javaprims.h: Update.

2008-09-08  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* Makefile.am: Replace natStringBuffer.cc
	and natStringBuilder.cc with natAbstractStringBuffer.cc.
	* Makefile.in: Regenerated.
	* java/lang/AbstractStringBuffer.java:
	(append(int)): Made native.
	(regionMatches(int,String)): Likewise.
	* java/lang/StringBuffer.h: Regenerated.
	* java/lang/StringBuffer.java: Remerged with GNU Classpath.
	* java/lang/StringBuilder.h: Regenerated.
	* java/lang/StringBuilder.java: Remerged with GNU Classpath.
	* java/lang/natAbstractStringBuffer.cc: Provide common
	native methods for StringBuffer and StringBuilder.
	* java/lang/natStringBuffer.cc,
	* java/lang/natStringBuilder.cc: Removed.

2008-09-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* Makefile.in,
	* classpath/configure: Regenerated.
	* gnu/gcj/util/natDebug.cc,
	* gnu/gcj/xlib/natColormap.cc,
	* gnu/gcj/xlib/natDisplay.cc,
	* gnu/gcj/xlib/natDrawable.cc,
	* gnu/gcj/xlib/natFont.cc,
	* gnu/gcj/xlib/natWMSizeHints.cc,
	* gnu/gcj/xlib/natWindow.cc,
	* gnu/gcj/xlib/natXImage.cc:
	Add :: prefix to namespaces.
	* java/io/CharArrayWriter.h,
	* java/lang/StringBuffer.h:
	Regenerated using patched gjavah.
	* java/lang/natStringBuffer.cc:
	Fix naming of append(jint).
	* java/sql/Timestamp.h: Regenerated
	using patched gjavah.
	* jni.cc: Rename p to functions
	to match change in GNU Classpath.
	* scripts/makemake.tcl: Switch
	gnu.java.math to BC compilation.
	* sources.am: Regenerated.

2008-08-21  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
	* Makefile.in: Updated location of Configuration.java.
	* classpath/lib/gnu/java/locale/LocaleData.class: Regenerated.

2008-08-18  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
	* Makefile.in: Updated with new Java files.
	* classpath/configure: Regenerated.
	* classpath/tools/Makefile.am: Add missing
	use of GJDOC_EX so --disable-gjdoc works.
	* classpath/tools/Makefile.in: Regenerated.

2008-08-15  Matthias Klose  <doko@ubuntu.com>

	Import GNU Classpath (libgcj-import-20080811).

	* Regenerate class and header files.
	* Regenerate auto* files.
	* configure.ac: Don't pass --with-fastjar to classpath, substitute new
	dummy value in classpath/gnu/classpath/Configuration.java.in, pass
	--disable-gjdoc to classpath.
	* scripts/makemake.tcl:
	* sources.am: Regenerated.
	* java/lang/AbstractStringBuffer.java, gnu/java/lang/VMCPStringBuilder.java:
	New, copied from classpath, use System instead of VMSystem.
	* java/lang/StringBuffer.java: Merge from classpath.
	* java/lang/ClassLoader.java: Merge from classpath.
	* gcj/javaprims.h: Update class definitions,
	remove _Jv_jobjectRefType, jobjectRefType definitions.

libjava/classpath/ChangeLog.gcj:

2008-10-21  Matthias Klose  <doko@ubuntu.com>

        * classpath/tools/gnu/classpath/tools/gjdoc/expr/Java*: Move from ...
        * classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/ ... here.
        * Update .class files.
        
2008-10-21  Andrew John Hughes  <gnu_andrew@member.fsf.org>

        * tools/Makefile.am:
        Always generate parser in the srcdir.

2008-10-21  Matthias Klose  <doko@ubuntu.com>

        * doc/Makefile.am (MAINTAINERCLEANFILES): Add gjdoc.1.
        * doc/Makefile.in: Regenerate.

2008-10-20  Matthias Klose  <doko@ubuntu.com>

	* configure.ac: Don't check for working java, if not configured
        with --enable-java-maintainer-mode.
	* configure: Regenerate.

2008-10-19  Matthias Klose  <doko@ubuntu.com>

	* m4/ac_prog_java.m4: Revert previous change.
	* m4/ac_prog_javac.m4: Apply it here.
	* configure: Regenerate.

2008-10-19  Matthias Klose  <doko@ubuntu.com>

	* m4/ac_prog_javac.m4: Don't check for working javac, if not configured
	with --enable-java-maintainer-mode.
	* configure: Regenerate.
	* Makefile.in, */Makefile.in: Regenerate.

2008-09-30  Matthias Klose  <doko@ubuntu.com>

	* m4/ac_prog_antlr.m4: Check for cantlr binary as well.

2008-09-29  Matthias Klose  <doko@ubuntu.com>

	* m4/ac_prog_antlr.m4: Check for antlr binary as well.

2008-09-28  Matthias Klose  <doko@ubuntu.com>

	* PR libgcj/37636. Revert:
	2008-02-20  Matthias Klose  <doko@ubuntu.com>

	* tools/Makefile.am ($(TOOLS_ZIP)): Revert part of previous change,
	Do copy resource files in JAVA_MAINTAINER_MODE only.
	* tools/Makefile.in: Regenerate.

2008-09-14  Matthias Klose  <doko@ubuntu.com>

	* m4/ac_prog_javac_works.m4, m4/ac_prog_javac.m4, m4/acinclude.m4:
	Revert local changes.
	* m4/ac_prog_antlr.m4: Check for an runantlr binary.
	* tools/Makefile.am, lib/Makefile.am: Revert local changes (JCOMPILER).
	* tools/Makefile.am: Remove USE_JAVAC_FLAGS, pass ANTLR_JAR in
	GLIBJ_CLASSPATH.

2008-09-14  Matthias Klose  <doko@ubuntu.com>

	Revert:
	Daniel Frampton  <zyridium at zyridium.net>

	* AUTHORS: Added.
	* java/lang/InheritableThreadLocal.java,
	* java/lang/Thread.java,
	* java/lang/ThreadLocal.java:
	Modified to use java.lang.ThreadLocalMap.
	* java/lang/ThreadLocalMap.java:
	New cheaper ThreadLocal-specific WeakHashMap.

2008-08-15  Matthias Klose  <doko@ubuntu.com>

	* m4/acinclude.m4 (CLASSPATH_JAVAC_MEM_CHECK): Remove unknown
	args for javac.

libjava/classpath/ChangeLog:

2008-10-20  Andrew John Hughes  <gnu_andrew@member.fsf.org>

        * m4/ac_prog_antlr.m4:
        Remove redundant checks.
        * tools/Makefile.am:
        Use gjdoc_gendir when calling antlr.

2008-10-15  Andrew John Hughes  <gnu_andrew@member.fsf.org>

        * configure.ac:
        Remove superfluous AC_PROG_JAVA call.

2008-10-06  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* m4/ac_prog_antlr:
	Check for cantlr as well.
	* tools/Makefile.am:
	Only build GJDoc parser when both
	CREATE_GJDOC and CREATE_GJDOC_PARSER
	are on.
	
2008-10-02  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* configure.ac:
	Add regen-gjdoc-parser option,
	and separate antlr tests.
	* m4/ac_prog_antlr.m4:
	Turn single test into AC_LIB_ANTLR
	and AC_PROG_ANTLR.
	* m4/ac_prog_java.m4:
	Quote tests.
	* tools/Makefile.am:
	Support CREATE_GJDOC_PARSER option.

2008-09-14  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* examples/Makefile.am:
        Check lib directly as well as glibj.zip
        for boot classes.
	* m4/acinclude.m4:
        Only require the class files to be built
        to allow the tools and examples to be built,
        not the installation of glibj.zip.
	* tools/Makefile.am:
	Check lib directly as well as glibj.zip
	for boot classes.

2008-09-13  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* examples/Makefile.am,
	* lib/Makefile.am:
	Add GCJ rules.
	* m4/ac_prog_javac.m4:
	Check whether JAVAC is gcj.
	* m4/ac_prog_javac_works.m4:
	Add GCJ rules.
	* m4/acinclude.m4:
	Don't bother checking for -J
	if using GCJ.
	* tools/Makefile.am:
	Add GCJ rules.

2007-08-23  Daniel Frampton  <zyridium@zyridium.net>

	* AUTHORS: Added.
	* java/lang/InheritableThreadLocal.java,
	* java/lang/Thread.java,
	* java/lang/ThreadLocal.java:
	Modified to use java.lang.ThreadLocalMap.
	* java/lang/ThreadLocalMap.java:
	New cheaper ThreadLocal-specific WeakHashMap.

2008-02-07  Ian Rogers  <ian.rogers@manchester.ac.uk>

	* java/util/zip/ZipEntry.java:
	Use byte fields instead of integer fields,
	store the time as well as the DOS time and
	don't retain a global Calendar instance.
	(setDOSTime(int)): Set KNOWN_DOSTIME instead
	of KNOWN_TIME, and unset KNOWN_TIME.
	(getDOSTime()): Compute DOS time from UNIX time
	only when needed.
	(clone()): Provide cloning via the ZipEntry constructor
	where possible.
	(setTime(long)): Don't compute DOS time at this point.
	(getCalendar()): Removed.
	
2008-09-09  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* tools/gnu/classpath/tools/getopt/Parser.java:
	(setHeader(String)): Make synchronized.
	(setFooter(String)): Likewise.
	* tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java,
	(reset()): Make synchronized.
	(name(Class)): Likewise.
	
2008-09-04  Robert Schuster  <robertschuster@fsfe.org>

	* gnu/java/nio/charset/ByteDecodeLoopHelper:
	(arrayDecodeLoop): Added new break label, escape to that label.
	* gnu/java/nio/charset/ByteEncodeLoopHelper:
	(arrayDecodeLoop): Added new break label, escape to that label.

2008-09-04  Robert Schuster  <robertschuster@fsfe.org>

	* java/text/DecimalFormat.java:
	(scanFix): Use 'i + 1' when looking at following character.
	(scanNegativePattern): Dito.

2008-09-02  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* tools/gnu/classpath/tools/javah/ClassWrapper.java:
	(makeVtable()): Populate methodNameMap.
	(printMethods(CniPrintStream)): Always use pre-populated
	methodNameMap for bridge targets.

2008-09-01  Mario Torre  <neugens@aicas.com>

	* gnu/java/awt/peer/x/XImage.java (XImageProducer): remove @Override
	annotation to allow compilation on javac < 1.6 and ecj < 3.4.

2008-09-01  Mario Torre  <neugens@aicas.com>

	* gnu/java/awt/peer/x/XGraphicsDevice.java (getDisplay): fix to support
	new Escher API.
	* gnu/java/awt/peer/x/XImage.java (getSource): method implemented.
	* gnu/java/awt/peer/x/XImage.java (XImageProducer): implement ImageProducer
	for getSource.
	 
2008-09-01  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* gnu/java/util/regex/BacktrackStack.java,
	* gnu/java/util/regex/CharIndexed.java,
	* gnu/java/util/regex/CharIndexedCharArray.java,
	* gnu/java/util/regex/CharIndexedCharSequence.java,
	* gnu/java/util/regex/CharIndexedInputStream.java,
	* gnu/java/util/regex/CharIndexedString.java,
	* gnu/java/util/regex/CharIndexedStringBuffer.java,
	* gnu/java/util/regex/RE.java,
	* gnu/java/util/regex/REException.java,
	* gnu/java/util/regex/REFilterInputStream.java,
	* gnu/java/util/regex/REMatch.java,
	* gnu/java/util/regex/REMatchEnumeration.java,
	* gnu/java/util/regex/RESyntax.java,
	* gnu/java/util/regex/REToken.java,
	* gnu/java/util/regex/RETokenAny.java,
	* gnu/java/util/regex/RETokenBackRef.java,
	* gnu/java/util/regex/RETokenChar.java,
	* gnu/java/util/regex/RETokenEnd.java,
	* gnu/java/util/regex/RETokenEndOfPreviousMatch.java,
	* gnu/java/util/regex/RETokenEndSub.java,
	* gnu/java/util/regex/RETokenIndependent.java,
	* gnu/java/util/regex/RETokenLookAhead.java,
	* gnu/java/util/regex/RETokenLookBehind.java,
	* gnu/java/util/regex/RETokenNamedProperty.java,
	* gnu/java/util/regex/RETokenOneOf.java,
	* gnu/java/util/regex/RETokenPOSIX.java,
	* gnu/java/util/regex/RETokenRange.java,
	* gnu/java/util/regex/RETokenRepeated.java,
	* gnu/java/util/regex/RETokenStart.java,
	* gnu/java/util/regex/RETokenWordBoundary.java,
	* gnu/java/util/regex/UncheckedRE.java:
	Fix indentation.

2008-09-01  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* gnu/java/util/regex/RETokenStart.java:
	(getMaximumLength()): Add Override annotation.
	(matchThis(CharIndexed, REMatch)): Likewise.
	(returnsFixedLengthMatches()): Renamed from
	returnsFixedLengthmatches and added Override
	annotation.
	(findFixedLengthMatches(CharIndexed,REMatch,int)):
	Add Override annotation.
	(dump(CPStringBuilder)): Likewise.
	* gnu/javax/print/ipp/IppRequest.java:
	(RequestWriter.writeOperationAttributes(AttributeSet)):
	Throw exception, don't just create and drop it.
	* javax/management/MBeanServerPermission.java:
	(MBeanServerPermissionCollection.add(Permission)): Compare
	against individual Strings not the entire array, and
	store the result of replace.
	* javax/swing/text/html/StyleSheet.java:
	(setBaseFontSize(size)): Store result of trim().

2008-09-01  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* javax/tools/FileObject.java:
	(openReader(boolean)): Document new parameter.
	
2008-03-27  Michael Franz  <mvfranz@gmail.com>

	PR classpath/35690:
	* javax/tools/FileObject.java:
	(toUri()): Fix case from toURI.
	(openReader(boolean)): Add missing boolean argument.
	
2008-08-26  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	PR classpath/35487:
	* gnu/javax/management/Server.java:
	(beans): Change to ConcurrentHashMap.
	(defaultDomain): Make final.
	(outer): Likewise.
	(LazyListenersHolder): Added to wrap
	listeners, also now a ConcurrentHashMap,
	providing lazy initialisation safely.
	(sequenceNumber): Documented.
	(getBean(ObjectName)): Remove redundant cast.
	(addNotificationListener(ObjectName,NotificationListener,
	NotificationFilter,Object)): Remove map initialisation
	and use holder.
	(getObjectInstance(ObjectName)): Remove redundant cast.
	(registerMBean(Object,ObjectName)): Add bean atomically.
	(removeNotificationListener(ObjectName,NotificationListener)):
	Simplified.
	(removeNotificationListener(ObjectName,NotificationListener,
	NotificationFilter,Object)): Likewise.
	(notify(ObjectName,String)): Documented.
	
2008-08-26  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* gnu/javax/management/Server.java:
	Genericised.

2008-08-26  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* gnu/javax/management/Translator.java:
	Genericised.

2008-08-26  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* javax/management/DefaultLoaderRepository.java,
	* javax/management/JMX.java,
	* javax/management/MBeanAttributeInfo.java,
	* javax/management/MBeanConstructorInfo.java,
	* javax/management/MBeanOperationInfo.java,
	* javax/management/MBeanServerDelegate.java:
	Fix warnings due to generics.

2008-08-25  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* javax/management/MBeanPermission.java,
	* javax/management/MBeanServerDelegate.java,
	* javax/management/MBeanServerFactory.java,
	* javax/management/MBeanServerInvocationHandler.java,
	* javax/management/MBeanServerPermission.java:
	Fix warnings due to use of non-generic collections.

2008-08-25  Mario Torre  <neugens@aicas.com>

	* gnu/javax/rmi/CORBA/RmiUtilities.java (readValue): check if sender is
	null to avoid NPE.
	
2008-08-22  Mario Torre  <neugens@aicas.com>
 
	* gnu/CORBA/OrbFunctional.java (set_parameters): Fix
	NullPointerException checking when param is null. 

2008-08-23  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* java/util/regex/Matcher.java:
	(reset()): Reset append position so
	we don't try and append to the end of
	the old input.
	
2008-08-22  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	PR classpath/32028:
	* m4/acinclude.m4:
	Also allow versions of GJDoc from 0.8* on, as
	CVS is 0.8.0-pre.
	
2008-08-21  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	PR classpath/32028:
	* m4/acinclude.m4:
	(CLASSPATH_WITH_GJDOC): Ensure version 0.7.9 is
	being used.
	
2008-08-20  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* tools/Makefile.am:
	Add taglets subdirectory to list of excluded
	paths when GJDoc is not compiled.
	
2008-08-19  David P Grove  <groved@us.ibm.com>

	* scripts/check_jni_methods.sh.in:
	Fix build issue on AIX by splitting generation
	of method list.
	
2008-08-18  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* native/jni/gstreamer-peer/gst_native_pipeline.c:
	(get_free_space(int)): Use #else not #elif when
	there is no condition.

2008-08-17  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	PR classpath/31895:
	* java/text/DecimalFormat.java:
	(setCurrency(Currency)): Update prefixes and
	suffixes when currency changes.
	* java/text/DecimalFormatSymbols.java:
	(DecimalFormatSymbols(Locale)): Set locale earlier
	so it can be used by setCurrency(Currency).
	(setCurrency(Currency)): Set the symbol correctly using
	the locale of the instance.
	* java/util/Currency.java:
	Throw error instead of just printing a message.

2008-08-17  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* javax/activation/ActivationDataFlavor.java:
	Suppress warnings from public API.
	(mimeType): Made final.
	(representationClass): Added generic type and
	made final.
	(normalizeMimeTypeParameter(String,String)):
	Use CPStringBuilder.
	* javax/activation/CommandInfo.java:
	(verb): Made final.
	(className): Made final.
	* javax/activation/DataHandler.java:
	(dataSource): Made final.
	* javax/activation/FileDataSource.java:
	(file): Made final.
	* javax/activation/MailcapCommandMap.java:
	Use generics on collections and CPStringBuilder
	instead of StringBuffer.
	* javax/activation/MimeType.java:
	(toString()): Use CPStringBuilder.
	(getBaseType()): Likewise.
	* javax/activation/MimeTypeParameterList.java:
	Use generics on collections and CPStringBuilder
	instead of StringBuffer.
	* javax/activation/MimeTypeParseException.java:
	(MimeTypeParseException(String,String)): Use
	CPStringBuilder.
	* javax/activation/MimetypesFileTypeMap.java:
	Use generics on collections and CPStringBuilder
	instead of StringBuffer.	
	* javax/activation/URLDataSource.java:
	(url): Made final.

2008-08-17  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* gnu/javax/activation/viewers/ImageViewer.java,
	* gnu/javax/activation/viewers/TextEditor.java,
	* gnu/javax/activation/viewers/TextViewer.java,
	* javax/activation/ActivationDataFlavor.java,
	* javax/activation/CommandInfo.java,
	* javax/activation/CommandMap.java,
	* javax/activation/CommandObject.java,
	* javax/activation/DataContentHandler.java,
	* javax/activation/DataContentHandlerFactory.java,
	* javax/activation/DataHandler.java,
	* javax/activation/DataHandlerDataSource.java,
	* javax/activation/DataSource.java,
	* javax/activation/DataSourceDataContentHandler.java,
	* javax/activation/FileDataSource.java,
	* javax/activation/FileTypeMap.java,
	* javax/activation/MailcapCommandMap.java,
	* javax/activation/MimeType.java,
	* javax/activation/MimeTypeParameterList.java,
	* javax/activation/MimeTypeParseException.java,
	* javax/activation/MimetypesFileTypeMap.java,
	* javax/activation/ObjectDataContentHandler.java,
	* javax/activation/URLDataSource.java,
	* javax/activation/UnsupportedDataTypeException.java,
	* javax/activation/package.html,
	* resource/META-INF/mailcap.default,
	* resource/META-INF/mimetypes.default:
	Import GNU JAF CVS as of 17/08/2008.

2006-04-25  Archit Shah  <ashah@redhat.com>

	* javax/activation/MimeTypeParameterList.java:
	Insert ';' separator before parameter list.

2005-06-29  Xavier Poinsard  <xpoinsard@openpricer.com>

	* javax/activation/ObjectDataContentHandler.java:
	Fixed typo.

2005-05-28  Chris Burdess  <dog@bluezoo.org>

	* javax/activation/CommandMap.java, 
	* javax/activation/MailcapCommandMap.java:
	Updated to JAF 1.1.

2004-06-09  Chris Burdess  <dog@bluezoo.org>

	* javax/activation/MailcapCommandMap.java:
	Fixed bug whereby x-java prefix was not
	attempted.

2008-08-17  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* AUTHORS: Added Laszlo.

2008-04-20  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	PR classpath/30436:
	* java/util/Scanner.java:
	Fix package to be java.util and correct
	indentation.

2007-07-25  Laszlo Andras Hernadi  <e0327023@student.tuwien.ac.at>

	PR classpath/30436:
	* java/util/Scanner.java:
	Initial implementation.

2008-08-17  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* java/util/regex/Matcher.java:
	(toMatchResult()): Implemented.
	
2008-08-13  Joshua Sumali  <jsumali@redhat.com>

	* doc/Makefile.am (gjdoc.pod): Generate gjdoc pod from cp-tools.texinfo
	instead of invoke.texi. Remove invoke.texi from EXTRA_DIST.
	* doc/invoke.texi: Removed and merged into ...
	* doc/cp-tools.texinfo: Here

2008-08-12  Robert Schuster  <robertschuster@fsfe.org>

	* native/jni/java-net/local.c
	(local_bind): Removed fprintf call, fixed access outside
	of array bounds.

From-SVN: r141271
This commit is contained in:
Matthias Klose 2008-10-21 17:55:01 +00:00
parent d9cc481a35
commit cd6d4007aa
2325 changed files with 121399 additions and 23635 deletions

View File

@ -1,3 +1,221 @@
2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* sources.am, Makfile.in: Regenerate.
2008-10-17 Matthias Klose <doko@ubuntu.com>
* configure.ac: Fix bashisms.
* configure: Regenerate.
2008-10-15 Matthias Klose <doko@ubuntu.com>
* configure.ac: Disable build of gjdoc, if configured without
--with-antlr-jar or if no antlr.jar found.
* configure: Regenerate.
2008-10-09 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/configure.ac,
* classpath/m4/ac_prog_antlr.m4,
* classpath/m4/ac_prog_java.m4,
* classpath/tools/Makefile.am:
Ported --regen-gjdoc-parser patch and
cantlr support from GNU Classpath.
2008-10-06 Andrew Haley <aph@redhat.com>
* java/lang/Thread.java (Thread): Always create the ThreadLocalMap
when creating a thread.
(getThreadLocals) Don't lazily create the ThreadLocalMap.
2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/java/lang/ThreadLocalMap.java,
* java/lang/ThreadLocalMap$Entry.h,
* java/lang/ThreadLocalMap.h,
* lib/java/lang/ThreadLocalMap.class,
* lib/java/lang/ThreadLocalMap$Entry.class:
Add the new files for the ThreadLocal patch.
2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/ChangeLog,
* classpath/java/lang/InheritableThreadLocal.java,
* classpath/java/lang/Thread.java,
* classpath/java/lang/ThreadLocal.java:
Merge Daniel Frampton's ThreadLocal patch.
* gcj/javaprims.h: Updated.
* java/lang/Thread.h: Regenerated.
* java/lang/Thread.java:
Replace WeakIdentityHashMap with ThreadLocalMap.
(getThreadLocals()): Likewise.
* java/lang/ThreadLocal.h: Regenerated.
* java/lang/ThreadLocal.java:
(computeNextHash()): New method.
(ThreadLocal()): Initialise fastHash.
(internalGet()): Updated to match Classpath's get().
(internalSet(Object)): Likewise for set(Object).
(internalRemove()): Likewise for remove().
2008-09-25 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/configure,
* classpath/configure.ac:
Resynchronise with Classpath's configure.
* classpath/examples/Makefile.in:
Add equivalent support for building as in
tools/Makefile.in.
* classpath/java/nio/Buffer.java,
* classpath/java/nio/ByteBuffer.java,
* classpath/java/nio/ByteBufferImpl.java,
* classpath/java/nio/CharBuffer.java,
* classpath/java/nio/CharBufferImpl.java,
* classpath/java/nio/CharSequenceBuffer.java,
* classpath/java/nio/CharViewBufferImpl.java,
* classpath/java/nio/DirectByteBufferImpl.java,
* classpath/java/nio/DoubleBuffer.java,
* classpath/java/nio/DoubleBufferImpl.java,
* classpath/java/nio/DoubleViewBufferImpl.java,
* classpath/java/nio/FloatBuffer.java,
* classpath/java/nio/FloatBufferImpl.java,
* classpath/java/nio/FloatViewBufferImpl.java,
* classpath/java/nio/IntBuffer.java,
* classpath/java/nio/IntBufferImpl.java,
* classpath/java/nio/IntViewBufferImpl.java,
* classpath/java/nio/LongBuffer.java,
* classpath/java/nio/LongBufferImpl.java,
* classpath/java/nio/LongViewBufferImpl.java,
* classpath/java/nio/MappedByteBuffer.java,
* classpath/java/nio/MappedByteBufferImpl.java,
* classpath/java/nio/ShortBuffer.java,
* classpath/java/nio/ShortBufferImpl.java,
* classpath/java/nio/ShortViewBufferImpl.java:
Replace use of gnu.classpath.Pointer with gnu.gcj.RawData,
and fix some formatting issues.
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.java,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.smap,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.smap,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.txt:
Regenerated (later version of antlr).
* java/nio/Buffer.h: Regenerated.
* java/nio/Buffer.java: Ported changes from Classpath.
* java/nio/ByteBuffer.h,
* java/nio/CharBuffer.h: Regenerated.
* java/nio/DirectByteBufferImpl.java: Ported changes from
Classpath.
* java/nio/DoubleBuffer.h,
* java/nio/FloatBuffer.h,
* java/nio/IntBuffer.h,
* java/nio/LongBuffer.h,
* java/nio/MappedByteBuffer.h,
* java/nio/MappedByteBufferImpl.h: Regenerated.
* java/nio/MappedByteBufferImpl.java: Ported changes from
Classpath.
* java/nio/ShortBuffer.h: Regenerated.
2008-09-24 Matthias Klose <doko@ubuntu.com>
* configure.ac: Search for antlr.jar, if not configured.
* configure: Regenerate.
2008-09-24 Matthias Klose <doko@ubuntu.com>
* Makefile.am: Build a gjdoc binary, if enabled.
* configure.ac: Add options --disable-gjdoc, --with-antlr-jar=file.
* Makefile.in, */Makefile.in, configure: Regenerate.
2008-09-22 Andrew Haley <aph@redhat.com>
* java/lang/String.java (toString(char[], int, int)): New method.
2008-09-14 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (libgcj-import-20080914).
* Regenerate class and header files.
* Regenerate auto* files.
* configure.ac: Don't pass --disable-gjdoc to classpath.
* sources.am: Regenerated.
* HACKING: Mention to build gjdoc in maintainer builds.
* gnu/classpath/Configuration.java: Update classpath version.
* gcj/javaprims.h: Update.
2008-09-08 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.am: Replace natStringBuffer.cc
and natStringBuilder.cc with natAbstractStringBuffer.cc.
* Makefile.in: Regenerated.
* java/lang/AbstractStringBuffer.java:
(append(int)): Made native.
(regionMatches(int,String)): Likewise.
* java/lang/StringBuffer.h: Regenerated.
* java/lang/StringBuffer.java: Remerged with GNU Classpath.
* java/lang/StringBuilder.h: Regenerated.
* java/lang/StringBuilder.java: Remerged with GNU Classpath.
* java/lang/natAbstractStringBuffer.cc: Provide common
native methods for StringBuffer and StringBuilder.
* java/lang/natStringBuffer.cc,
* java/lang/natStringBuilder.cc: Removed.
2008-09-04 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.in,
* classpath/configure: Regenerated.
* gnu/gcj/util/natDebug.cc,
* gnu/gcj/xlib/natColormap.cc,
* gnu/gcj/xlib/natDisplay.cc,
* gnu/gcj/xlib/natDrawable.cc,
* gnu/gcj/xlib/natFont.cc,
* gnu/gcj/xlib/natWMSizeHints.cc,
* gnu/gcj/xlib/natWindow.cc,
* gnu/gcj/xlib/natXImage.cc:
Add :: prefix to namespaces.
* java/io/CharArrayWriter.h,
* java/lang/StringBuffer.h:
Regenerated using patched gjavah.
* java/lang/natStringBuffer.cc:
Fix naming of append(jint).
* java/sql/Timestamp.h: Regenerated
using patched gjavah.
* jni.cc: Rename p to functions
to match change in GNU Classpath.
* scripts/makemake.tcl: Switch
gnu.java.math to BC compilation.
* sources.am: Regenerated.
2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.in: Updated location of Configuration.java.
* classpath/lib/gnu/java/locale/LocaleData.class: Regenerated.
2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.in: Updated with new Java files.
* classpath/configure: Regenerated.
* classpath/tools/Makefile.am: Add missing
use of GJDOC_EX so --disable-gjdoc works.
* classpath/tools/Makefile.in: Regenerated.
2008-08-15 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (libgcj-import-20080811).
* Regenerate class and header files.
* Regenerate auto* files.
* configure.ac: Don't pass --with-fastjar to classpath, substitute new
dummy value in classpath/gnu/classpath/Configuration.java.in, pass
--disable-gjdoc to classpath.
* scripts/makemake.tcl:
* sources.am: Regenerated.
* java/lang/AbstractStringBuffer.java, gnu/java/lang/VMCPStringBuilder.java:
New, copied from classpath, use System instead of VMSystem.
* java/lang/StringBuffer.java: Merge from classpath.
* java/lang/ClassLoader.java: Merge from classpath.
* gcj/javaprims.h: Update class definitions,
remove _Jv_jobjectRefType, jobjectRefType definitions.
2008-09-30 Andreas Tobler <a.tobler@schweiz.org> 2008-09-30 Andreas Tobler <a.tobler@schweiz.org>
* testsuite/lib/libjava.exp (libjava_arguments): Do not append * testsuite/lib/libjava.exp (libjava_arguments): Do not append

View File

@ -111,7 +111,8 @@ To import a new release:
| xargs -r rm -f | xargs -r rm -f
- Build, fix, till everything works. - Build, fix, till everything works.
Be sure to build all peers (--enable-java-awt=gtk,xlib,qt Be sure to build all peers (--enable-java-awt=gtk,xlib,qt
--enable-gconf-peer --enable-gstreamer-peer) --enable-gconf-peer --enable-gstreamer-peer).
Be sure to build gjdoc (--enable-gjdoc).
Be sure to update gnu/classpath/Configuration.java to reflect Be sure to update gnu/classpath/Configuration.java to reflect
the new version the new version
Possibly update the gcj/javaprims.h file with scripts/classes.pl Possibly update the gcj/javaprims.h file with scripts/classes.pl

View File

@ -82,6 +82,9 @@ if NATIVE
bin_PROGRAMS = jv-convert gij grmic grmiregistry gcj-dbtool \ bin_PROGRAMS = jv-convert gij grmic grmiregistry gcj-dbtool \
gappletviewer gjarsigner gkeytool gjar gcjh gjavah gnative2ascii \ gappletviewer gjarsigner gkeytool gjar gcjh gjavah gnative2ascii \
gorbd grmid gserialver gtnameserv gc-analyze gorbd grmid gserialver gtnameserv gc-analyze
if CREATE_GJDOC
bin_PROGRAMS += gjdoc
endif
## It is convenient to actually build and install the default database ## It is convenient to actually build and install the default database
## when gcj-dbtool is available. ## when gcj-dbtool is available.
@ -1013,6 +1016,16 @@ grmiregistry_LINK = $(GCJLINK)
grmiregistry_LDADD = -L$(here)/.libs libgcj-tools.la grmiregistry_LDADD = -L$(here)/.libs libgcj-tools.la
grmiregistry_DEPENDENCIES = libgcj-tools.la grmiregistry_DEPENDENCIES = libgcj-tools.la
## This is a dummy definition.
gjdoc_SOURCES =
gjdoc_LDFLAGS = --main=gnu.classpath.tools.gjdoc.Main \
-Djava.class.path=$(ANTLR_JAR) \
-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
gjdoc_LINK = $(GCJLINK)
## See jv_convert_LDADD.
gjdoc_LDADD = -L$(here)/.libs libgcj-tools.la
gjdoc_DEPENDENCIES = libgcj-tools.la
## ################################################################ ## ################################################################
if INTERPRETER if INTERPRETER
nat_jdwp_source_files = \ nat_jdwp_source_files = \
@ -1082,8 +1095,7 @@ java/lang/natMath.cc \
java/lang/natObject.cc \ java/lang/natObject.cc \
java/lang/natRuntime.cc \ java/lang/natRuntime.cc \
java/lang/natString.cc \ java/lang/natString.cc \
java/lang/natStringBuffer.cc \ java/lang/natAbstractStringBuffer.cc \
java/lang/natStringBuilder.cc \
java/lang/natSystem.cc \ java/lang/natSystem.cc \
java/lang/natThread.cc \ java/lang/natThread.cc \
java/lang/natThreadLocal.cc \ java/lang/natThreadLocal.cc \

View File

@ -51,20 +51,22 @@ target_triplet = @target@
@NATIVE_TRUE@ gjar$(EXEEXT) gcjh$(EXEEXT) gjavah$(EXEEXT) \ @NATIVE_TRUE@ gjar$(EXEEXT) gcjh$(EXEEXT) gjavah$(EXEEXT) \
@NATIVE_TRUE@ gnative2ascii$(EXEEXT) gorbd$(EXEEXT) \ @NATIVE_TRUE@ gnative2ascii$(EXEEXT) gorbd$(EXEEXT) \
@NATIVE_TRUE@ grmid$(EXEEXT) gserialver$(EXEEXT) \ @NATIVE_TRUE@ grmid$(EXEEXT) gserialver$(EXEEXT) \
@NATIVE_TRUE@ gtnameserv$(EXEEXT) gc-analyze$(EXEEXT) @NATIVE_TRUE@ gtnameserv$(EXEEXT) gc-analyze$(EXEEXT) \
@INSTALL_AOT_RPM_TRUE@am__append_5 = contrib/aot-compile-rpm @NATIVE_TRUE@ $(am__EXEEXT_1)
@CREATE_GJDOC_TRUE@@NATIVE_TRUE@am__append_5 = gjdoc
@INSTALL_AOT_RPM_TRUE@am__append_6 = contrib/aot-compile-rpm
@BUILD_ECJ1_TRUE@libexecsub_PROGRAMS = ecjx$(EXEEXT) @BUILD_ECJ1_TRUE@libexecsub_PROGRAMS = ecjx$(EXEEXT)
@ANONVERSCRIPT_TRUE@am__append_6 = -Wl,--version-script=$(srcdir)/libgcj.ver @ANONVERSCRIPT_TRUE@am__append_7 = -Wl,--version-script=$(srcdir)/libgcj.ver
@USING_GCC_TRUE@am__append_7 = $(WARNINGS) @USING_GCC_TRUE@am__append_8 = $(WARNINGS)
@USING_BOEHMGC_TRUE@am__append_8 = boehm.cc @USING_BOEHMGC_TRUE@am__append_9 = boehm.cc
@USING_NOGC_TRUE@am__append_9 = nogc.cc @USING_NOGC_TRUE@am__append_10 = nogc.cc
@USING_POSIX_PLATFORM_TRUE@am__append_10 = posix.cc @USING_POSIX_PLATFORM_TRUE@am__append_11 = posix.cc
@USING_WIN32_PLATFORM_TRUE@am__append_11 = win32.cc @USING_WIN32_PLATFORM_TRUE@am__append_12 = win32.cc
@USING_DARWIN_CRT_TRUE@am__append_12 = darwin.cc @USING_DARWIN_CRT_TRUE@am__append_13 = darwin.cc
@USING_POSIX_THREADS_TRUE@am__append_13 = posix-threads.cc @USING_POSIX_THREADS_TRUE@am__append_14 = posix-threads.cc
@USING_WIN32_THREADS_TRUE@am__append_14 = win32-threads.cc @USING_WIN32_THREADS_TRUE@am__append_15 = win32-threads.cc
@USING_NO_THREADS_TRUE@am__append_15 = no-threads.cc @USING_NO_THREADS_TRUE@am__append_16 = no-threads.cc
@ANONVERSCRIPT_TRUE@am__append_16 = $(srcdir)/libgcj.ver @ANONVERSCRIPT_TRUE@am__append_17 = $(srcdir)/libgcj.ver
DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \ DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \
$(srcdir)/../config.guess $(srcdir)/../config.sub \ $(srcdir)/../config.guess $(srcdir)/../config.sub \
$(srcdir)/../depcomp $(srcdir)/../install-sh \ $(srcdir)/../depcomp $(srcdir)/../install-sh \
@ -80,8 +82,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \
$(top_srcdir)/scripts/jar.in COPYING ChangeLog NEWS THANKS $(top_srcdir)/scripts/jar.in COPYING ChangeLog NEWS THANKS
@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@noinst_PROGRAMS = \ @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@noinst_PROGRAMS = \
@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@ gen-from-JIS$(EXEEXT) @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@ gen-from-JIS$(EXEEXT)
@NATIVE_TRUE@@USE_LIBGCJ_BC_TRUE@am__append_17 = libgcj_bc.la @NATIVE_TRUE@@USE_LIBGCJ_BC_TRUE@am__append_18 = libgcj_bc.la
@XLIB_AWT_TRUE@am__append_18 = $(xlib_nat_headers) @XLIB_AWT_TRUE@am__append_19 = $(xlib_nat_headers)
subdir = . subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/libltdl/acinclude.m4 \ am__aclocal_m4_deps = $(top_srcdir)/libltdl/acinclude.m4 \
@ -183,14 +185,14 @@ am__DEPENDENCIES_2 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
gnu/java/awt/java2d.lo gnu/java/awt/peer.lo \ gnu/java/awt/java2d.lo gnu/java/awt/peer.lo \
gnu/java/awt/peer/headless.lo gnu/java/awt/print.lo \ gnu/java/awt/peer/headless.lo gnu/java/awt/print.lo \
gnu/java/io.lo gnu/java/lang.lo gnu/java/lang/reflect.lo \ gnu/java/io.lo gnu/java/lang.lo gnu/java/lang/reflect.lo \
gnu/java/locale.lo gnu/java/math.lo gnu/java/net.lo \ gnu/java/locale.lo gnu/java/net.lo gnu/java/net/loader.lo \
gnu/java/net/loader.lo gnu/java/net/local.lo \ gnu/java/net/local.lo gnu/java/net/protocol/core.lo \
gnu/java/net/protocol/core.lo gnu/java/net/protocol/file.lo \ gnu/java/net/protocol/file.lo gnu/java/net/protocol/ftp.lo \
gnu/java/net/protocol/ftp.lo gnu/java/net/protocol/gcjlib.lo \ gnu/java/net/protocol/gcjlib.lo gnu/java/net/protocol/http.lo \
gnu/java/net/protocol/http.lo gnu/java/net/protocol/https.lo \ gnu/java/net/protocol/https.lo gnu/java/net/protocol/jar.lo \
gnu/java/net/protocol/jar.lo gnu/java/nio.lo \ gnu/java/nio.lo gnu/java/nio/channels.lo \
gnu/java/nio/channels.lo gnu/java/nio/charset.lo \ gnu/java/nio/charset.lo gnu/java/rmi.lo \
gnu/java/rmi.lo gnu/java/rmi/activation.lo gnu/java/rmi/dgc.lo \ gnu/java/rmi/activation.lo gnu/java/rmi/dgc.lo \
gnu/java/rmi/registry.lo gnu/java/rmi/server.lo \ gnu/java/rmi/registry.lo gnu/java/rmi/server.lo \
gnu/java/security.lo gnu/java/security/action.lo \ gnu/java/security.lo gnu/java/security/action.lo \
gnu/java/security/ber.lo gnu/java/security/der.lo \ gnu/java/security/ber.lo gnu/java/security/der.lo \
@ -204,18 +206,18 @@ am__DEPENDENCIES_2 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
gnu/java/security/x509.lo gnu/java/security/x509/ext.lo \ gnu/java/security/x509.lo gnu/java/security/x509/ext.lo \
gnu/java/text.lo gnu/java/util.lo gnu/java/util/jar.lo \ gnu/java/text.lo gnu/java/util.lo gnu/java/util/jar.lo \
gnu/java/util/prefs.lo gnu/java/util/regex.lo \ gnu/java/util/prefs.lo gnu/java/util/regex.lo \
gnu/javax/crypto.lo gnu/javax/crypto/assembly.lo \ gnu/javax/activation/viewers.lo gnu/javax/crypto.lo \
gnu/javax/crypto/cipher.lo gnu/javax/crypto/jce.lo \ gnu/javax/crypto/assembly.lo gnu/javax/crypto/cipher.lo \
gnu/javax/crypto/jce/cipher.lo gnu/javax/crypto/jce/key.lo \ gnu/javax/crypto/jce.lo gnu/javax/crypto/jce/cipher.lo \
gnu/javax/crypto/jce/keyring.lo gnu/javax/crypto/jce/mac.lo \ gnu/javax/crypto/jce/key.lo gnu/javax/crypto/jce/keyring.lo \
gnu/javax/crypto/jce/params.lo gnu/javax/crypto/jce/prng.lo \ gnu/javax/crypto/jce/mac.lo gnu/javax/crypto/jce/params.lo \
gnu/javax/crypto/jce/sig.lo gnu/javax/crypto/jce/spec.lo \ gnu/javax/crypto/jce/prng.lo gnu/javax/crypto/jce/sig.lo \
gnu/javax/crypto/key.lo gnu/javax/crypto/key/dh.lo \ gnu/javax/crypto/jce/spec.lo gnu/javax/crypto/key.lo \
gnu/javax/crypto/key/srp6.lo gnu/javax/crypto/keyring.lo \ gnu/javax/crypto/key/dh.lo gnu/javax/crypto/key/srp6.lo \
gnu/javax/crypto/kwa.lo gnu/javax/crypto/mac.lo \ gnu/javax/crypto/keyring.lo gnu/javax/crypto/kwa.lo \
gnu/javax/crypto/mode.lo gnu/javax/crypto/pad.lo \ gnu/javax/crypto/mac.lo gnu/javax/crypto/mode.lo \
gnu/javax/crypto/prng.lo gnu/javax/crypto/sasl.lo \ gnu/javax/crypto/pad.lo gnu/javax/crypto/prng.lo \
gnu/javax/crypto/sasl/anonymous.lo \ gnu/javax/crypto/sasl.lo gnu/javax/crypto/sasl/anonymous.lo \
gnu/javax/crypto/sasl/crammd5.lo \ gnu/javax/crypto/sasl/crammd5.lo \
gnu/javax/crypto/sasl/plain.lo gnu/javax/crypto/sasl/srp.lo \ gnu/javax/crypto/sasl/plain.lo gnu/javax/crypto/sasl/srp.lo \
gnu/javax/imageio.lo gnu/javax/imageio/bmp.lo \ gnu/javax/imageio.lo gnu/javax/imageio/bmp.lo \
@ -263,16 +265,17 @@ am__DEPENDENCIES_2 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
java/util/concurrent/atomic.lo java/util/concurrent/locks.lo \ java/util/concurrent/atomic.lo java/util/concurrent/locks.lo \
java/util/jar.lo java/util/logging.lo java/util/prefs.lo \ java/util/jar.lo java/util/logging.lo java/util/prefs.lo \
java/util/regex.lo java/util/spi.lo java/util/zip.lo \ java/util/regex.lo java/util/spi.lo java/util/zip.lo \
javax/accessibility.lo javax/activity.lo javax/crypto.lo \ javax/accessibility.lo javax/activation.lo javax/activity.lo \
javax/crypto/interfaces.lo javax/crypto/spec.lo \ javax/crypto.lo javax/crypto/interfaces.lo \
javax/management.lo javax/management/loading.lo \ javax/crypto/spec.lo javax/management.lo \
javax/management/openmbean.lo javax/management/remote.lo \ javax/management/loading.lo javax/management/openmbean.lo \
javax/management/remote/rmi.lo javax/naming.lo \ javax/management/remote.lo javax/management/remote/rmi.lo \
javax/naming/directory.lo javax/naming/event.lo \ javax/naming.lo javax/naming/directory.lo \
javax/naming/ldap.lo javax/naming/spi.lo javax/net.lo \ javax/naming/event.lo javax/naming/ldap.lo javax/naming/spi.lo \
javax/net/ssl.lo javax/print.lo javax/print/attribute.lo \ javax/net.lo javax/net/ssl.lo javax/print.lo \
javax/print/attribute/standard.lo javax/print/event.lo \ javax/print/attribute.lo javax/print/attribute/standard.lo \
javax/security/auth.lo javax/security/auth/callback.lo \ javax/print/event.lo javax/security/auth.lo \
javax/security/auth/callback.lo \
javax/security/auth/kerberos.lo javax/security/auth/login.lo \ javax/security/auth/kerberos.lo javax/security/auth/login.lo \
javax/security/auth/spi.lo javax/security/auth/x500.lo \ javax/security/auth/spi.lo javax/security/auth/x500.lo \
javax/security/cert.lo javax/security/sasl.lo \ javax/security/cert.lo javax/security/sasl.lo \
@ -292,7 +295,7 @@ am__DEPENDENCIES_2 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
sun/reflect/misc.lo $(am__DEPENDENCIES_1) sun/reflect/misc.lo $(am__DEPENDENCIES_1)
am__DEPENDENCIES_3 = gnu-CORBA.lo gnu-java-awt-dnd-peer-gtk.lo \ am__DEPENDENCIES_3 = gnu-CORBA.lo gnu-java-awt-dnd-peer-gtk.lo \
gnu-java-awt-peer-gtk.lo gnu-java-awt-peer-swing.lo \ gnu-java-awt-peer-gtk.lo gnu-java-awt-peer-swing.lo \
gnu-java-beans.lo gnu-java-lang-management.lo \ gnu-java-beans.lo gnu-java-lang-management.lo gnu-java-math.lo \
gnu-java-util-prefs-gconf.lo gnu-javax-management.lo \ gnu-java-util-prefs-gconf.lo gnu-javax-management.lo \
gnu-javax-rmi.lo gnu-javax-sound-midi.lo gnu-xml-aelfred2.lo \ gnu-javax-rmi.lo gnu-javax-sound-midi.lo gnu-xml-aelfred2.lo \
gnu-xml-dom.lo gnu-xml-libxmlj.lo gnu-xml-pipeline.lo \ gnu-xml-dom.lo gnu-xml-libxmlj.lo gnu-xml-pipeline.lo \
@ -352,12 +355,11 @@ am__libgcj_la_SOURCES_DIST = prims.cc jni.cc exception.cc \
java/lang/natConcreteProcess.cc java/lang/natVMDouble.cc \ java/lang/natConcreteProcess.cc java/lang/natVMDouble.cc \
java/lang/natVMFloat.cc java/lang/natMath.cc \ java/lang/natVMFloat.cc java/lang/natMath.cc \
java/lang/natObject.cc java/lang/natRuntime.cc \ java/lang/natObject.cc java/lang/natRuntime.cc \
java/lang/natString.cc java/lang/natStringBuffer.cc \ java/lang/natString.cc java/lang/natAbstractStringBuffer.cc \
java/lang/natStringBuilder.cc java/lang/natSystem.cc \ java/lang/natSystem.cc java/lang/natThread.cc \
java/lang/natThread.cc java/lang/natThreadLocal.cc \ java/lang/natThreadLocal.cc java/lang/natVMClassLoader.cc \
java/lang/natVMClassLoader.cc java/lang/natVMProcess.cc \ java/lang/natVMProcess.cc java/lang/natVMThrowable.cc \
java/lang/natVMThrowable.cc java/lang/ref/natReference.cc \ java/lang/ref/natReference.cc java/lang/reflect/natArray.cc \
java/lang/reflect/natArray.cc \
java/lang/reflect/natConstructor.cc \ java/lang/reflect/natConstructor.cc \
java/lang/reflect/natField.cc java/lang/reflect/natMethod.cc \ java/lang/reflect/natField.cc java/lang/reflect/natMethod.cc \
java/lang/reflect/natVMProxy.cc java/net/natVMInetAddress.cc \ java/lang/reflect/natVMProxy.cc java/net/natVMInetAddress.cc \
@ -417,12 +419,11 @@ am__objects_5 = $(am__objects_3) gnu/classpath/natConfiguration.lo \
java/lang/natConcreteProcess.lo java/lang/natVMDouble.lo \ java/lang/natConcreteProcess.lo java/lang/natVMDouble.lo \
java/lang/natVMFloat.lo java/lang/natMath.lo \ java/lang/natVMFloat.lo java/lang/natMath.lo \
java/lang/natObject.lo java/lang/natRuntime.lo \ java/lang/natObject.lo java/lang/natRuntime.lo \
java/lang/natString.lo java/lang/natStringBuffer.lo \ java/lang/natString.lo java/lang/natAbstractStringBuffer.lo \
java/lang/natStringBuilder.lo java/lang/natSystem.lo \ java/lang/natSystem.lo java/lang/natThread.lo \
java/lang/natThread.lo java/lang/natThreadLocal.lo \ java/lang/natThreadLocal.lo java/lang/natVMClassLoader.lo \
java/lang/natVMClassLoader.lo java/lang/natVMProcess.lo \ java/lang/natVMProcess.lo java/lang/natVMThrowable.lo \
java/lang/natVMThrowable.lo java/lang/ref/natReference.lo \ java/lang/ref/natReference.lo java/lang/reflect/natArray.lo \
java/lang/reflect/natArray.lo \
java/lang/reflect/natConstructor.lo \ java/lang/reflect/natConstructor.lo \
java/lang/reflect/natField.lo java/lang/reflect/natMethod.lo \ java/lang/reflect/natField.lo java/lang/reflect/natMethod.lo \
java/lang/reflect/natVMProxy.lo java/net/natVMInetAddress.lo \ java/lang/reflect/natVMProxy.lo java/net/natVMInetAddress.lo \
@ -457,6 +458,7 @@ am_libgij_la_OBJECTS = gij.lo
libgij_la_OBJECTS = $(am_libgij_la_OBJECTS) libgij_la_OBJECTS = $(am_libgij_la_OBJECTS)
am_libjvm_la_OBJECTS = jni-libjvm.lo am_libjvm_la_OBJECTS = jni-libjvm.lo
libjvm_la_OBJECTS = $(am_libjvm_la_OBJECTS) libjvm_la_OBJECTS = $(am_libjvm_la_OBJECTS)
@CREATE_GJDOC_TRUE@@NATIVE_TRUE@am__EXEEXT_1 = gjdoc$(EXEEXT)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
libexecsubPROGRAMS_INSTALL = $(INSTALL_PROGRAM) libexecsubPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS) $(libexecsub_PROGRAMS) $(noinst_PROGRAMS) PROGRAMS = $(bin_PROGRAMS) $(libexecsub_PROGRAMS) $(noinst_PROGRAMS)
@ -484,6 +486,8 @@ am_gjarsigner_OBJECTS =
gjarsigner_OBJECTS = $(am_gjarsigner_OBJECTS) gjarsigner_OBJECTS = $(am_gjarsigner_OBJECTS)
am_gjavah_OBJECTS = am_gjavah_OBJECTS =
gjavah_OBJECTS = $(am_gjavah_OBJECTS) gjavah_OBJECTS = $(am_gjavah_OBJECTS)
am_gjdoc_OBJECTS =
gjdoc_OBJECTS = $(am_gjdoc_OBJECTS)
am_gkeytool_OBJECTS = am_gkeytool_OBJECTS =
gkeytool_OBJECTS = $(am_gkeytool_OBJECTS) gkeytool_OBJECTS = $(am_gkeytool_OBJECTS)
am_gnative2ascii_OBJECTS = am_gnative2ascii_OBJECTS =
@ -533,10 +537,11 @@ SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) $(libgcj_tools_la_SOURCES) \
$(libjvm_la_SOURCES) $(ecjx_SOURCES) $(gappletviewer_SOURCES) \ $(libjvm_la_SOURCES) $(ecjx_SOURCES) $(gappletviewer_SOURCES) \
$(gc_analyze_SOURCES) $(gcj_dbtool_SOURCES) $(gcjh_SOURCES) \ $(gc_analyze_SOURCES) $(gcj_dbtool_SOURCES) $(gcjh_SOURCES) \
$(gen_from_JIS_SOURCES) $(gij_SOURCES) $(gjar_SOURCES) \ $(gen_from_JIS_SOURCES) $(gij_SOURCES) $(gjar_SOURCES) \
$(gjarsigner_SOURCES) $(gjavah_SOURCES) $(gkeytool_SOURCES) \ $(gjarsigner_SOURCES) $(gjavah_SOURCES) $(gjdoc_SOURCES) \
$(gnative2ascii_SOURCES) $(gorbd_SOURCES) $(grmic_SOURCES) \ $(gkeytool_SOURCES) $(gnative2ascii_SOURCES) $(gorbd_SOURCES) \
$(grmid_SOURCES) $(grmiregistry_SOURCES) $(gserialver_SOURCES) \ $(grmic_SOURCES) $(grmid_SOURCES) $(grmiregistry_SOURCES) \
$(gtnameserv_SOURCES) $(jv_convert_SOURCES) $(gserialver_SOURCES) $(gtnameserv_SOURCES) \
$(jv_convert_SOURCES)
DIST_SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) \ DIST_SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) \
$(libgcj_tools_la_SOURCES) $(am__libgcj_la_SOURCES_DIST) \ $(libgcj_tools_la_SOURCES) $(am__libgcj_la_SOURCES_DIST) \
$(EXTRA_libgcj_la_SOURCES) $(libgcj_bc_la_SOURCES) \ $(EXTRA_libgcj_la_SOURCES) $(libgcj_bc_la_SOURCES) \
@ -545,10 +550,10 @@ DIST_SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) \
$(gcj_dbtool_SOURCES) $(gcjh_SOURCES) \ $(gcj_dbtool_SOURCES) $(gcjh_SOURCES) \
$(am__gen_from_JIS_SOURCES_DIST) $(gij_SOURCES) \ $(am__gen_from_JIS_SOURCES_DIST) $(gij_SOURCES) \
$(gjar_SOURCES) $(gjarsigner_SOURCES) $(gjavah_SOURCES) \ $(gjar_SOURCES) $(gjarsigner_SOURCES) $(gjavah_SOURCES) \
$(gkeytool_SOURCES) $(gnative2ascii_SOURCES) $(gorbd_SOURCES) \ $(gjdoc_SOURCES) $(gkeytool_SOURCES) $(gnative2ascii_SOURCES) \
$(grmic_SOURCES) $(grmid_SOURCES) $(grmiregistry_SOURCES) \ $(gorbd_SOURCES) $(grmic_SOURCES) $(grmid_SOURCES) \
$(gserialver_SOURCES) $(gtnameserv_SOURCES) \ $(grmiregistry_SOURCES) $(gserialver_SOURCES) \
$(jv_convert_SOURCES) $(gtnameserv_SOURCES) $(jv_convert_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \ html-recursive info-recursive install-data-recursive \
install-exec-recursive install-info-recursive \ install-exec-recursive install-info-recursive \
@ -579,6 +584,7 @@ AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
ANONVERSCRIPT_FALSE = @ANONVERSCRIPT_FALSE@ ANONVERSCRIPT_FALSE = @ANONVERSCRIPT_FALSE@
ANONVERSCRIPT_TRUE = @ANONVERSCRIPT_TRUE@ ANONVERSCRIPT_TRUE = @ANONVERSCRIPT_TRUE@
ANTLR_JAR = @ANTLR_JAR@
AR = @AR@ AR = @AR@
AS = @AS@ AS = @AS@
AUTOCONF = @AUTOCONF@ AUTOCONF = @AUTOCONF@
@ -599,6 +605,8 @@ CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@
CPP = @CPP@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
CPU = @CPU@ CPU = @CPU@
CREATE_GJDOC_FALSE = @CREATE_GJDOC_FALSE@
CREATE_GJDOC_TRUE = @CREATE_GJDOC_TRUE@
CREATE_JAVA_HOME_FALSE = @CREATE_JAVA_HOME_FALSE@ CREATE_JAVA_HOME_FALSE = @CREATE_JAVA_HOME_FALSE@
CREATE_JAVA_HOME_TRUE = @CREATE_JAVA_HOME_TRUE@ CREATE_JAVA_HOME_TRUE = @CREATE_JAVA_HOME_TRUE@
CXX = @CXX@ CXX = @CXX@
@ -821,7 +829,7 @@ dbexecdir = @dbexecdir@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
extra_gij_ldflags = @extra_gij_ldflags@ extra_gij_ldflags = @extra_gij_ldflags@
extra_ldflags = @extra_ldflags@ extra_ldflags = @extra_ldflags@
extra_ldflags_libjava = @extra_ldflags_libjava@ $(am__append_6) extra_ldflags_libjava = @extra_ldflags_libjava@ $(am__append_7)
gcc_suffix = @gcc_suffix@ gcc_suffix = @gcc_suffix@
gcjsubdir = @gcjsubdir@ gcjsubdir = @gcjsubdir@
gxx_include_dir = @gxx_include_dir@ gxx_include_dir = @gxx_include_dir@
@ -909,7 +917,7 @@ db_name = classmap.db
db_pathtail = $(gcjsubdir)/$(db_name) db_pathtail = $(gcjsubdir)/$(db_name)
@NATIVE_TRUE@dbexec_DATA = $(db_name) @NATIVE_TRUE@dbexec_DATA = $(db_name)
bin_SCRIPTS = addr2name.awk contrib/rebuild-gcj-db contrib/aot-compile \ bin_SCRIPTS = addr2name.awk contrib/rebuild-gcj-db contrib/aot-compile \
$(am__append_5) $(am__append_6)
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated
GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) \ GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) \
$(LDFLAGS) -o $@ $(LDFLAGS) -o $@
@ -947,7 +955,7 @@ AM_GCJFLAGS = \
--encoding=UTF-8 \ --encoding=UTF-8 \
-Wno-deprecated -fbootstrap-classes -Wno-deprecated -fbootstrap-classes
AM_CFLAGS = @LIBGCJ_CFLAGS@ $(am__append_7) AM_CFLAGS = @LIBGCJ_CFLAGS@ $(am__append_8)
@SUPPRESS_LIBGCJ_BC_FALSE@LIBGCJ_BC_FLAGS = -findirect-dispatch -fno-indirect-classes @SUPPRESS_LIBGCJ_BC_FALSE@LIBGCJ_BC_FLAGS = -findirect-dispatch -fno-indirect-classes
@SUPPRESS_LIBGCJ_BC_TRUE@LIBGCJ_BC_FLAGS = @SUPPRESS_LIBGCJ_BC_TRUE@LIBGCJ_BC_FLAGS =
@BUILD_LIBGCJ_REDUCED_REFLECTION_FALSE@LIBGCJ_REDUCED_REFLECTION_FLAGS = @BUILD_LIBGCJ_REDUCED_REFLECTION_FALSE@LIBGCJ_REDUCED_REFLECTION_FLAGS =
@ -974,9 +982,9 @@ libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
@INTERPRETER_TRUE@libgcj_interpret_source_files = jvmti.cc interpret.cc @INTERPRETER_TRUE@libgcj_interpret_source_files = jvmti.cc interpret.cc
libgcj_la_SOURCES = prims.cc jni.cc exception.cc stacktrace.cc link.cc \ libgcj_la_SOURCES = prims.cc jni.cc exception.cc stacktrace.cc link.cc \
defineclass.cc verify.cc $(libgcj_interpret_source_files) \ defineclass.cc verify.cc $(libgcj_interpret_source_files) \
$(nat_source_files) $(am__append_8) $(am__append_9) \ $(nat_source_files) $(am__append_9) $(am__append_10) \
$(am__append_10) $(am__append_11) $(am__append_12) \ $(am__append_11) $(am__append_12) $(am__append_13) \
$(am__append_13) $(am__append_14) $(am__append_15) $(am__append_14) $(am__append_15) $(am__append_16)
nat_files = $(nat_source_files:.cc=.lo) nat_files = $(nat_source_files:.cc=.lo)
xlib_nat_files = $(xlib_nat_source_files:.cc=.lo) xlib_nat_files = $(xlib_nat_source_files:.cc=.lo)
@ -1000,7 +1008,7 @@ libgcj_la_LIBADD = \
libgcj_la_DEPENDENCIES = libgcj-$(gcc_version).jar java/lang/Object.lo \ libgcj_la_DEPENDENCIES = libgcj-$(gcc_version).jar java/lang/Object.lo \
java/lang/Class.lo java/process-$(PLATFORM).lo \ java/lang/Class.lo java/process-$(PLATFORM).lo \
$(all_packages_source_files:.list=.lo) $(LIBLTDL) \ $(all_packages_source_files:.list=.lo) $(LIBLTDL) \
$(libgcj_la_LIBADD) $(am__append_16) $(libgcj_la_LIBADD) $(am__append_17)
libgcj_la_LINK = $(LIBLINK) libgcj_la_LINK = $(LIBLINK)
EXTRA_libgcj_la_SOURCES = java/lang/Object.java EXTRA_libgcj_la_SOURCES = java/lang/Object.java
libgcj_tools_la_SOURCES = classpath/tools/tools.zip libgcj_tools_la_SOURCES = classpath/tools/tools.zip
@ -1239,7 +1247,7 @@ gnu/awt/xlib/XToolkit.java
gnu_awt_xlib_header_files = $(patsubst %.java,%.h,$(gnu_awt_xlib_source_files)) gnu_awt_xlib_header_files = $(patsubst %.java,%.h,$(gnu_awt_xlib_source_files))
gnu_classpath_source_files = \ gnu_classpath_source_files = \
gnu/classpath/Configuration.java \ classpath/gnu/classpath/Configuration.java \
classpath/gnu/classpath/NotImplementedException.java \ classpath/gnu/classpath/NotImplementedException.java \
classpath/gnu/classpath/Pair.java \ classpath/gnu/classpath/Pair.java \
classpath/gnu/classpath/Pointer.java \ classpath/gnu/classpath/Pointer.java \
@ -1870,10 +1878,12 @@ classpath/gnu/java/io/PlatformHelper.java
gnu_java_io_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_io_source_files))) gnu_java_io_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_io_source_files)))
gnu_java_lang_source_files = \ gnu_java_lang_source_files = \
classpath/gnu/java/lang/ArrayHelper.java \ classpath/gnu/java/lang/ArrayHelper.java \
classpath/gnu/java/lang/CPStringBuilder.java \
classpath/gnu/java/lang/CharData.java \ classpath/gnu/java/lang/CharData.java \
classpath/gnu/java/lang/ClassHelper.java \ classpath/gnu/java/lang/ClassHelper.java \
classpath/gnu/java/lang/InstrumentationImpl.java \ classpath/gnu/java/lang/InstrumentationImpl.java \
gnu/java/lang/MainThread.java \ gnu/java/lang/MainThread.java \
gnu/java/lang/VMCPStringBuilder.java \
gnu/java/lang/VMInstrumentationImpl.java gnu/java/lang/VMInstrumentationImpl.java
gnu_java_lang_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_lang_source_files))) gnu_java_lang_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_lang_source_files)))
@ -1915,9 +1925,9 @@ classpath/gnu/java/locale/LocaleHelper.java
gnu_java_locale_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_locale_source_files))) gnu_java_locale_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_locale_source_files)))
gnu_java_math_source_files = \ gnu_java_math_source_files = \
classpath/gnu/java/math/Fixed.java \ classpath/gnu/java/math/Fixed.java \
classpath/gnu/java/math/GMP.java \
classpath/gnu/java/math/MPN.java classpath/gnu/java/math/MPN.java
gnu_java_math_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_math_source_files)))
gnu_java_net_source_files = \ gnu_java_net_source_files = \
classpath/gnu/java/net/CRLFInputStream.java \ classpath/gnu/java/net/CRLFInputStream.java \
classpath/gnu/java/net/CRLFOutputStream.java \ classpath/gnu/java/net/CRLFOutputStream.java \
@ -2420,7 +2430,6 @@ classpath/gnu/java/util/jar/JarUtils.java
gnu_java_util_jar_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_util_jar_source_files))) gnu_java_util_jar_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_util_jar_source_files)))
gnu_java_util_prefs_source_files = \ gnu_java_util_prefs_source_files = \
classpath/gnu/java/util/prefs/EventDispatcher.java \
classpath/gnu/java/util/prefs/FileBasedFactory.java \ classpath/gnu/java/util/prefs/FileBasedFactory.java \
classpath/gnu/java/util/prefs/FileBasedPreferences.java \ classpath/gnu/java/util/prefs/FileBasedPreferences.java \
classpath/gnu/java/util/prefs/GConfBasedFactory.java \ classpath/gnu/java/util/prefs/GConfBasedFactory.java \
@ -2468,6 +2477,12 @@ classpath/gnu/java/util/regex/RETokenWordBoundary.java \
classpath/gnu/java/util/regex/UncheckedRE.java classpath/gnu/java/util/regex/UncheckedRE.java
gnu_java_util_regex_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_util_regex_source_files))) gnu_java_util_regex_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_util_regex_source_files)))
gnu_javax_activation_viewers_source_files = \
classpath/gnu/javax/activation/viewers/ImageViewer.java \
classpath/gnu/javax/activation/viewers/TextEditor.java \
classpath/gnu/javax/activation/viewers/TextViewer.java
gnu_javax_activation_viewers_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_activation_viewers_source_files)))
gnu_javax_crypto_source_files = \ gnu_javax_crypto_source_files = \
classpath/gnu/javax/crypto/RSACipherImpl.java classpath/gnu/javax/crypto/RSACipherImpl.java
@ -4228,6 +4243,7 @@ classpath/java/io/Writer.java
java_io_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_io_source_files))) java_io_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_io_source_files)))
java_lang_source_files = \ java_lang_source_files = \
classpath/java/lang/AbstractMethodError.java \ classpath/java/lang/AbstractMethodError.java \
java/lang/AbstractStringBuffer.java \
classpath/java/lang/Appendable.java \ classpath/java/lang/Appendable.java \
classpath/java/lang/ArithmeticException.java \ classpath/java/lang/ArithmeticException.java \
classpath/java/lang/ArrayIndexOutOfBoundsException.java \ classpath/java/lang/ArrayIndexOutOfBoundsException.java \
@ -4311,6 +4327,7 @@ java/lang/Thread.java \
classpath/java/lang/ThreadDeath.java \ classpath/java/lang/ThreadDeath.java \
classpath/java/lang/ThreadGroup.java \ classpath/java/lang/ThreadGroup.java \
java/lang/ThreadLocal.java \ java/lang/ThreadLocal.java \
classpath/java/lang/ThreadLocalMap.java \
classpath/java/lang/Throwable.java \ classpath/java/lang/Throwable.java \
classpath/java/lang/TypeNotPresentException.java \ classpath/java/lang/TypeNotPresentException.java \
classpath/java/lang/UnknownError.java \ classpath/java/lang/UnknownError.java \
@ -4949,6 +4966,7 @@ classpath/external/jsr166/java/util/Queue.java \
classpath/java/util/Random.java \ classpath/java/util/Random.java \
classpath/java/util/RandomAccess.java \ classpath/java/util/RandomAccess.java \
classpath/java/util/ResourceBundle.java \ classpath/java/util/ResourceBundle.java \
classpath/java/util/Scanner.java \
classpath/java/util/ServiceConfigurationError.java \ classpath/java/util/ServiceConfigurationError.java \
classpath/java/util/ServiceLoader.java \ classpath/java/util/ServiceLoader.java \
classpath/java/util/Set.java \ classpath/java/util/Set.java \
@ -5152,6 +5170,29 @@ classpath/javax/accessibility/AccessibleTextSequence.java \
classpath/javax/accessibility/AccessibleValue.java classpath/javax/accessibility/AccessibleValue.java
javax_accessibility_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_accessibility_source_files))) javax_accessibility_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_accessibility_source_files)))
javax_activation_source_files = \
classpath/javax/activation/ActivationDataFlavor.java \
classpath/javax/activation/CommandInfo.java \
classpath/javax/activation/CommandMap.java \
classpath/javax/activation/CommandObject.java \
classpath/javax/activation/DataContentHandler.java \
classpath/javax/activation/DataContentHandlerFactory.java \
classpath/javax/activation/DataHandler.java \
classpath/javax/activation/DataHandlerDataSource.java \
classpath/javax/activation/DataSource.java \
classpath/javax/activation/DataSourceDataContentHandler.java \
classpath/javax/activation/FileDataSource.java \
classpath/javax/activation/FileTypeMap.java \
classpath/javax/activation/MailcapCommandMap.java \
classpath/javax/activation/MimeType.java \
classpath/javax/activation/MimeTypeParameterList.java \
classpath/javax/activation/MimeTypeParseException.java \
classpath/javax/activation/MimetypesFileTypeMap.java \
classpath/javax/activation/ObjectDataContentHandler.java \
classpath/javax/activation/URLDataSource.java \
classpath/javax/activation/UnsupportedDataTypeException.java
javax_activation_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_activation_source_files)))
javax_activity_source_files = \ javax_activity_source_files = \
classpath/javax/activity/ActivityCompletedException.java \ classpath/javax/activity/ActivityCompletedException.java \
classpath/javax/activity/ActivityRequiredException.java \ classpath/javax/activity/ActivityRequiredException.java \
@ -7362,7 +7403,6 @@ all_packages_source_files = \
gnu/java/lang.list \ gnu/java/lang.list \
gnu/java/lang/reflect.list \ gnu/java/lang/reflect.list \
gnu/java/locale.list \ gnu/java/locale.list \
gnu/java/math.list \
gnu/java/net.list \ gnu/java/net.list \
gnu/java/net/loader.list \ gnu/java/net/loader.list \
gnu/java/net/local.list \ gnu/java/net/local.list \
@ -7406,6 +7446,7 @@ all_packages_source_files = \
gnu/java/util/jar.list \ gnu/java/util/jar.list \
gnu/java/util/prefs.list \ gnu/java/util/prefs.list \
gnu/java/util/regex.list \ gnu/java/util/regex.list \
gnu/javax/activation/viewers.list \
gnu/javax/crypto.list \ gnu/javax/crypto.list \
gnu/javax/crypto/assembly.list \ gnu/javax/crypto/assembly.list \
gnu/javax/crypto/cipher.list \ gnu/javax/crypto/cipher.list \
@ -7524,6 +7565,7 @@ all_packages_source_files = \
java/util/spi.list \ java/util/spi.list \
java/util/zip.list \ java/util/zip.list \
javax/accessibility.list \ javax/accessibility.list \
javax/activation.list \
javax/activity.list \ javax/activity.list \
javax/crypto.list \ javax/crypto.list \
javax/crypto/interfaces.list \ javax/crypto/interfaces.list \
@ -7614,7 +7656,6 @@ ordinary_header_files = \
$(gnu_java_lang_management_header_files) \ $(gnu_java_lang_management_header_files) \
$(gnu_java_lang_reflect_header_files) \ $(gnu_java_lang_reflect_header_files) \
$(gnu_java_locale_header_files) \ $(gnu_java_locale_header_files) \
$(gnu_java_math_header_files) \
$(gnu_java_net_header_files) \ $(gnu_java_net_header_files) \
$(gnu_java_net_loader_header_files) \ $(gnu_java_net_loader_header_files) \
$(gnu_java_net_local_header_files) \ $(gnu_java_net_local_header_files) \
@ -7658,6 +7699,7 @@ ordinary_header_files = \
$(gnu_java_util_jar_header_files) \ $(gnu_java_util_jar_header_files) \
$(gnu_java_util_prefs_header_files) \ $(gnu_java_util_prefs_header_files) \
$(gnu_java_util_regex_header_files) \ $(gnu_java_util_regex_header_files) \
$(gnu_javax_activation_viewers_header_files) \
$(gnu_javax_crypto_header_files) \ $(gnu_javax_crypto_header_files) \
$(gnu_javax_crypto_assembly_header_files) \ $(gnu_javax_crypto_assembly_header_files) \
$(gnu_javax_crypto_cipher_header_files) \ $(gnu_javax_crypto_cipher_header_files) \
@ -7771,6 +7813,7 @@ ordinary_header_files = \
$(java_util_spi_header_files) \ $(java_util_spi_header_files) \
$(java_util_zip_header_files) \ $(java_util_zip_header_files) \
$(javax_accessibility_header_files) \ $(javax_accessibility_header_files) \
$(javax_activation_header_files) \
$(javax_activity_header_files) \ $(javax_activity_header_files) \
$(javax_crypto_header_files) \ $(javax_crypto_header_files) \
$(javax_crypto_interfaces_header_files) \ $(javax_crypto_interfaces_header_files) \
@ -7839,6 +7882,7 @@ bc_objects = \
gnu-java-awt-peer-swing.lo \ gnu-java-awt-peer-swing.lo \
gnu-java-beans.lo \ gnu-java-beans.lo \
gnu-java-lang-management.lo \ gnu-java-lang-management.lo \
gnu-java-math.lo \
gnu-java-util-prefs-gconf.lo \ gnu-java-util-prefs-gconf.lo \
gnu-javax-management.lo \ gnu-javax-management.lo \
gnu-javax-rmi.lo \ gnu-javax-rmi.lo \
@ -7883,7 +7927,9 @@ property_files = \
classpath/resource/gnu/java/locale/LocaleInformation_aa_ER_SAAHO.properties \ classpath/resource/gnu/java/locale/LocaleInformation_aa_ER_SAAHO.properties \
classpath/resource/gnu/java/locale/LocaleInformation_aa_ET.properties \ classpath/resource/gnu/java/locale/LocaleInformation_aa_ET.properties \
classpath/resource/gnu/java/locale/LocaleInformation_af.properties \ classpath/resource/gnu/java/locale/LocaleInformation_af.properties \
classpath/resource/gnu/java/locale/LocaleInformation_af_NA.properties \
classpath/resource/gnu/java/locale/LocaleInformation_af_ZA.properties \ classpath/resource/gnu/java/locale/LocaleInformation_af_ZA.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ak.properties \
classpath/resource/gnu/java/locale/LocaleInformation_am.properties \ classpath/resource/gnu/java/locale/LocaleInformation_am.properties \
classpath/resource/gnu/java/locale/LocaleInformation_am_ET.properties \ classpath/resource/gnu/java/locale/LocaleInformation_am_ET.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ar.properties \ classpath/resource/gnu/java/locale/LocaleInformation_ar.properties \
@ -7906,11 +7952,14 @@ property_files = \
classpath/resource/gnu/java/locale/LocaleInformation_bg_BG.properties \ classpath/resource/gnu/java/locale/LocaleInformation_bg_BG.properties \
classpath/resource/gnu/java/locale/LocaleInformation_bn.properties \ classpath/resource/gnu/java/locale/LocaleInformation_bn.properties \
classpath/resource/gnu/java/locale/LocaleInformation_bn_IN.properties \ classpath/resource/gnu/java/locale/LocaleInformation_bn_IN.properties \
classpath/resource/gnu/java/locale/LocaleInformation_bo.properties \
classpath/resource/gnu/java/locale/LocaleInformation_bs.properties \ classpath/resource/gnu/java/locale/LocaleInformation_bs.properties \
classpath/resource/gnu/java/locale/LocaleInformation_byn.properties \ classpath/resource/gnu/java/locale/LocaleInformation_byn.properties \
classpath/resource/gnu/java/locale/LocaleInformation_byn_ER.properties \ classpath/resource/gnu/java/locale/LocaleInformation_byn_ER.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ca.properties \ classpath/resource/gnu/java/locale/LocaleInformation_ca.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ca_ES.properties \ classpath/resource/gnu/java/locale/LocaleInformation_ca_ES.properties \
classpath/resource/gnu/java/locale/LocaleInformation_cch.properties \
classpath/resource/gnu/java/locale/LocaleInformation_cop.properties \
classpath/resource/gnu/java/locale/LocaleInformation_cs.properties \ classpath/resource/gnu/java/locale/LocaleInformation_cs.properties \
classpath/resource/gnu/java/locale/LocaleInformation_cs_CZ.properties \ classpath/resource/gnu/java/locale/LocaleInformation_cs_CZ.properties \
classpath/resource/gnu/java/locale/LocaleInformation_cy.properties \ classpath/resource/gnu/java/locale/LocaleInformation_cy.properties \
@ -7928,6 +7977,7 @@ property_files = \
classpath/resource/gnu/java/locale/LocaleInformation_dv_MV.properties \ classpath/resource/gnu/java/locale/LocaleInformation_dv_MV.properties \
classpath/resource/gnu/java/locale/LocaleInformation_dz.properties \ classpath/resource/gnu/java/locale/LocaleInformation_dz.properties \
classpath/resource/gnu/java/locale/LocaleInformation_dz_BT.properties \ classpath/resource/gnu/java/locale/LocaleInformation_dz_BT.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ee.properties \
classpath/resource/gnu/java/locale/LocaleInformation_el.properties \ classpath/resource/gnu/java/locale/LocaleInformation_el.properties \
classpath/resource/gnu/java/locale/LocaleInformation_el_CY.properties \ classpath/resource/gnu/java/locale/LocaleInformation_el_CY.properties \
classpath/resource/gnu/java/locale/LocaleInformation_el_GR.properties \ classpath/resource/gnu/java/locale/LocaleInformation_el_GR.properties \
@ -7938,18 +7988,23 @@ property_files = \
classpath/resource/gnu/java/locale/LocaleInformation_en_BW.properties \ classpath/resource/gnu/java/locale/LocaleInformation_en_BW.properties \
classpath/resource/gnu/java/locale/LocaleInformation_en_BZ.properties \ classpath/resource/gnu/java/locale/LocaleInformation_en_BZ.properties \
classpath/resource/gnu/java/locale/LocaleInformation_en_CA.properties \ classpath/resource/gnu/java/locale/LocaleInformation_en_CA.properties \
classpath/resource/gnu/java/locale/LocaleInformation_en_Dsrt.properties \
classpath/resource/gnu/java/locale/LocaleInformation_en_GB.properties \ classpath/resource/gnu/java/locale/LocaleInformation_en_GB.properties \
classpath/resource/gnu/java/locale/LocaleInformation_en_GU.properties \ classpath/resource/gnu/java/locale/LocaleInformation_en_GU.properties \
classpath/resource/gnu/java/locale/LocaleInformation_en_HK.properties \ classpath/resource/gnu/java/locale/LocaleInformation_en_HK.properties \
classpath/resource/gnu/java/locale/LocaleInformation_en_IE.properties \ classpath/resource/gnu/java/locale/LocaleInformation_en_IE.properties \
classpath/resource/gnu/java/locale/LocaleInformation_en_IN.properties \ classpath/resource/gnu/java/locale/LocaleInformation_en_IN.properties \
classpath/resource/gnu/java/locale/LocaleInformation_en_JM.properties \
classpath/resource/gnu/java/locale/LocaleInformation_en_MH.properties \ classpath/resource/gnu/java/locale/LocaleInformation_en_MH.properties \
classpath/resource/gnu/java/locale/LocaleInformation_en_MP.properties \ classpath/resource/gnu/java/locale/LocaleInformation_en_MP.properties \
classpath/resource/gnu/java/locale/LocaleInformation_en_MT.properties \ classpath/resource/gnu/java/locale/LocaleInformation_en_MT.properties \
classpath/resource/gnu/java/locale/LocaleInformation_en_NA.properties \
classpath/resource/gnu/java/locale/LocaleInformation_en_NZ.properties \ classpath/resource/gnu/java/locale/LocaleInformation_en_NZ.properties \
classpath/resource/gnu/java/locale/LocaleInformation_en_PH.properties \ classpath/resource/gnu/java/locale/LocaleInformation_en_PH.properties \
classpath/resource/gnu/java/locale/LocaleInformation_en_PK.properties \ classpath/resource/gnu/java/locale/LocaleInformation_en_PK.properties \
classpath/resource/gnu/java/locale/LocaleInformation_en_SG.properties \ classpath/resource/gnu/java/locale/LocaleInformation_en_SG.properties \
classpath/resource/gnu/java/locale/LocaleInformation_en_Shaw.properties \
classpath/resource/gnu/java/locale/LocaleInformation_en_TT.properties \
classpath/resource/gnu/java/locale/LocaleInformation_en_UM.properties \ classpath/resource/gnu/java/locale/LocaleInformation_en_UM.properties \
classpath/resource/gnu/java/locale/LocaleInformation_en_US.properties \ classpath/resource/gnu/java/locale/LocaleInformation_en_US.properties \
classpath/resource/gnu/java/locale/LocaleInformation_en_US_POSIX.properties \ classpath/resource/gnu/java/locale/LocaleInformation_en_US_POSIX.properties \
@ -7987,6 +8042,7 @@ property_files = \
classpath/resource/gnu/java/locale/LocaleInformation_fa_IR.properties \ classpath/resource/gnu/java/locale/LocaleInformation_fa_IR.properties \
classpath/resource/gnu/java/locale/LocaleInformation_fi.properties \ classpath/resource/gnu/java/locale/LocaleInformation_fi.properties \
classpath/resource/gnu/java/locale/LocaleInformation_fi_FI.properties \ classpath/resource/gnu/java/locale/LocaleInformation_fi_FI.properties \
classpath/resource/gnu/java/locale/LocaleInformation_fil.properties \
classpath/resource/gnu/java/locale/LocaleInformation_fo.properties \ classpath/resource/gnu/java/locale/LocaleInformation_fo.properties \
classpath/resource/gnu/java/locale/LocaleInformation_fo_FO.properties \ classpath/resource/gnu/java/locale/LocaleInformation_fo_FO.properties \
classpath/resource/gnu/java/locale/LocaleInformation_fr.properties \ classpath/resource/gnu/java/locale/LocaleInformation_fr.properties \
@ -7994,8 +8050,10 @@ property_files = \
classpath/resource/gnu/java/locale/LocaleInformation_fr_CA.properties \ classpath/resource/gnu/java/locale/LocaleInformation_fr_CA.properties \
classpath/resource/gnu/java/locale/LocaleInformation_fr_CH.properties \ classpath/resource/gnu/java/locale/LocaleInformation_fr_CH.properties \
classpath/resource/gnu/java/locale/LocaleInformation_fr_LU.properties \ classpath/resource/gnu/java/locale/LocaleInformation_fr_LU.properties \
classpath/resource/gnu/java/locale/LocaleInformation_fur.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ga.properties \ classpath/resource/gnu/java/locale/LocaleInformation_ga.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ga_IE.properties \ classpath/resource/gnu/java/locale/LocaleInformation_ga_IE.properties \
classpath/resource/gnu/java/locale/LocaleInformation_gaa.properties \
classpath/resource/gnu/java/locale/LocaleInformation_gez.properties \ classpath/resource/gnu/java/locale/LocaleInformation_gez.properties \
classpath/resource/gnu/java/locale/LocaleInformation_gez_ER.properties \ classpath/resource/gnu/java/locale/LocaleInformation_gez_ER.properties \
classpath/resource/gnu/java/locale/LocaleInformation_gez_ET.properties \ classpath/resource/gnu/java/locale/LocaleInformation_gez_ET.properties \
@ -8005,6 +8063,8 @@ property_files = \
classpath/resource/gnu/java/locale/LocaleInformation_gu_IN.properties \ classpath/resource/gnu/java/locale/LocaleInformation_gu_IN.properties \
classpath/resource/gnu/java/locale/LocaleInformation_gv.properties \ classpath/resource/gnu/java/locale/LocaleInformation_gv.properties \
classpath/resource/gnu/java/locale/LocaleInformation_gv_GB.properties \ classpath/resource/gnu/java/locale/LocaleInformation_gv_GB.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ha.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ha_Arab.properties \
classpath/resource/gnu/java/locale/LocaleInformation_haw.properties \ classpath/resource/gnu/java/locale/LocaleInformation_haw.properties \
classpath/resource/gnu/java/locale/LocaleInformation_haw_US.properties \ classpath/resource/gnu/java/locale/LocaleInformation_haw_US.properties \
classpath/resource/gnu/java/locale/LocaleInformation_he.properties \ classpath/resource/gnu/java/locale/LocaleInformation_he.properties \
@ -8017,8 +8077,11 @@ property_files = \
classpath/resource/gnu/java/locale/LocaleInformation_hy.properties \ classpath/resource/gnu/java/locale/LocaleInformation_hy.properties \
classpath/resource/gnu/java/locale/LocaleInformation_hy_AM.properties \ classpath/resource/gnu/java/locale/LocaleInformation_hy_AM.properties \
classpath/resource/gnu/java/locale/LocaleInformation_hy_AM_REVISED.properties \ classpath/resource/gnu/java/locale/LocaleInformation_hy_AM_REVISED.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ia.properties \
classpath/resource/gnu/java/locale/LocaleInformation_id.properties \ classpath/resource/gnu/java/locale/LocaleInformation_id.properties \
classpath/resource/gnu/java/locale/LocaleInformation_id_ID.properties \ classpath/resource/gnu/java/locale/LocaleInformation_id_ID.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ig.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ii.properties \
classpath/resource/gnu/java/locale/LocaleInformation_is.properties \ classpath/resource/gnu/java/locale/LocaleInformation_is.properties \
classpath/resource/gnu/java/locale/LocaleInformation_is_IS.properties \ classpath/resource/gnu/java/locale/LocaleInformation_is_IS.properties \
classpath/resource/gnu/java/locale/LocaleInformation_it.properties \ classpath/resource/gnu/java/locale/LocaleInformation_it.properties \
@ -8028,6 +8091,10 @@ property_files = \
classpath/resource/gnu/java/locale/LocaleInformation_ja.properties \ classpath/resource/gnu/java/locale/LocaleInformation_ja.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ja_JP.properties \ classpath/resource/gnu/java/locale/LocaleInformation_ja_JP.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ka.properties \ classpath/resource/gnu/java/locale/LocaleInformation_ka.properties \
classpath/resource/gnu/java/locale/LocaleInformation_kaj.properties \
classpath/resource/gnu/java/locale/LocaleInformation_kam.properties \
classpath/resource/gnu/java/locale/LocaleInformation_kcg.properties \
classpath/resource/gnu/java/locale/LocaleInformation_kfo.properties \
classpath/resource/gnu/java/locale/LocaleInformation_kk.properties \ classpath/resource/gnu/java/locale/LocaleInformation_kk.properties \
classpath/resource/gnu/java/locale/LocaleInformation_kk_KZ.properties \ classpath/resource/gnu/java/locale/LocaleInformation_kk_KZ.properties \
classpath/resource/gnu/java/locale/LocaleInformation_kl.properties \ classpath/resource/gnu/java/locale/LocaleInformation_kl.properties \
@ -8040,9 +8107,14 @@ property_files = \
classpath/resource/gnu/java/locale/LocaleInformation_ko_KR.properties \ classpath/resource/gnu/java/locale/LocaleInformation_ko_KR.properties \
classpath/resource/gnu/java/locale/LocaleInformation_kok.properties \ classpath/resource/gnu/java/locale/LocaleInformation_kok.properties \
classpath/resource/gnu/java/locale/LocaleInformation_kok_IN.properties \ classpath/resource/gnu/java/locale/LocaleInformation_kok_IN.properties \
classpath/resource/gnu/java/locale/LocaleInformation_kpe.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ku.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ku_Arab.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ku_Latn.properties \
classpath/resource/gnu/java/locale/LocaleInformation_kw.properties \ classpath/resource/gnu/java/locale/LocaleInformation_kw.properties \
classpath/resource/gnu/java/locale/LocaleInformation_kw_GB.properties \ classpath/resource/gnu/java/locale/LocaleInformation_kw_GB.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ky.properties \ classpath/resource/gnu/java/locale/LocaleInformation_ky.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ln.properties \
classpath/resource/gnu/java/locale/LocaleInformation_lo.properties \ classpath/resource/gnu/java/locale/LocaleInformation_lo.properties \
classpath/resource/gnu/java/locale/LocaleInformation_lo_LA.properties \ classpath/resource/gnu/java/locale/LocaleInformation_lo_LA.properties \
classpath/resource/gnu/java/locale/LocaleInformation_lt.properties \ classpath/resource/gnu/java/locale/LocaleInformation_lt.properties \
@ -8060,19 +8132,25 @@ property_files = \
classpath/resource/gnu/java/locale/LocaleInformation_ms_MY.properties \ classpath/resource/gnu/java/locale/LocaleInformation_ms_MY.properties \
classpath/resource/gnu/java/locale/LocaleInformation_mt.properties \ classpath/resource/gnu/java/locale/LocaleInformation_mt.properties \
classpath/resource/gnu/java/locale/LocaleInformation_mt_MT.properties \ classpath/resource/gnu/java/locale/LocaleInformation_mt_MT.properties \
classpath/resource/gnu/java/locale/LocaleInformation_my.properties \
classpath/resource/gnu/java/locale/LocaleInformation_nb.properties \ classpath/resource/gnu/java/locale/LocaleInformation_nb.properties \
classpath/resource/gnu/java/locale/LocaleInformation_nb_NO.properties \ classpath/resource/gnu/java/locale/LocaleInformation_nb_NO.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ne.properties \
classpath/resource/gnu/java/locale/LocaleInformation_nl.properties \ classpath/resource/gnu/java/locale/LocaleInformation_nl.properties \
classpath/resource/gnu/java/locale/LocaleInformation_nl_BE.properties \ classpath/resource/gnu/java/locale/LocaleInformation_nl_BE.properties \
classpath/resource/gnu/java/locale/LocaleInformation_nl_NL.properties \ classpath/resource/gnu/java/locale/LocaleInformation_nl_NL.properties \
classpath/resource/gnu/java/locale/LocaleInformation_nn.properties \ classpath/resource/gnu/java/locale/LocaleInformation_nn.properties \
classpath/resource/gnu/java/locale/LocaleInformation_nn_NO.properties \ classpath/resource/gnu/java/locale/LocaleInformation_nn_NO.properties \
classpath/resource/gnu/java/locale/LocaleInformation_nr.properties \
classpath/resource/gnu/java/locale/LocaleInformation_nso.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ny.properties \
classpath/resource/gnu/java/locale/LocaleInformation_om.properties \ classpath/resource/gnu/java/locale/LocaleInformation_om.properties \
classpath/resource/gnu/java/locale/LocaleInformation_om_ET.properties \ classpath/resource/gnu/java/locale/LocaleInformation_om_ET.properties \
classpath/resource/gnu/java/locale/LocaleInformation_om_KE.properties \ classpath/resource/gnu/java/locale/LocaleInformation_om_KE.properties \
classpath/resource/gnu/java/locale/LocaleInformation_or.properties \ classpath/resource/gnu/java/locale/LocaleInformation_or.properties \
classpath/resource/gnu/java/locale/LocaleInformation_or_IN.properties \ classpath/resource/gnu/java/locale/LocaleInformation_or_IN.properties \
classpath/resource/gnu/java/locale/LocaleInformation_pa.properties \ classpath/resource/gnu/java/locale/LocaleInformation_pa.properties \
classpath/resource/gnu/java/locale/LocaleInformation_pa_Arab.properties \
classpath/resource/gnu/java/locale/LocaleInformation_pa_IN.properties \ classpath/resource/gnu/java/locale/LocaleInformation_pa_IN.properties \
classpath/resource/gnu/java/locale/LocaleInformation_pl.properties \ classpath/resource/gnu/java/locale/LocaleInformation_pl.properties \
classpath/resource/gnu/java/locale/LocaleInformation_pl_PL.properties \ classpath/resource/gnu/java/locale/LocaleInformation_pl_PL.properties \
@ -8086,8 +8164,12 @@ property_files = \
classpath/resource/gnu/java/locale/LocaleInformation_ru.properties \ classpath/resource/gnu/java/locale/LocaleInformation_ru.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ru_RU.properties \ classpath/resource/gnu/java/locale/LocaleInformation_ru_RU.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ru_UA.properties \ classpath/resource/gnu/java/locale/LocaleInformation_ru_UA.properties \
classpath/resource/gnu/java/locale/LocaleInformation_rw.properties \
classpath/resource/gnu/java/locale/LocaleInformation_sa.properties \ classpath/resource/gnu/java/locale/LocaleInformation_sa.properties \
classpath/resource/gnu/java/locale/LocaleInformation_sa_IN.properties \ classpath/resource/gnu/java/locale/LocaleInformation_sa_IN.properties \
classpath/resource/gnu/java/locale/LocaleInformation_se.properties \
classpath/resource/gnu/java/locale/LocaleInformation_se_FI.properties \
classpath/resource/gnu/java/locale/LocaleInformation_si.properties \
classpath/resource/gnu/java/locale/LocaleInformation_sid.properties \ classpath/resource/gnu/java/locale/LocaleInformation_sid.properties \
classpath/resource/gnu/java/locale/LocaleInformation_sid_ET.properties \ classpath/resource/gnu/java/locale/LocaleInformation_sid_ET.properties \
classpath/resource/gnu/java/locale/LocaleInformation_sk.properties \ classpath/resource/gnu/java/locale/LocaleInformation_sk.properties \
@ -8106,6 +8188,11 @@ property_files = \
classpath/resource/gnu/java/locale/LocaleInformation_sr_BA_Latn.properties \ classpath/resource/gnu/java/locale/LocaleInformation_sr_BA_Latn.properties \
classpath/resource/gnu/java/locale/LocaleInformation_sr_Cyrl.properties \ classpath/resource/gnu/java/locale/LocaleInformation_sr_Cyrl.properties \
classpath/resource/gnu/java/locale/LocaleInformation_sr_Latn.properties \ classpath/resource/gnu/java/locale/LocaleInformation_sr_Latn.properties \
classpath/resource/gnu/java/locale/LocaleInformation_sr_ME_Latn.properties \
classpath/resource/gnu/java/locale/LocaleInformation_sr_RS_Latn.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ss.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ssy.properties \
classpath/resource/gnu/java/locale/LocaleInformation_st.properties \
classpath/resource/gnu/java/locale/LocaleInformation_sv.properties \ classpath/resource/gnu/java/locale/LocaleInformation_sv.properties \
classpath/resource/gnu/java/locale/LocaleInformation_sv_FI.properties \ classpath/resource/gnu/java/locale/LocaleInformation_sv_FI.properties \
classpath/resource/gnu/java/locale/LocaleInformation_sv_SE.properties \ classpath/resource/gnu/java/locale/LocaleInformation_sv_SE.properties \
@ -8118,6 +8205,7 @@ property_files = \
classpath/resource/gnu/java/locale/LocaleInformation_ta_IN.properties \ classpath/resource/gnu/java/locale/LocaleInformation_ta_IN.properties \
classpath/resource/gnu/java/locale/LocaleInformation_te.properties \ classpath/resource/gnu/java/locale/LocaleInformation_te.properties \
classpath/resource/gnu/java/locale/LocaleInformation_te_IN.properties \ classpath/resource/gnu/java/locale/LocaleInformation_te_IN.properties \
classpath/resource/gnu/java/locale/LocaleInformation_tg.properties \
classpath/resource/gnu/java/locale/LocaleInformation_th.properties \ classpath/resource/gnu/java/locale/LocaleInformation_th.properties \
classpath/resource/gnu/java/locale/LocaleInformation_th_TH.properties \ classpath/resource/gnu/java/locale/LocaleInformation_th_TH.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ti.properties \ classpath/resource/gnu/java/locale/LocaleInformation_ti.properties \
@ -8125,20 +8213,30 @@ property_files = \
classpath/resource/gnu/java/locale/LocaleInformation_ti_ET.properties \ classpath/resource/gnu/java/locale/LocaleInformation_ti_ET.properties \
classpath/resource/gnu/java/locale/LocaleInformation_tig.properties \ classpath/resource/gnu/java/locale/LocaleInformation_tig.properties \
classpath/resource/gnu/java/locale/LocaleInformation_tig_ER.properties \ classpath/resource/gnu/java/locale/LocaleInformation_tig_ER.properties \
classpath/resource/gnu/java/locale/LocaleInformation_tn.properties \
classpath/resource/gnu/java/locale/LocaleInformation_to.properties \
classpath/resource/gnu/java/locale/LocaleInformation_tr.properties \ classpath/resource/gnu/java/locale/LocaleInformation_tr.properties \
classpath/resource/gnu/java/locale/LocaleInformation_tr_TR.properties \ classpath/resource/gnu/java/locale/LocaleInformation_tr_TR.properties \
classpath/resource/gnu/java/locale/LocaleInformation_trv.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ts.properties \
classpath/resource/gnu/java/locale/LocaleInformation_tt.properties \ classpath/resource/gnu/java/locale/LocaleInformation_tt.properties \
classpath/resource/gnu/java/locale/LocaleInformation_tt_RU.properties \ classpath/resource/gnu/java/locale/LocaleInformation_tt_RU.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ug.properties \
classpath/resource/gnu/java/locale/LocaleInformation_uk.properties \ classpath/resource/gnu/java/locale/LocaleInformation_uk.properties \
classpath/resource/gnu/java/locale/LocaleInformation_uk_UA.properties \ classpath/resource/gnu/java/locale/LocaleInformation_uk_UA.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ur.properties \ classpath/resource/gnu/java/locale/LocaleInformation_ur.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ur_IN.properties \
classpath/resource/gnu/java/locale/LocaleInformation_uz.properties \ classpath/resource/gnu/java/locale/LocaleInformation_uz.properties \
classpath/resource/gnu/java/locale/LocaleInformation_uz_AF_Arab.properties \ classpath/resource/gnu/java/locale/LocaleInformation_uz_AF_Arab.properties \
classpath/resource/gnu/java/locale/LocaleInformation_uz_Arab.properties \ classpath/resource/gnu/java/locale/LocaleInformation_uz_Arab.properties \
classpath/resource/gnu/java/locale/LocaleInformation_uz_Latn.properties \ classpath/resource/gnu/java/locale/LocaleInformation_uz_Latn.properties \
classpath/resource/gnu/java/locale/LocaleInformation_ve.properties \
classpath/resource/gnu/java/locale/LocaleInformation_vi.properties \ classpath/resource/gnu/java/locale/LocaleInformation_vi.properties \
classpath/resource/gnu/java/locale/LocaleInformation_wal.properties \ classpath/resource/gnu/java/locale/LocaleInformation_wal.properties \
classpath/resource/gnu/java/locale/LocaleInformation_wal_ET.properties \ classpath/resource/gnu/java/locale/LocaleInformation_wal_ET.properties \
classpath/resource/gnu/java/locale/LocaleInformation_wo.properties \
classpath/resource/gnu/java/locale/LocaleInformation_xh.properties \
classpath/resource/gnu/java/locale/LocaleInformation_yo.properties \
classpath/resource/gnu/java/locale/LocaleInformation_zh.properties \ classpath/resource/gnu/java/locale/LocaleInformation_zh.properties \
classpath/resource/gnu/java/locale/LocaleInformation_zh_CN_Hans.properties \ classpath/resource/gnu/java/locale/LocaleInformation_zh_CN_Hans.properties \
classpath/resource/gnu/java/locale/LocaleInformation_zh_HK_Hant.properties \ classpath/resource/gnu/java/locale/LocaleInformation_zh_HK_Hant.properties \
@ -8146,13 +8244,16 @@ property_files = \
classpath/resource/gnu/java/locale/LocaleInformation_zh_MO_Hant.properties \ classpath/resource/gnu/java/locale/LocaleInformation_zh_MO_Hant.properties \
classpath/resource/gnu/java/locale/LocaleInformation_zh_SG_Hans.properties \ classpath/resource/gnu/java/locale/LocaleInformation_zh_SG_Hans.properties \
classpath/resource/gnu/java/locale/LocaleInformation_zh_TW_Hant.properties \ classpath/resource/gnu/java/locale/LocaleInformation_zh_TW_Hant.properties \
classpath/resource/gnu/java/locale/LocaleInformation_zu.properties \
classpath/resource/gnu/java/util/regex/MessagesBundle.properties \ classpath/resource/gnu/java/util/regex/MessagesBundle.properties \
classpath/resource/gnu/java/util/regex/MessagesBundle_fr.properties \ classpath/resource/gnu/java/util/regex/MessagesBundle_fr.properties \
classpath/resource/gnu/java/util/regex/MessagesBundle_it.properties \ classpath/resource/gnu/java/util/regex/MessagesBundle_it.properties \
classpath/resource/gnu/javax/print/PrinterDialog.properties \ classpath/resource/gnu/javax/print/PrinterDialog.properties \
classpath/resource/gnu/javax/print/PrinterDialog_de.properties \ classpath/resource/gnu/javax/print/PrinterDialog_de.properties \
classpath/resource/gnu/javax/security/auth/callback/MessagesBundle.properties \ classpath/resource/gnu/javax/security/auth/callback/MessagesBundle.properties \
classpath/resource/java/text/metazones.properties \
classpath/resource/java/util/iso4217.properties \ classpath/resource/java/util/iso4217.properties \
classpath/resource/java/util/weeks.properties \
classpath/resource/javax/imageio/plugins/jpeg/MessagesBundle.properties \ classpath/resource/javax/imageio/plugins/jpeg/MessagesBundle.properties \
classpath/resource/javax/swing/text/html/default.css \ classpath/resource/javax/swing/text/html/default.css \
classpath/resource/org/ietf/jgss/MessagesBundle.properties \ classpath/resource/org/ietf/jgss/MessagesBundle.properties \
@ -8244,7 +8345,7 @@ ECJX_BASE_FLAGS = -findirect-dispatch \
@NATIVE_TRUE@ecjx_LDADD = -L$(here)/.libs libgcj.la @NATIVE_TRUE@ecjx_LDADD = -L$(here)/.libs libgcj.la
@NATIVE_FALSE@ecjx_DEPENDENCIES = @NATIVE_FALSE@ecjx_DEPENDENCIES =
@NATIVE_TRUE@ecjx_DEPENDENCIES = libgcj.la libgcj.spec \ @NATIVE_TRUE@ecjx_DEPENDENCIES = libgcj.la libgcj.spec \
@NATIVE_TRUE@ $(am__append_17) @NATIVE_TRUE@ $(am__append_18)
gappletviewer_SOURCES = gappletviewer_SOURCES =
gappletviewer_LDFLAGS = --main=gnu.classpath.tools.appletviewer.Main \ gappletviewer_LDFLAGS = --main=gnu.classpath.tools.appletviewer.Main \
-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
@ -8336,6 +8437,14 @@ grmiregistry_LDFLAGS = --main=gnu.classpath.tools.rmiregistry.Main \
grmiregistry_LINK = $(GCJLINK) grmiregistry_LINK = $(GCJLINK)
grmiregistry_LDADD = -L$(here)/.libs libgcj-tools.la grmiregistry_LDADD = -L$(here)/.libs libgcj-tools.la
grmiregistry_DEPENDENCIES = libgcj-tools.la grmiregistry_DEPENDENCIES = libgcj-tools.la
gjdoc_SOURCES =
gjdoc_LDFLAGS = --main=gnu.classpath.tools.gjdoc.Main \
-Djava.class.path=$(ANTLR_JAR) \
-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
gjdoc_LINK = $(GCJLINK)
gjdoc_LDADD = -L$(here)/.libs libgcj-tools.la
gjdoc_DEPENDENCIES = libgcj-tools.la
@INTERPRETER_FALSE@nat_jdwp_source_files = @INTERPRETER_FALSE@nat_jdwp_source_files =
@INTERPRETER_TRUE@nat_jdwp_source_files = \ @INTERPRETER_TRUE@nat_jdwp_source_files = \
@INTERPRETER_TRUE@gnu/classpath/jdwp/natVMFrame.cc \ @INTERPRETER_TRUE@gnu/classpath/jdwp/natVMFrame.cc \
@ -8401,8 +8510,7 @@ java/lang/natMath.cc \
java/lang/natObject.cc \ java/lang/natObject.cc \
java/lang/natRuntime.cc \ java/lang/natRuntime.cc \
java/lang/natString.cc \ java/lang/natString.cc \
java/lang/natStringBuffer.cc \ java/lang/natAbstractStringBuffer.cc \
java/lang/natStringBuilder.cc \
java/lang/natSystem.cc \ java/lang/natSystem.cc \
java/lang/natThread.cc \ java/lang/natThread.cc \
java/lang/natThreadLocal.cc \ java/lang/natThreadLocal.cc \
@ -8453,7 +8561,7 @@ gnu/gcj/xlib/natXImage.cc \
gnu/gcj/xlib/natXUnmapEvent.cc gnu/gcj/xlib/natXUnmapEvent.cc
sourcesdir = $(jardir) sourcesdir = $(jardir)
headers_to_make = $(nat_headers) $(am__append_18) headers_to_make = $(nat_headers) $(am__append_19)
# Work around what appears to be a GNU make bug handling MAKEFLAGS # Work around what appears to be a GNU make bug handling MAKEFLAGS
# values defined in terms of make variables, as is the case for CC and # values defined in terms of make variables, as is the case for CC and
@ -8919,9 +9027,7 @@ java/lang/natRuntime.lo: java/lang/$(am__dirstamp) \
java/lang/$(DEPDIR)/$(am__dirstamp) java/lang/$(DEPDIR)/$(am__dirstamp)
java/lang/natString.lo: java/lang/$(am__dirstamp) \ java/lang/natString.lo: java/lang/$(am__dirstamp) \
java/lang/$(DEPDIR)/$(am__dirstamp) java/lang/$(DEPDIR)/$(am__dirstamp)
java/lang/natStringBuffer.lo: java/lang/$(am__dirstamp) \ java/lang/natAbstractStringBuffer.lo: java/lang/$(am__dirstamp) \
java/lang/$(DEPDIR)/$(am__dirstamp)
java/lang/natStringBuilder.lo: java/lang/$(am__dirstamp) \
java/lang/$(DEPDIR)/$(am__dirstamp) java/lang/$(DEPDIR)/$(am__dirstamp)
java/lang/natSystem.lo: java/lang/$(am__dirstamp) \ java/lang/natSystem.lo: java/lang/$(am__dirstamp) \
java/lang/$(DEPDIR)/$(am__dirstamp) java/lang/$(DEPDIR)/$(am__dirstamp)
@ -9165,6 +9271,9 @@ gjarsigner$(EXEEXT): $(gjarsigner_OBJECTS) $(gjarsigner_DEPENDENCIES)
gjavah$(EXEEXT): $(gjavah_OBJECTS) $(gjavah_DEPENDENCIES) gjavah$(EXEEXT): $(gjavah_OBJECTS) $(gjavah_DEPENDENCIES)
@rm -f gjavah$(EXEEXT) @rm -f gjavah$(EXEEXT)
$(gjavah_LINK) $(gjavah_LDFLAGS) $(gjavah_OBJECTS) $(gjavah_LDADD) $(LIBS) $(gjavah_LINK) $(gjavah_LDFLAGS) $(gjavah_OBJECTS) $(gjavah_LDADD) $(LIBS)
gjdoc$(EXEEXT): $(gjdoc_OBJECTS) $(gjdoc_DEPENDENCIES)
@rm -f gjdoc$(EXEEXT)
$(gjdoc_LINK) $(gjdoc_LDFLAGS) $(gjdoc_OBJECTS) $(gjdoc_LDADD) $(LIBS)
gkeytool$(EXEEXT): $(gkeytool_OBJECTS) $(gkeytool_DEPENDENCIES) gkeytool$(EXEEXT): $(gkeytool_OBJECTS) $(gkeytool_DEPENDENCIES)
@rm -f gkeytool$(EXEEXT) @rm -f gkeytool$(EXEEXT)
$(gkeytool_LINK) $(gkeytool_LDFLAGS) $(gkeytool_OBJECTS) $(gkeytool_LDADD) $(LIBS) $(gkeytool_LINK) $(gkeytool_LDFLAGS) $(gkeytool_OBJECTS) $(gkeytool_LDADD) $(LIBS)
@ -9353,6 +9462,8 @@ mostlyclean-compile:
-rm -f java/io/natVMObjectStreamClass.lo -rm -f java/io/natVMObjectStreamClass.lo
-rm -f java/lang/Object.$(OBJEXT) -rm -f java/lang/Object.$(OBJEXT)
-rm -f java/lang/Object.lo -rm -f java/lang/Object.lo
-rm -f java/lang/natAbstractStringBuffer.$(OBJEXT)
-rm -f java/lang/natAbstractStringBuffer.lo
-rm -f java/lang/natCharacter.$(OBJEXT) -rm -f java/lang/natCharacter.$(OBJEXT)
-rm -f java/lang/natCharacter.lo -rm -f java/lang/natCharacter.lo
-rm -f java/lang/natClass.$(OBJEXT) -rm -f java/lang/natClass.$(OBJEXT)
@ -9369,10 +9480,6 @@ mostlyclean-compile:
-rm -f java/lang/natRuntime.lo -rm -f java/lang/natRuntime.lo
-rm -f java/lang/natString.$(OBJEXT) -rm -f java/lang/natString.$(OBJEXT)
-rm -f java/lang/natString.lo -rm -f java/lang/natString.lo
-rm -f java/lang/natStringBuffer.$(OBJEXT)
-rm -f java/lang/natStringBuffer.lo
-rm -f java/lang/natStringBuilder.$(OBJEXT)
-rm -f java/lang/natStringBuilder.lo
-rm -f java/lang/natSystem.$(OBJEXT) -rm -f java/lang/natSystem.$(OBJEXT)
-rm -f java/lang/natSystem.lo -rm -f java/lang/natSystem.lo
-rm -f java/lang/natThread.$(OBJEXT) -rm -f java/lang/natThread.$(OBJEXT)
@ -9524,6 +9631,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@java/io/$(DEPDIR)/natVMObjectInputStream.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@java/io/$(DEPDIR)/natVMObjectInputStream.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/io/$(DEPDIR)/natVMObjectStreamClass.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@java/io/$(DEPDIR)/natVMObjectStreamClass.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/Object.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/Object.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natAbstractStringBuffer.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natCharacter.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natCharacter.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natClass.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natClass.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natClassLoader.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natClassLoader.Plo@am__quote@
@ -9532,8 +9640,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natObject.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natObject.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natRuntime.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natRuntime.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natString.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natString.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natStringBuffer.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natStringBuilder.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natSystem.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natSystem.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natThread.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natThread.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natThreadLocal.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natThreadLocal.Plo@am__quote@
@ -10696,11 +10802,10 @@ gnu/java/locale.list: $(gnu_java_locale_source_files)
-include gnu/java/locale.deps -include gnu/java/locale.deps
gnu/java/math.list: $(gnu_java_math_source_files) gnu-java-math.lo: $(gnu_java_math_source_files)
@$(mkinstalldirs) $(dir $@) @find $(srcdir)/classpath/lib/gnu/java/math -name '*.class' > gnu-java-math.list
echo $(srcdir)/classpath/lib/gnu/java/math/*.class > gnu/java/math.list $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-java-math.lo @gnu-java-math.list
@rm -f gnu-java-math.list
-include gnu/java/math.deps
gnu/java/net.list: $(gnu_java_net_source_files) gnu/java/net.list: $(gnu_java_net_source_files)
@$(mkinstalldirs) $(dir $@) @$(mkinstalldirs) $(dir $@)
@ -10965,6 +11070,12 @@ gnu/java/util/regex.list: $(gnu_java_util_regex_source_files)
-include gnu/java/util/regex.deps -include gnu/java/util/regex.deps
gnu/javax/activation/viewers.list: $(gnu_javax_activation_viewers_source_files)
@$(mkinstalldirs) $(dir $@)
echo $(srcdir)/classpath/lib/gnu/javax/activation/viewers/*.class > gnu/javax/activation/viewers.list
-include gnu/javax/activation/viewers.deps
gnu/javax/crypto.list: $(gnu_javax_crypto_source_files) gnu/javax/crypto.list: $(gnu_javax_crypto_source_files)
@$(mkinstalldirs) $(dir $@) @$(mkinstalldirs) $(dir $@)
echo $(srcdir)/classpath/lib/gnu/javax/crypto/*.class > gnu/javax/crypto.list echo $(srcdir)/classpath/lib/gnu/javax/crypto/*.class > gnu/javax/crypto.list
@ -11738,6 +11849,12 @@ javax/accessibility.list: $(javax_accessibility_source_files)
-include javax/accessibility.deps -include javax/accessibility.deps
javax/activation.list: $(javax_activation_source_files)
@$(mkinstalldirs) $(dir $@)
echo $(srcdir)/classpath/lib/javax/activation/*.class > javax/activation.list
-include javax/activation.deps
javax/activity.list: $(javax_activity_source_files) javax/activity.list: $(javax_activity_source_files)
@$(mkinstalldirs) $(dir $@) @$(mkinstalldirs) $(dir $@)
echo $(srcdir)/classpath/lib/javax/activity/*.class > javax/activity.list echo $(srcdir)/classpath/lib/javax/activity/*.class > javax/activity.list

View File

@ -22,6 +22,7 @@ Thomas Fitzsimmons (fitzsim@redhat.com)
Jeroen Frijters (jeroen@frijters.net) Jeroen Frijters (jeroen@frijters.net)
David Gilbert (david.gilbert@object-refinery.com) David Gilbert (david.gilbert@object-refinery.com)
Anthony Green (green@redhat.com) Anthony Green (green@redhat.com)
Laszlo Andras Hernadi (e0327023@student.tuwien.ac.at)
Jochen Hoenicke (Jochen.Hoenicke@Informatik.Uni-Oldenburg.de) Jochen Hoenicke (Jochen.Hoenicke@Informatik.Uni-Oldenburg.de)
Andrew John Hughes (gnu_andrew@member.fsf.org) Andrew John Hughes (gnu_andrew@member.fsf.org)
Kazumitsu Ito (kaz@maczuka.gcd.org) Kazumitsu Ito (kaz@maczuka.gcd.org)
@ -42,6 +43,7 @@ Aaron M. Renn (arenn@urbanophile.com)
Ian Rogers (ian.rogers@manchester.ac.uk) Ian Rogers (ian.rogers@manchester.ac.uk)
Andrew Selkirk (aselkirk@sympatico.ca) Andrew Selkirk (aselkirk@sympatico.ca)
Robert Schuster (robertschuster@fsfe.org) Robert Schuster (robertschuster@fsfe.org)
Joshua Sumali (jsumali@redhat.com)
Christian Thalinger (twisti@complang.tuwien.ac.at) Christian Thalinger (twisti@complang.tuwien.ac.at)
Andreas Tobler (a.tobler@schweiz.org) Andreas Tobler (a.tobler@schweiz.org)
Mario Torre (neugens@limasoftware.net) Mario Torre (neugens@limasoftware.net)

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,87 @@
2008-10-21 Matthias Klose <doko@ubuntu.com>
* classpath/tools/gnu/classpath/tools/gjdoc/expr/Java*: Move from ...
* classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/ ... here.
* Update .class files.
2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/Makefile.am:
Always generate parser in the srcdir.
2008-10-21 Matthias Klose <doko@ubuntu.com>
* doc/Makefile.am (MAINTAINERCLEANFILES): Add gjdoc.1.
* doc/Makefile.in: Regenerate.
2008-10-20 Matthias Klose <doko@ubuntu.com>
* configure.ac: Fix path name in check for generated gjdoc parser files.
* configure: Regenerate.
2008-10-20 Matthias Klose <doko@ubuntu.com>
* configure.ac: Don't check for working java, if not configured
with --enable-java-maintainer-mode.
* configure: Regenerate.
2008-10-19 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_java.m4: Revert previous change.
* m4/ac_prog_javac.m4: Apply it here.
* configure: Regenerate.
2008-10-19 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_javac.m4: Don't check for working javac, if not configured
with --enable-java-maintainer-mode.
* configure: Regenerate.
* Makefile.in, */Makefile.in: Regenerate.
2008-09-30 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_antlr.m4: Check for cantlr binary as well.
2008-09-29 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_antlr.m4: Check for antlr binary as well.
2008-09-28 Matthias Klose <doko@ubuntu.com>
* PR libgcj/37636. Revert:
2008-02-20 Matthias Klose <doko@ubuntu.com>
* tools/Makefile.am ($(TOOLS_ZIP)): Revert part of previous change,
Do copy resource files in JAVA_MAINTAINER_MODE only.
* tools/Makefile.in: Regenerate.
2008-09-14 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_javac_works.m4, m4/ac_prog_javac.m4, m4/acinclude.m4:
Revert local changes.
* m4/ac_prog_antlr.m4: Check for an runantlr binary.
* tools/Makefile.am, lib/Makefile.am: Revert local changes (JCOMPILER).
* tools/Makefile.am: Remove USE_JAVAC_FLAGS, pass ANTLR_JAR in
GLIBJ_CLASSPATH.
2008-09-14 Matthias Klose <doko@ubuntu.com>
Revert:
Daniel Frampton <zyridium at zyridium.net>
* AUTHORS: Added.
* java/lang/InheritableThreadLocal.java,
* java/lang/Thread.java,
* java/lang/ThreadLocal.java:
Modified to use java.lang.ThreadLocalMap.
* java/lang/ThreadLocalMap.java:
New cheaper ThreadLocal-specific WeakHashMap.
2008-08-15 Matthias Klose <doko@ubuntu.com>
* m4/acinclude.m4 (CLASSPATH_JAVAC_MEM_CHECK): Remove unknown
args for javac.
2008-08-17 Mark Wielaard <mark@klomp.org> 2008-08-17 Mark Wielaard <mark@klomp.org>
* gnu/java/awt/peer/gtk/CairoGraphics2D.java: Always loadLibrary * gnu/java/awt/peer/gtk/CairoGraphics2D.java: Always loadLibrary

View File

@ -11,7 +11,7 @@ ACLOCAL_AMFLAGS = -I m4 -I ../.. -I ../../config ${LOCAL_AUTORECONF_FLAGS}
native: lib native: lib
EXTRA_DIST = HACKING BUGS THANKYOU mauve-classpath LICENSE \ EXTRA_DIST = HACKING BUGS THANKYOU mauve-classpath LICENSE ChangeLog-2007 \
ChangeLog-2003 ChangeLog-2004 ChangeLog-2005 ChangeLog-2006 \ ChangeLog-2003 ChangeLog-2004 ChangeLog-2005 ChangeLog-2006 \
ChangeLog.gnujaxp.1 ChangeLog.gnujaxp.2 ChangeLog.libxmlj \ ChangeLog.gnujaxp.1 ChangeLog.gnujaxp.2 ChangeLog.libxmlj \
autogen.sh autogen.sh

View File

@ -68,6 +68,9 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/../../ltsugar.m4 \ $(top_srcdir)/../../ltsugar.m4 \
$(top_srcdir)/../../ltversion.m4 \ $(top_srcdir)/../../ltversion.m4 \
$(top_srcdir)/../../lt~obsolete.m4 \ $(top_srcdir)/../../lt~obsolete.m4 \
$(top_srcdir)/m4/ac_prog_antlr.m4 \
$(top_srcdir)/m4/ac_prog_java.m4 \
$(top_srcdir)/m4/ac_prog_java_works.m4 \
$(top_srcdir)/m4/ac_prog_javac.m4 \ $(top_srcdir)/m4/ac_prog_javac.m4 \
$(top_srcdir)/m4/ac_prog_javac_works.m4 \ $(top_srcdir)/m4/ac_prog_javac_works.m4 \
$(top_srcdir)/m4/acattribute.m4 $(top_srcdir)/m4/accross.m4 \ $(top_srcdir)/m4/acattribute.m4 $(top_srcdir)/m4/accross.m4 \
@ -120,6 +123,8 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@ AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
ANTLR = @ANTLR@
ANTLR_JAR = @ANTLR_JAR@
AR = @AR@ AR = @AR@
AUTOCONF = @AUTOCONF@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
@ -151,6 +156,12 @@ CREATE_DSSI_LIBRARIES_FALSE = @CREATE_DSSI_LIBRARIES_FALSE@
CREATE_DSSI_LIBRARIES_TRUE = @CREATE_DSSI_LIBRARIES_TRUE@ CREATE_DSSI_LIBRARIES_TRUE = @CREATE_DSSI_LIBRARIES_TRUE@
CREATE_GCONF_PEER_LIBRARIES_FALSE = @CREATE_GCONF_PEER_LIBRARIES_FALSE@ CREATE_GCONF_PEER_LIBRARIES_FALSE = @CREATE_GCONF_PEER_LIBRARIES_FALSE@
CREATE_GCONF_PEER_LIBRARIES_TRUE = @CREATE_GCONF_PEER_LIBRARIES_TRUE@ CREATE_GCONF_PEER_LIBRARIES_TRUE = @CREATE_GCONF_PEER_LIBRARIES_TRUE@
CREATE_GJDOC_FALSE = @CREATE_GJDOC_FALSE@
CREATE_GJDOC_PARSER_FALSE = @CREATE_GJDOC_PARSER_FALSE@
CREATE_GJDOC_PARSER_TRUE = @CREATE_GJDOC_PARSER_TRUE@
CREATE_GJDOC_TRUE = @CREATE_GJDOC_TRUE@
CREATE_GMPBI_LIBRARY_FALSE = @CREATE_GMPBI_LIBRARY_FALSE@
CREATE_GMPBI_LIBRARY_TRUE = @CREATE_GMPBI_LIBRARY_TRUE@
CREATE_GSTREAMER_PEER_LIBRARIES_FALSE = @CREATE_GSTREAMER_PEER_LIBRARIES_FALSE@ CREATE_GSTREAMER_PEER_LIBRARIES_FALSE = @CREATE_GSTREAMER_PEER_LIBRARIES_FALSE@
CREATE_GSTREAMER_PEER_LIBRARIES_TRUE = @CREATE_GSTREAMER_PEER_LIBRARIES_TRUE@ CREATE_GSTREAMER_PEER_LIBRARIES_TRUE = @CREATE_GSTREAMER_PEER_LIBRARIES_TRUE@
CREATE_GTK_PEER_LIBRARIES_FALSE = @CREATE_GTK_PEER_LIBRARIES_FALSE@ CREATE_GTK_PEER_LIBRARIES_FALSE = @CREATE_GTK_PEER_LIBRARIES_FALSE@
@ -189,11 +200,12 @@ ERROR_CFLAGS = @ERROR_CFLAGS@
EXAMPLESDIR = @EXAMPLESDIR@ EXAMPLESDIR = @EXAMPLESDIR@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
EXTRA_CFLAGS = @EXTRA_CFLAGS@ EXTRA_CFLAGS = @EXTRA_CFLAGS@
FASTJAR = @FASTJAR@
FGREP = @FGREP@ FGREP = @FGREP@
FIND = @FIND@ FIND = @FIND@
FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@ FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@
FREETYPE2_LIBS = @FREETYPE2_LIBS@ FREETYPE2_LIBS = @FREETYPE2_LIBS@
GCJ_JAVAC_FALSE = @GCJ_JAVAC_FALSE@
GCJ_JAVAC_TRUE = @GCJ_JAVAC_TRUE@
GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@ GCONF_LIBS = @GCONF_LIBS@
GDK_CFLAGS = @GDK_CFLAGS@ GDK_CFLAGS = @GDK_CFLAGS@
@ -203,6 +215,8 @@ GENINSRC_TRUE = @GENINSRC_TRUE@
GJDOC = @GJDOC@ GJDOC = @GJDOC@
GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@ GLIB_LIBS = @GLIB_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
GMP_LIBS = @GMP_LIBS@
GREP = @GREP@ GREP = @GREP@
GSTREAMER_BASE_CFLAGS = @GSTREAMER_BASE_CFLAGS@ GSTREAMER_BASE_CFLAGS = @GSTREAMER_BASE_CFLAGS@
GSTREAMER_BASE_LIBS = @GSTREAMER_BASE_LIBS@ GSTREAMER_BASE_LIBS = @GSTREAMER_BASE_LIBS@
@ -224,7 +238,10 @@ INSTALL_GLIBJ_ZIP_TRUE = @INSTALL_GLIBJ_ZIP_TRUE@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JAR = @JAR@
JAVA = @JAVA@
JAVAC = @JAVAC@ JAVAC = @JAVAC@
JAVAC_IS_GCJ = @JAVAC_IS_GCJ@
JAVAC_MEM_OPT = @JAVAC_MEM_OPT@ JAVAC_MEM_OPT = @JAVAC_MEM_OPT@
JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@ JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@
JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@ JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@
@ -290,8 +307,10 @@ USE_ESCHER_TRUE = @USE_ESCHER_TRUE@
USE_PREBUILT_GLIBJ_ZIP_FALSE = @USE_PREBUILT_GLIBJ_ZIP_FALSE@ USE_PREBUILT_GLIBJ_ZIP_FALSE = @USE_PREBUILT_GLIBJ_ZIP_FALSE@
USE_PREBUILT_GLIBJ_ZIP_TRUE = @USE_PREBUILT_GLIBJ_ZIP_TRUE@ USE_PREBUILT_GLIBJ_ZIP_TRUE = @USE_PREBUILT_GLIBJ_ZIP_TRUE@
VERSION = @VERSION@ VERSION = @VERSION@
VM_BINARY = @VM_BINARY@ WANT_NATIVE_BIG_INTEGER = @WANT_NATIVE_BIG_INTEGER@
WARNING_CFLAGS = @WARNING_CFLAGS@ WARNING_CFLAGS = @WARNING_CFLAGS@
WITH_JAR_FALSE = @WITH_JAR_FALSE@
WITH_JAR_TRUE = @WITH_JAR_TRUE@
XML_CFLAGS = @XML_CFLAGS@ XML_CFLAGS = @XML_CFLAGS@
XML_LIBS = @XML_LIBS@ XML_LIBS = @XML_LIBS@
XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CFLAGS = @XSLT_CFLAGS@
@ -302,6 +321,7 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@ X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@
ZIP = @ZIP@ ZIP = @ZIP@
ac_ct_ANTLR = @ac_ct_ANTLR@
ac_ct_AR = @ac_ct_AR@ ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_CXX = @ac_ct_CXX@
@ -361,6 +381,7 @@ target_cpu = @target_cpu@
target_os = @target_os@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@ toolexeclibdir = @toolexeclibdir@
uudecode = @uudecode@
vm_classes = @vm_classes@ vm_classes = @vm_classes@
# lib first, to compile .class files before native code, last examples # lib first, to compile .class files before native code, last examples
@ -369,7 +390,7 @@ DIST_SUBDIRS = lib doc external include native resource scripts tools examples
# Allow users to pass site-specific flags to autoreconf via an env var. # Allow users to pass site-specific flags to autoreconf via an env var.
ACLOCAL_AMFLAGS = -I m4 -I ../.. -I ../../config ${LOCAL_AUTORECONF_FLAGS} ACLOCAL_AMFLAGS = -I m4 -I ../.. -I ../../config ${LOCAL_AUTORECONF_FLAGS}
EXTRA_DIST = HACKING BUGS THANKYOU mauve-classpath LICENSE \ EXTRA_DIST = HACKING BUGS THANKYOU mauve-classpath LICENSE ChangeLog-2007 \
ChangeLog-2003 ChangeLog-2004 ChangeLog-2005 ChangeLog-2006 \ ChangeLog-2003 ChangeLog-2004 ChangeLog-2005 ChangeLog-2006 \
ChangeLog.gnujaxp.1 ChangeLog.gnujaxp.2 ChangeLog.libxmlj \ ChangeLog.gnujaxp.1 ChangeLog.gnujaxp.2 ChangeLog.libxmlj \
autogen.sh autogen.sh

View File

@ -1,3 +1,19 @@
New in release 0.98
* Native support for BigInteger is now provided using the GMP
library. A new option, --enable/disable-gmp is provided, and
the option is enabled by default if GMP is found.
* Classpath now makes use of a new StringBuilder implementation
internally called CPStringBuilder. In addition to being
unsynchronised, like StringBuilder, this also avoids copying the
array when toString or substring is called. While StringBuffer/Builder
always retain their own array, which is only altered during resizing,
CPStringBuilder gives away its array when the result is generated
by toString()/substring() and starts afresh. The default capacity of
CPStringBuilder can also be configured using the
gnu.classpath.cpstringbuilder.capacity property.
* gjdoc is now built as part of tools.zip.
Bug fixes in release 0.97.2 (Jun 06, 2007) Bug fixes in release 0.97.2 (Jun 06, 2007)
* Include headers in the release tarball. * Include headers in the release tarball.

View File

@ -26,6 +26,7 @@ Andrew Haley (aph@redhat.com)
Steven Hugg (hugg@pobox.com) Steven Hugg (hugg@pobox.com)
jockey@aromasoft.com jockey@aromasoft.com
Isaac Jones (ijones@cis.ohio-state.edu) Isaac Jones (ijones@cis.ohio-state.edu)
Byeogncheol Lee (lineonking@gmail.com)
Oskar Liljeblad (osk@hem.passagen.se) Oskar Liljeblad (osk@hem.passagen.se)
Trevor Linton (tlinton@xmission.com) Trevor Linton (tlinton@xmission.com)
Casey Marshall (rsdio@metastatic.org) Casey Marshall (rsdio@metastatic.org)

View File

@ -912,6 +912,9 @@ m4_include([../../ltoptions.m4])
m4_include([../../ltsugar.m4]) m4_include([../../ltsugar.m4])
m4_include([../../ltversion.m4]) m4_include([../../ltversion.m4])
m4_include([../../lt~obsolete.m4]) m4_include([../../lt~obsolete.m4])
m4_include([m4/ac_prog_antlr.m4])
m4_include([m4/ac_prog_java.m4])
m4_include([m4/ac_prog_java_works.m4])
m4_include([m4/ac_prog_javac.m4]) m4_include([m4/ac_prog_javac.m4])
m4_include([m4/ac_prog_javac_works.m4]) m4_include([m4/ac_prog_javac_works.m4])
m4_include([m4/acattribute.m4]) m4_include([m4/acattribute.m4])

File diff suppressed because it is too large Load Diff

View File

@ -6,7 +6,7 @@ dnl -----------------------------------------------------------
dnl define([AC_CACHE_LOAD], )dnl dnl define([AC_CACHE_LOAD], )dnl
dnl define([AC_CACHE_SAVE], )dnl dnl define([AC_CACHE_SAVE], )dnl
AC_INIT([GNU Classpath],[0.97.2],[classpath@gnu.org],[classpath]) AC_INIT([GNU Classpath],[0.98-pre],[classpath@gnu.org],[classpath])
AC_CONFIG_SRCDIR(java/lang/System.java) AC_CONFIG_SRCDIR(java/lang/System.java)
dnl GCJ LOCAL dnl GCJ LOCAL
@ -284,6 +284,31 @@ AC_ARG_ENABLE([plugin],
AM_CONDITIONAL(CREATE_PLUGIN, test "x${COMPILE_PLUGIN}" = xyes) AM_CONDITIONAL(CREATE_PLUGIN, test "x${COMPILE_PLUGIN}" = xyes)
dnl ----------------------------------------------------------- dnl -----------------------------------------------------------
dnl Native java.math.BigInteger (enabled by default)
dnl -----------------------------------------------------------
AC_ARG_ENABLE([gmp],
[AS_HELP_STRING(--enable-gmp,
compile native java.math.BigInteger library (disabled by --disable-gmp) [default=yes])],
[case "${enableval}" in
yes|true) COMPILE_GMP=yes ;;
no|false) COMPILE_GMP=no ;;
*) COMPILE_GMP=yes ;;
esac],
[COMPILE_GMP=yes])
dnl -----------------------------------------------------------
dnl GJDoc (enabled by default)
dnl -----------------------------------------------------------
AC_ARG_ENABLE([gjdoc],
[AS_HELP_STRING(--disable-gjdoc,compile GJDoc (disabled by --disable-gjdoc) [default=yes])],
[case "${enableval}" in
yes) COMPILE_GJDOC=yes ;;
no) COMPILE_GJDOC=no ;;
*) COMPILE_GJDOC=yes ;;
esac],
[COMPILE_GJDOC=yes])
AM_CONDITIONAL(CREATE_GJDOC, test "x${COMPILE_GJDOC}" = xyes)
dnl GCJ LOCAL: Calculates and substitutes toolexeclibdir. $libdir is dnl GCJ LOCAL: Calculates and substitutes toolexeclibdir. $libdir is
dnl defined to the same value for all multilibs. We define toolexeclibdir dnl defined to the same value for all multilibs. We define toolexeclibdir
dnl so that we can refer to the multilib installation directories from dnl so that we can refer to the multilib installation directories from
@ -321,22 +346,21 @@ AC_ARG_WITH([glibj-dir],
AC_SUBST(glibjdir) AC_SUBST(glibjdir)
dnl ----------------------------------------------------------- dnl -----------------------------------------------------------
dnl Sets the VM name for use in tool wrapper scripts dnl Sets the Antlr jar to use for compiling gjdoc
dnl ----------------------------------------------------------- dnl -----------------------------------------------------------
AC_ARG_WITH([vm], AC_ARG_WITH([antlr-jar],
[AS_HELP_STRING(--with-vm,sets the VM binary name [default='${prefix}/bin/jamvm'])], [AS_HELP_STRING([--with-antlr-jar=file],[Use ANTLR from the specified jar file])],
[ [
VM_BINARY=${withval} ANTLR_JAR=$withval
], ],
[ [
VM_BINARY='${prefix}/bin/jamvm' ANTLR_JAR="$ANTLR_JAR"
]) ])
AC_SUBST(VM_BINARY)
dnl ----------------------------------------------------------- dnl -----------------------------------------------------------
dnl Regenerate headers at build time (disabled by default) dnl Regenerate headers at build time (enabled if not found)
dnl ----------------------------------------------------------- dnl -----------------------------------------------------------
AC_MSG_CHECKING([whether to regenerate the headers])
AC_ARG_ENABLE([regen-headers], AC_ARG_ENABLE([regen-headers],
[AS_HELP_STRING(--enable-regen-headers,automatically regenerate JNI headers [default=yes if headers don't exist])], [AS_HELP_STRING(--enable-regen-headers,automatically regenerate JNI headers [default=yes if headers don't exist])],
[case "${enableval}" in [case "${enableval}" in
@ -344,13 +368,33 @@ AC_ARG_ENABLE([regen-headers],
no) REGENERATE_JNI_HEADERS=no ;; no) REGENERATE_JNI_HEADERS=no ;;
*) REGENERATE_JNI_HEADERS=yes ;; *) REGENERATE_JNI_HEADERS=yes ;;
esac], esac],
[if test -e include/java_lang_VMSystem.h; then [if test -e ${srcdir}/include/java_lang_VMSystem.h; then
REGENERATE_JNI_HEADERS=no ; REGENERATE_JNI_HEADERS=no ;
else else
REGENERATE_JNI_HEADERS=yes ; REGENERATE_JNI_HEADERS=yes ;
fi]) fi])
AC_MSG_RESULT(${REGENERATE_JNI_HEADERS})
AM_CONDITIONAL(CREATE_JNI_HEADERS, test "x${REGENERATE_JNI_HEADERS}" = xyes) AM_CONDITIONAL(CREATE_JNI_HEADERS, test "x${REGENERATE_JNI_HEADERS}" = xyes)
dnl ------------------------------------------------------------------------
dnl Regenerate GJDoc parser at build time (enabled if not found)
dnl ------------------------------------------------------------------------
AC_MSG_CHECKING([whether to regenerate the GJDoc parser])
AC_ARG_ENABLE([regen-gjdoc-parser],
[AS_HELP_STRING(--enable-regen-gjdoc-parser,automatically regenerate the GJDoc parser [default=yes if generated source doesn't exist])],
[case "${enableval}" in
yes) REGENERATE_GJDOC_PARSER=yes ;;
no) REGENERATE_GJDOC_PARSER=no ;;
*) REGENERATE_GJDOC_PARSER=yes ;;
esac],
[if test -e ${srcdir}/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaLexer.java; then
REGENERATE_GJDOC_PARSER=no ;
else
REGENERATE_GJDOC_PARSER=yes ;
fi])
AC_MSG_RESULT(${REGENERATE_GJDOC_PARSER})
AM_CONDITIONAL(CREATE_GJDOC_PARSER, test "x${REGENERATE_GJDOC_PARSER}" = xyes)
dnl ----------------------------------------------------------- dnl -----------------------------------------------------------
dnl Enable tool wrapper binaries (disabled by default) dnl Enable tool wrapper binaries (disabled by default)
dnl ----------------------------------------------------------- dnl -----------------------------------------------------------
@ -422,6 +466,7 @@ if test "x${COMPILE_JNI}" = xyes; then
dnl Check for crt_externs.h on Darwin. dnl Check for crt_externs.h on Darwin.
dnl Check for netinet/in_systm.h, netinet/ip.h and net/if.h for Windows CE. dnl Check for netinet/in_systm.h, netinet/ip.h and net/if.h for Windows CE.
dnl Check for sys/loadavg.h for getloadavg() on Solaris 9. dnl Check for sys/loadavg.h for getloadavg() on Solaris 9.
dnl Check for sys/sockio.h for SIOCGIFFLAGS on OpenSolaris.
AC_CHECK_HEADERS([unistd.h sys/types.h sys/config.h sys/ioctl.h \ AC_CHECK_HEADERS([unistd.h sys/types.h sys/config.h sys/ioctl.h \
asm/ioctls.h \ asm/ioctls.h \
inttypes.h stdint.h utime.h sys/utime.h sys/filio.h \ inttypes.h stdint.h utime.h sys/utime.h sys/filio.h \
@ -434,14 +479,15 @@ if test "x${COMPILE_JNI}" = xyes; then
sys/event.h sys/epoll.h \ sys/event.h sys/epoll.h \
ifaddrs.h \ ifaddrs.h \
netinet/in_systm.h netinet/ip.h net/if.h \ netinet/in_systm.h netinet/ip.h net/if.h \
sys/loadavg.h]) sys/loadavg.h sys/sockio.h])
AC_EGREP_HEADER(uint32_t, stdint.h, AC_DEFINE(HAVE_INT32_DEFINED, 1, [Define to 1 if you have uint32_t])) AC_EGREP_HEADER(uint32_t, stdint.h, AC_DEFINE(HAVE_INT32_DEFINED, 1, [Define to 1 if you have uint32_t]))
AC_EGREP_HEADER(uint32_t, inttypes.h, AC_DEFINE(HAVE_INT32_DEFINED, 1, [Define to 1 if you have uint32_t])) AC_EGREP_HEADER(uint32_t, inttypes.h, AC_DEFINE(HAVE_INT32_DEFINED, 1, [Define to 1 if you have uint32_t]))
AC_EGREP_HEADER(u_int32_t, sys/types.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1, [Define to 1 if you have BSD u_int32_t])) AC_EGREP_HEADER(u_int32_t, sys/types.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1, [Define to 1 if you have BSD u_int32_t]))
AC_EGREP_HEADER(u_int32_t, sys/config.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1, [Define to 1 if you have BSD u_int32_t])) AC_EGREP_HEADER(u_int32_t, sys/config.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1, [Define to 1 if you have BSD u_int32_t]))
AC_SEARCH_LIBS([inet_pton],[nsl]) AC_SEARCH_LIBS([inet_pton],[nsl])
AC_CHECK_LIB([socket], [gethostname])
AC_CHECK_FUNCS([ftruncate fsync select \ AC_CHECK_FUNCS([ftruncate fsync select \
gethostname socket strerror fork pipe execve open close \ gethostname socket strerror fork pipe execve open close \
lseek fstat read readv write writev htonl memset htons connect \ lseek fstat read readv write writev htonl memset htons connect \
@ -755,6 +801,26 @@ if test "x${COMPILE_JNI}" = xyes; then
AC_SUBST(PLUGIN_DIR, $HOME/.mozilla/plugins/) AC_SUBST(PLUGIN_DIR, $HOME/.mozilla/plugins/)
fi fi
dnl Check for GNU MP library and header file
dnl for GNU MP versions >= 4.2 use __gmpz_combit; otherwise look for
dnl __gmpz_mul_si for earlier versions (>= 3.1).
dnl IMPORTANT: if you decide to look for __gmpz_combit, don't forget to
dnl change the name of the corresponding ac_ variable on lines 860...
if test "x${COMPILE_GMP}" = xyes; then
AC_CHECK_LIB(gmp, __gmpz_mul_si,
[GMP_CFLAGS=-I/usr/include
GMP_LIBS=-lgmp ],
[GMP_CFLAGS=
GMP_LIBS= ])
AC_SUBST(GMP_CFLAGS)
AC_SUBST(GMP_LIBS)
AC_CHECK_HEADERS([gmp.h])
fi
else
COMPILE_GMP=no
fi fi
if test "x${REGENERATE_JNI_HEADERS}" = xyes; then if test "x${REGENERATE_JNI_HEADERS}" = xyes; then
@ -948,6 +1014,24 @@ esac;
AM_CONDITIONAL(USE_PREBUILT_GLIBJ_ZIP, test x$use_glibj_zip = xtrue) AM_CONDITIONAL(USE_PREBUILT_GLIBJ_ZIP, test x$use_glibj_zip = xtrue)
AC_SUBST(PATH_TO_GLIBJ_ZIP) AC_SUBST(PATH_TO_GLIBJ_ZIP)
if test "x${TOOLSDIR}" != x; then
if test "x${COMPILE_WRAPPERS}" = xno && test "x${enable_java_maintainer_mode}" = xyes; then
AC_PROG_JAVA
fi
if test "x${COMPILE_GJDOC}" = xyes; then
AC_LIB_ANTLR
if test "x${REGENERATE_GJDOC_PARSER}" = xyes; then
dnl GCJ LOCAL
if test "x${enable_java_maintainer_mode}" = xyes; then
AC_PROG_JAVA
AC_PROG_ANTLR(2,7,1)
fi
dnl END GCJ LOCAL
fi
fi
fi
# Check for javac if we need to build either the class library, # Check for javac if we need to build either the class library,
# the examples or the tools # the examples or the tools
if test "x${use_glibj_zip}" = xfalse || \ if test "x${use_glibj_zip}" = xfalse || \
@ -1011,6 +1095,25 @@ dnl Add the default preference peer
dnl ----------------------------------------------------------- dnl -----------------------------------------------------------
AC_SUBST(DEFAULT_PREFS_PEER) AC_SUBST(DEFAULT_PREFS_PEER)
dnl -----------------------------------------------------------
dnl Set GNU MP related params
dnl -----------------------------------------------------------
WANT_NATIVE_BIG_INTEGER=false
if test "x${COMPILE_GMP}" = xyes; then
if test "x${ac_cv_lib_gmp___gmpz_mul_si}" = xyes; then
if test "x${ac_cv_header_gmp_h}" = xyes; then
WANT_NATIVE_BIG_INTEGER=true
AC_DEFINE(WITH_GNU_MP, 1, [Define to 1 if gmp is usable])
else
COMPILE_GMP=no
fi
else
COMPILE_GMP=no
fi
fi
AC_SUBST(WANT_NATIVE_BIG_INTEGER)
AM_CONDITIONAL(CREATE_GMPBI_LIBRARY, test "x${COMPILE_GMP}" = xyes)
dnl ----------------------------------------------------------- dnl -----------------------------------------------------------
dnl output files dnl output files
dnl ----------------------------------------------------------- dnl -----------------------------------------------------------
@ -1032,6 +1135,7 @@ native/jni/Makefile
native/jni/classpath/Makefile native/jni/classpath/Makefile
native/jni/java-io/Makefile native/jni/java-io/Makefile
native/jni/java-lang/Makefile native/jni/java-lang/Makefile
native/jni/java-math/Makefile
native/jni/java-net/Makefile native/jni/java-net/Makefile
native/jni/java-nio/Makefile native/jni/java-nio/Makefile
native/jni/java-util/Makefile native/jni/java-util/Makefile
@ -1087,6 +1191,12 @@ AC_CONFIG_COMMANDS([grmic],[chmod 755 tools/grmic])
AC_CONFIG_COMMANDS([gjavah], [chmod 755 tools/gjavah]) AC_CONFIG_COMMANDS([gjavah], [chmod 755 tools/gjavah])
]) ])
if test "x${COMPILE_GJDOC}" = xyes
then
AC_CONFIG_FILES([tools/gjdoc])
AC_CONFIG_COMMANDS([gjdoc], [chmod 755 tools/gjdoc])
fi
AC_CONFIG_COMMANDS([gen-classlist],[chmod 755 lib/gen-classlist.sh]) AC_CONFIG_COMMANDS([gen-classlist],[chmod 755 lib/gen-classlist.sh])
AC_CONFIG_COMMANDS([copy-vmresources],[chmod 755 lib/copy-vmresources.sh]) AC_CONFIG_COMMANDS([copy-vmresources],[chmod 755 lib/copy-vmresources.sh])
AC_OUTPUT AC_OUTPUT

View File

@ -28,7 +28,8 @@ TOOLS_MANFILES = \
grmid.1 \ grmid.1 \
grmiregistry.1 \ grmiregistry.1 \
gserialver.1 \ gserialver.1 \
gtnameserv.1 gtnameserv.1 \
gjdoc.1
POD2MAN = pod2man --center="GNU" --release="$(VERSION)" POD2MAN = pod2man --center="GNU" --release="$(VERSION)"
TEXI2POD = perl $(srcdir)/texi2pod.pl TEXI2POD = perl $(srcdir)/texi2pod.pl
@ -42,7 +43,7 @@ STAMP = echo timestamp >
.INTERMEDIATE: gappletviewer.pod gjarsigner.pod gjar.pod gjavah.pod \ .INTERMEDIATE: gappletviewer.pod gjarsigner.pod gjar.pod gjavah.pod \
gkeytool.pod gnative2ascii.pod gorbd.pod grmid.pod grmiregistry.pod \ gkeytool.pod gnative2ascii.pod gorbd.pod grmid.pod grmiregistry.pod \
gserialver.pod gtnameserv.pod gcjh.pod gserialver.pod gtnameserv.pod gcjh.pod gjdoc.pod
gappletviewer.pod: $(srcdir)/cp-tools.texinfo gappletviewer.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gappletviewer < $< > $@ -$(TEXI2POD) -D gappletviewer < $< > $@
@ -84,6 +85,12 @@ gserialver.pod: $(srcdir)/cp-tools.texinfo
gtnameserv.pod: $(srcdir)/cp-tools.texinfo gtnameserv.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gtnameserv < $< > $@ -$(TEXI2POD) -D gtnameserv < $< > $@
gjdoc.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gjdoc < $< > $@
# GCJ LOCAL CHANGE
#CLEANFILES = $(TOOLS_MANFILES)
# GCJ LOCAL CHANGE # GCJ LOCAL CHANGE
# The following commands allow us to release tarballs with the man pages # The following commands allow us to release tarballs with the man pages
# and info documentation prebuilt. This feature is enabled via # and info documentation prebuilt. This feature is enabled via
@ -102,6 +109,7 @@ stamp-geninsrc: $(TOOLS_MANFILES) cp-tools.info
-cp -p gjar.1 $(srcdir)/gjar.1 -cp -p gjar.1 $(srcdir)/gjar.1
-cp -p gjarsigner.1 $(srcdir)/gjarsigner.1 -cp -p gjarsigner.1 $(srcdir)/gjarsigner.1
-cp -p gjavah.1 $(srcdir)/gjavah.1 -cp -p gjavah.1 $(srcdir)/gjavah.1
-cp -p gjdoc.1 $(srcdir)/gjdoc.1
-cp -p gkeytool.1 $(srcdir)/gkeytool.1 -cp -p gkeytool.1 $(srcdir)/gkeytool.1
-cp -p gnative2ascii.1 $(srcdir)/gnative2ascii.1 -cp -p gnative2ascii.1 $(srcdir)/gnative2ascii.1
-cp -p gorbd.1 $(srcdir)/gorbd.1 -cp -p gorbd.1 $(srcdir)/gorbd.1
@ -118,6 +126,7 @@ MAINTAINERCLEANFILES = \
$(srcdir)/gjar.1 \ $(srcdir)/gjar.1 \
$(srcdir)/gjarsigner.1 \ $(srcdir)/gjarsigner.1 \
$(srcdir)/gjavah.1 \ $(srcdir)/gjavah.1 \
$(srcdir)/gjdoc.1 \
$(srcdir)/gkeytool.1 \ $(srcdir)/gkeytool.1 \
$(srcdir)/gnative2ascii.1 \ $(srcdir)/gnative2ascii.1 \
$(srcdir)/gorbd.1 \ $(srcdir)/gorbd.1 \

View File

@ -50,6 +50,9 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/../../ltsugar.m4 \ $(top_srcdir)/../../ltsugar.m4 \
$(top_srcdir)/../../ltversion.m4 \ $(top_srcdir)/../../ltversion.m4 \
$(top_srcdir)/../../lt~obsolete.m4 \ $(top_srcdir)/../../lt~obsolete.m4 \
$(top_srcdir)/m4/ac_prog_antlr.m4 \
$(top_srcdir)/m4/ac_prog_java.m4 \
$(top_srcdir)/m4/ac_prog_java_works.m4 \
$(top_srcdir)/m4/ac_prog_javac.m4 \ $(top_srcdir)/m4/ac_prog_javac.m4 \
$(top_srcdir)/m4/ac_prog_javac_works.m4 \ $(top_srcdir)/m4/ac_prog_javac_works.m4 \
$(top_srcdir)/m4/acattribute.m4 $(top_srcdir)/m4/accross.m4 \ $(top_srcdir)/m4/acattribute.m4 $(top_srcdir)/m4/accross.m4 \
@ -97,6 +100,8 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@ AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
ANTLR = @ANTLR@
ANTLR_JAR = @ANTLR_JAR@
AR = @AR@ AR = @AR@
AUTOCONF = @AUTOCONF@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
@ -128,6 +133,12 @@ CREATE_DSSI_LIBRARIES_FALSE = @CREATE_DSSI_LIBRARIES_FALSE@
CREATE_DSSI_LIBRARIES_TRUE = @CREATE_DSSI_LIBRARIES_TRUE@ CREATE_DSSI_LIBRARIES_TRUE = @CREATE_DSSI_LIBRARIES_TRUE@
CREATE_GCONF_PEER_LIBRARIES_FALSE = @CREATE_GCONF_PEER_LIBRARIES_FALSE@ CREATE_GCONF_PEER_LIBRARIES_FALSE = @CREATE_GCONF_PEER_LIBRARIES_FALSE@
CREATE_GCONF_PEER_LIBRARIES_TRUE = @CREATE_GCONF_PEER_LIBRARIES_TRUE@ CREATE_GCONF_PEER_LIBRARIES_TRUE = @CREATE_GCONF_PEER_LIBRARIES_TRUE@
CREATE_GJDOC_FALSE = @CREATE_GJDOC_FALSE@
CREATE_GJDOC_PARSER_FALSE = @CREATE_GJDOC_PARSER_FALSE@
CREATE_GJDOC_PARSER_TRUE = @CREATE_GJDOC_PARSER_TRUE@
CREATE_GJDOC_TRUE = @CREATE_GJDOC_TRUE@
CREATE_GMPBI_LIBRARY_FALSE = @CREATE_GMPBI_LIBRARY_FALSE@
CREATE_GMPBI_LIBRARY_TRUE = @CREATE_GMPBI_LIBRARY_TRUE@
CREATE_GSTREAMER_PEER_LIBRARIES_FALSE = @CREATE_GSTREAMER_PEER_LIBRARIES_FALSE@ CREATE_GSTREAMER_PEER_LIBRARIES_FALSE = @CREATE_GSTREAMER_PEER_LIBRARIES_FALSE@
CREATE_GSTREAMER_PEER_LIBRARIES_TRUE = @CREATE_GSTREAMER_PEER_LIBRARIES_TRUE@ CREATE_GSTREAMER_PEER_LIBRARIES_TRUE = @CREATE_GSTREAMER_PEER_LIBRARIES_TRUE@
CREATE_GTK_PEER_LIBRARIES_FALSE = @CREATE_GTK_PEER_LIBRARIES_FALSE@ CREATE_GTK_PEER_LIBRARIES_FALSE = @CREATE_GTK_PEER_LIBRARIES_FALSE@
@ -166,11 +177,12 @@ ERROR_CFLAGS = @ERROR_CFLAGS@
EXAMPLESDIR = @EXAMPLESDIR@ EXAMPLESDIR = @EXAMPLESDIR@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
EXTRA_CFLAGS = @EXTRA_CFLAGS@ EXTRA_CFLAGS = @EXTRA_CFLAGS@
FASTJAR = @FASTJAR@
FGREP = @FGREP@ FGREP = @FGREP@
FIND = @FIND@ FIND = @FIND@
FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@ FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@
FREETYPE2_LIBS = @FREETYPE2_LIBS@ FREETYPE2_LIBS = @FREETYPE2_LIBS@
GCJ_JAVAC_FALSE = @GCJ_JAVAC_FALSE@
GCJ_JAVAC_TRUE = @GCJ_JAVAC_TRUE@
GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@ GCONF_LIBS = @GCONF_LIBS@
GDK_CFLAGS = @GDK_CFLAGS@ GDK_CFLAGS = @GDK_CFLAGS@
@ -180,6 +192,8 @@ GENINSRC_TRUE = @GENINSRC_TRUE@
GJDOC = @GJDOC@ GJDOC = @GJDOC@
GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@ GLIB_LIBS = @GLIB_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
GMP_LIBS = @GMP_LIBS@
GREP = @GREP@ GREP = @GREP@
GSTREAMER_BASE_CFLAGS = @GSTREAMER_BASE_CFLAGS@ GSTREAMER_BASE_CFLAGS = @GSTREAMER_BASE_CFLAGS@
GSTREAMER_BASE_LIBS = @GSTREAMER_BASE_LIBS@ GSTREAMER_BASE_LIBS = @GSTREAMER_BASE_LIBS@
@ -201,7 +215,10 @@ INSTALL_GLIBJ_ZIP_TRUE = @INSTALL_GLIBJ_ZIP_TRUE@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JAR = @JAR@
JAVA = @JAVA@
JAVAC = @JAVAC@ JAVAC = @JAVAC@
JAVAC_IS_GCJ = @JAVAC_IS_GCJ@
JAVAC_MEM_OPT = @JAVAC_MEM_OPT@ JAVAC_MEM_OPT = @JAVAC_MEM_OPT@
JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@ JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@
JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@ JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@
@ -267,8 +284,10 @@ USE_ESCHER_TRUE = @USE_ESCHER_TRUE@
USE_PREBUILT_GLIBJ_ZIP_FALSE = @USE_PREBUILT_GLIBJ_ZIP_FALSE@ USE_PREBUILT_GLIBJ_ZIP_FALSE = @USE_PREBUILT_GLIBJ_ZIP_FALSE@
USE_PREBUILT_GLIBJ_ZIP_TRUE = @USE_PREBUILT_GLIBJ_ZIP_TRUE@ USE_PREBUILT_GLIBJ_ZIP_TRUE = @USE_PREBUILT_GLIBJ_ZIP_TRUE@
VERSION = @VERSION@ VERSION = @VERSION@
VM_BINARY = @VM_BINARY@ WANT_NATIVE_BIG_INTEGER = @WANT_NATIVE_BIG_INTEGER@
WARNING_CFLAGS = @WARNING_CFLAGS@ WARNING_CFLAGS = @WARNING_CFLAGS@
WITH_JAR_FALSE = @WITH_JAR_FALSE@
WITH_JAR_TRUE = @WITH_JAR_TRUE@
XML_CFLAGS = @XML_CFLAGS@ XML_CFLAGS = @XML_CFLAGS@
XML_LIBS = @XML_LIBS@ XML_LIBS = @XML_LIBS@
XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CFLAGS = @XSLT_CFLAGS@
@ -279,6 +298,7 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@ X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@
ZIP = @ZIP@ ZIP = @ZIP@
ac_ct_ANTLR = @ac_ct_ANTLR@
ac_ct_AR = @ac_ct_AR@ ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_CXX = @ac_ct_CXX@
@ -338,6 +358,7 @@ target_cpu = @target_cpu@
target_os = @target_os@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@ toolexeclibdir = @toolexeclibdir@
uudecode = @uudecode@
vm_classes = @vm_classes@ vm_classes = @vm_classes@
SUBDIRS = api SUBDIRS = api
EXTRA_DIST = README.jaxp texi2pod.pl $(man_MANS) EXTRA_DIST = README.jaxp texi2pod.pl $(man_MANS)
@ -356,13 +377,17 @@ TOOLS_MANFILES = \
grmid.1 \ grmid.1 \
grmiregistry.1 \ grmiregistry.1 \
gserialver.1 \ gserialver.1 \
gtnameserv.1 gtnameserv.1 \
gjdoc.1
POD2MAN = pod2man --center="GNU" --release="$(VERSION)" POD2MAN = pod2man --center="GNU" --release="$(VERSION)"
TEXI2POD = perl $(srcdir)/texi2pod.pl TEXI2POD = perl $(srcdir)/texi2pod.pl
STAMP = echo timestamp > STAMP = echo timestamp >
@GENINSRC_FALSE@STAMP_GENINSRC = @GENINSRC_FALSE@STAMP_GENINSRC =
# GCJ LOCAL CHANGE
#CLEANFILES = $(TOOLS_MANFILES)
# GCJ LOCAL CHANGE # GCJ LOCAL CHANGE
# The following commands allow us to release tarballs with the man pages # The following commands allow us to release tarballs with the man pages
# and info documentation prebuilt. This feature is enabled via # and info documentation prebuilt. This feature is enabled via
@ -374,6 +399,7 @@ MAINTAINERCLEANFILES = \
$(srcdir)/gjar.1 \ $(srcdir)/gjar.1 \
$(srcdir)/gjarsigner.1 \ $(srcdir)/gjarsigner.1 \
$(srcdir)/gjavah.1 \ $(srcdir)/gjavah.1 \
$(srcdir)/gjdoc.1 \
$(srcdir)/gkeytool.1 \ $(srcdir)/gkeytool.1 \
$(srcdir)/gnative2ascii.1 \ $(srcdir)/gnative2ascii.1 \
$(srcdir)/gorbd.1 \ $(srcdir)/gorbd.1 \
@ -892,7 +918,7 @@ docs: cp-hacking.ps cp-vmintegration.ps cp-tools.ps $(TOOLS_MANFILES)
.INTERMEDIATE: gappletviewer.pod gjarsigner.pod gjar.pod gjavah.pod \ .INTERMEDIATE: gappletviewer.pod gjarsigner.pod gjar.pod gjavah.pod \
gkeytool.pod gnative2ascii.pod gorbd.pod grmid.pod grmiregistry.pod \ gkeytool.pod gnative2ascii.pod gorbd.pod grmid.pod grmiregistry.pod \
gserialver.pod gtnameserv.pod gcjh.pod gserialver.pod gtnameserv.pod gcjh.pod gjdoc.pod
gappletviewer.pod: $(srcdir)/cp-tools.texinfo gappletviewer.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gappletviewer < $< > $@ -$(TEXI2POD) -D gappletviewer < $< > $@
@ -934,6 +960,9 @@ gserialver.pod: $(srcdir)/cp-tools.texinfo
gtnameserv.pod: $(srcdir)/cp-tools.texinfo gtnameserv.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gtnameserv < $< > $@ -$(TEXI2POD) -D gtnameserv < $< > $@
gjdoc.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gjdoc < $< > $@
all-local: $(STAMP_GENINSRC) all-local: $(STAMP_GENINSRC)
stamp-geninsrc: $(TOOLS_MANFILES) cp-tools.info stamp-geninsrc: $(TOOLS_MANFILES) cp-tools.info
@ -941,6 +970,7 @@ stamp-geninsrc: $(TOOLS_MANFILES) cp-tools.info
-cp -p gjar.1 $(srcdir)/gjar.1 -cp -p gjar.1 $(srcdir)/gjar.1
-cp -p gjarsigner.1 $(srcdir)/gjarsigner.1 -cp -p gjarsigner.1 $(srcdir)/gjarsigner.1
-cp -p gjavah.1 $(srcdir)/gjavah.1 -cp -p gjavah.1 $(srcdir)/gjavah.1
-cp -p gjdoc.1 $(srcdir)/gjdoc.1
-cp -p gkeytool.1 $(srcdir)/gkeytool.1 -cp -p gkeytool.1 $(srcdir)/gkeytool.1
-cp -p gnative2ascii.1 $(srcdir)/gnative2ascii.1 -cp -p gnative2ascii.1 $(srcdir)/gnative2ascii.1
-cp -p gorbd.1 $(srcdir)/gorbd.1 -cp -p gorbd.1 $(srcdir)/gorbd.1

View File

@ -51,6 +51,9 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/../../ltsugar.m4 \ $(top_srcdir)/../../ltsugar.m4 \
$(top_srcdir)/../../ltversion.m4 \ $(top_srcdir)/../../ltversion.m4 \
$(top_srcdir)/../../lt~obsolete.m4 \ $(top_srcdir)/../../lt~obsolete.m4 \
$(top_srcdir)/m4/ac_prog_antlr.m4 \
$(top_srcdir)/m4/ac_prog_java.m4 \
$(top_srcdir)/m4/ac_prog_java_works.m4 \
$(top_srcdir)/m4/ac_prog_javac.m4 \ $(top_srcdir)/m4/ac_prog_javac.m4 \
$(top_srcdir)/m4/ac_prog_javac_works.m4 \ $(top_srcdir)/m4/ac_prog_javac_works.m4 \
$(top_srcdir)/m4/acattribute.m4 $(top_srcdir)/m4/accross.m4 \ $(top_srcdir)/m4/acattribute.m4 $(top_srcdir)/m4/accross.m4 \
@ -74,6 +77,8 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@ AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
ANTLR = @ANTLR@
ANTLR_JAR = @ANTLR_JAR@
AR = @AR@ AR = @AR@
AUTOCONF = @AUTOCONF@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
@ -105,6 +110,12 @@ CREATE_DSSI_LIBRARIES_FALSE = @CREATE_DSSI_LIBRARIES_FALSE@
CREATE_DSSI_LIBRARIES_TRUE = @CREATE_DSSI_LIBRARIES_TRUE@ CREATE_DSSI_LIBRARIES_TRUE = @CREATE_DSSI_LIBRARIES_TRUE@
CREATE_GCONF_PEER_LIBRARIES_FALSE = @CREATE_GCONF_PEER_LIBRARIES_FALSE@ CREATE_GCONF_PEER_LIBRARIES_FALSE = @CREATE_GCONF_PEER_LIBRARIES_FALSE@
CREATE_GCONF_PEER_LIBRARIES_TRUE = @CREATE_GCONF_PEER_LIBRARIES_TRUE@ CREATE_GCONF_PEER_LIBRARIES_TRUE = @CREATE_GCONF_PEER_LIBRARIES_TRUE@
CREATE_GJDOC_FALSE = @CREATE_GJDOC_FALSE@
CREATE_GJDOC_PARSER_FALSE = @CREATE_GJDOC_PARSER_FALSE@
CREATE_GJDOC_PARSER_TRUE = @CREATE_GJDOC_PARSER_TRUE@
CREATE_GJDOC_TRUE = @CREATE_GJDOC_TRUE@
CREATE_GMPBI_LIBRARY_FALSE = @CREATE_GMPBI_LIBRARY_FALSE@
CREATE_GMPBI_LIBRARY_TRUE = @CREATE_GMPBI_LIBRARY_TRUE@
CREATE_GSTREAMER_PEER_LIBRARIES_FALSE = @CREATE_GSTREAMER_PEER_LIBRARIES_FALSE@ CREATE_GSTREAMER_PEER_LIBRARIES_FALSE = @CREATE_GSTREAMER_PEER_LIBRARIES_FALSE@
CREATE_GSTREAMER_PEER_LIBRARIES_TRUE = @CREATE_GSTREAMER_PEER_LIBRARIES_TRUE@ CREATE_GSTREAMER_PEER_LIBRARIES_TRUE = @CREATE_GSTREAMER_PEER_LIBRARIES_TRUE@
CREATE_GTK_PEER_LIBRARIES_FALSE = @CREATE_GTK_PEER_LIBRARIES_FALSE@ CREATE_GTK_PEER_LIBRARIES_FALSE = @CREATE_GTK_PEER_LIBRARIES_FALSE@
@ -143,11 +154,12 @@ ERROR_CFLAGS = @ERROR_CFLAGS@
EXAMPLESDIR = @EXAMPLESDIR@ EXAMPLESDIR = @EXAMPLESDIR@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
EXTRA_CFLAGS = @EXTRA_CFLAGS@ EXTRA_CFLAGS = @EXTRA_CFLAGS@
FASTJAR = @FASTJAR@
FGREP = @FGREP@ FGREP = @FGREP@
FIND = @FIND@ FIND = @FIND@
FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@ FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@
FREETYPE2_LIBS = @FREETYPE2_LIBS@ FREETYPE2_LIBS = @FREETYPE2_LIBS@
GCJ_JAVAC_FALSE = @GCJ_JAVAC_FALSE@
GCJ_JAVAC_TRUE = @GCJ_JAVAC_TRUE@
GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@ GCONF_LIBS = @GCONF_LIBS@
GDK_CFLAGS = @GDK_CFLAGS@ GDK_CFLAGS = @GDK_CFLAGS@
@ -157,6 +169,8 @@ GENINSRC_TRUE = @GENINSRC_TRUE@
GJDOC = @GJDOC@ GJDOC = @GJDOC@
GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@ GLIB_LIBS = @GLIB_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
GMP_LIBS = @GMP_LIBS@
GREP = @GREP@ GREP = @GREP@
GSTREAMER_BASE_CFLAGS = @GSTREAMER_BASE_CFLAGS@ GSTREAMER_BASE_CFLAGS = @GSTREAMER_BASE_CFLAGS@
GSTREAMER_BASE_LIBS = @GSTREAMER_BASE_LIBS@ GSTREAMER_BASE_LIBS = @GSTREAMER_BASE_LIBS@
@ -178,7 +192,10 @@ INSTALL_GLIBJ_ZIP_TRUE = @INSTALL_GLIBJ_ZIP_TRUE@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JAR = @JAR@
JAVA = @JAVA@
JAVAC = @JAVAC@ JAVAC = @JAVAC@
JAVAC_IS_GCJ = @JAVAC_IS_GCJ@
JAVAC_MEM_OPT = @JAVAC_MEM_OPT@ JAVAC_MEM_OPT = @JAVAC_MEM_OPT@
JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@ JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@
JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@ JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@
@ -244,8 +261,10 @@ USE_ESCHER_TRUE = @USE_ESCHER_TRUE@
USE_PREBUILT_GLIBJ_ZIP_FALSE = @USE_PREBUILT_GLIBJ_ZIP_FALSE@ USE_PREBUILT_GLIBJ_ZIP_FALSE = @USE_PREBUILT_GLIBJ_ZIP_FALSE@
USE_PREBUILT_GLIBJ_ZIP_TRUE = @USE_PREBUILT_GLIBJ_ZIP_TRUE@ USE_PREBUILT_GLIBJ_ZIP_TRUE = @USE_PREBUILT_GLIBJ_ZIP_TRUE@
VERSION = @VERSION@ VERSION = @VERSION@
VM_BINARY = @VM_BINARY@ WANT_NATIVE_BIG_INTEGER = @WANT_NATIVE_BIG_INTEGER@
WARNING_CFLAGS = @WARNING_CFLAGS@ WARNING_CFLAGS = @WARNING_CFLAGS@
WITH_JAR_FALSE = @WITH_JAR_FALSE@
WITH_JAR_TRUE = @WITH_JAR_TRUE@
XML_CFLAGS = @XML_CFLAGS@ XML_CFLAGS = @XML_CFLAGS@
XML_LIBS = @XML_LIBS@ XML_LIBS = @XML_LIBS@
XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CFLAGS = @XSLT_CFLAGS@
@ -256,6 +275,7 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@ X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@
ZIP = @ZIP@ ZIP = @ZIP@
ac_ct_ANTLR = @ac_ct_ANTLR@
ac_ct_AR = @ac_ct_AR@ ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_CXX = @ac_ct_CXX@
@ -315,6 +335,7 @@ target_cpu = @target_cpu@
target_os = @target_os@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@ toolexeclibdir = @toolexeclibdir@
uudecode = @uudecode@
vm_classes = @vm_classes@ vm_classes = @vm_classes@
@CREATE_API_DOCS_TRUE@noinst_DATA = html @CREATE_API_DOCS_TRUE@noinst_DATA = html
sourcepath = $(top_builddir):$(top_srcdir):$(top_srcdir)/vm/reference:$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/jsr166 sourcepath = $(top_builddir):$(top_srcdir):$(top_srcdir)/vm/reference:$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/jsr166

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,11 @@
## Input file for automake to generate the Makefile.in used by configure ## Input file for automake to generate the Makefile.in used by configure
GLIBJ_CLASSPATH='$(top_builddir)/lib/glibj.zip' GLIBJ_CLASSPATH='$(top_builddir)/lib/glibj.zip:$(top_builddir)/lib'
if GCJ_JAVAC
JCOMPILER = $(JAVAC) $(JAVACFLAGS) -fsource=1.5 -ftarget=1.5 --encoding=UTF-8 --bootclasspath=$(GLIBJ_CLASSPATH) --classpath='$(top_builddir)/tools/tools.zip'
else
JCOMPILER = $(JAVAC) $(JAVACFLAGS) -source 1.5 -target 1.5 -encoding UTF-8 -bootclasspath $(GLIBJ_CLASSPATH) -classpath '$(top_builddir)/tools/tools.zip' JCOMPILER = $(JAVAC) $(JAVACFLAGS) -source 1.5 -target 1.5 -encoding UTF-8 -bootclasspath $(GLIBJ_CLASSPATH) -classpath '$(top_builddir)/tools/tools.zip'
endif
# All our example java source files # All our example java source files
EXAMPLE_JAVA_FILES = $(srcdir)/gnu/classpath/examples/*/*.java $(srcdir)/gnu/classpath/examples/*/*/*.java $(srcdir)/gnu/classpath/examples/*/*/*/*.java EXAMPLE_JAVA_FILES = $(srcdir)/gnu/classpath/examples/*/*.java $(srcdir)/gnu/classpath/examples/*/*/*.java $(srcdir)/gnu/classpath/examples/*/*/*/*.java
@ -84,15 +88,21 @@ dist-hook:
# To generate the example zip just depend on the sources and ignore the # To generate the example zip just depend on the sources and ignore the
# class files. Always regenerate all .class files and remove them immediatly. # class files. Always regenerate all .class files and remove them immediatly.
# And copy the png icons we use to the classes dir so they get also included. # And copy the png icons we use to the classes dir so they get also included.
if WITH_JAR
CREATE_EXAMPLE_ZIP=$(JAR) cf ../$(EXAMPLE_ZIP) .
else
CREATE_EXAMPLE_ZIP=$(ZIP) -r ../$(EXAMPLE_ZIP) .
endif
$(EXAMPLE_ZIP): $(EXAMPLE_JAVA_FILES) $(EXAMPLE_ZIP): $(EXAMPLE_JAVA_FILES)
mkdir -p classes/gnu/classpath/examples/icons @mkdir_p@ classes/gnu/classpath/examples/icons
cp $(EXAMPLE_ICONS) classes/gnu/classpath/examples/icons cp $(EXAMPLE_ICONS) classes/gnu/classpath/examples/icons
mkdir -p classes/gnu/classpath/examples/swing @mkdir_p@ classes/gnu/classpath/examples/swing
cp $(EXAMPLE_HTML) classes/gnu/classpath/examples/swing cp $(EXAMPLE_HTML) classes/gnu/classpath/examples/swing
$(JCOMPILER) -d classes $(EXAMPLE_JAVA_FILES) $(JCOMPILER) -d classes $(EXAMPLE_JAVA_FILES)
(cd classes; \ (cd classes; \
if test "$(ZIP)" != ""; then $(ZIP) -r ../$(EXAMPLE_ZIP) .; fi; \ $(CREATE_EXAMPLE_ZIP); \
if test "$(FASTJAR)" != ""; then $(FASTJAR) cf ../$(EXAMPLE_ZIP) .; fi; \
cd ..) cd ..)
rm -rf classes rm -rf classes

View File

@ -52,6 +52,9 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/../../ltsugar.m4 \ $(top_srcdir)/../../ltsugar.m4 \
$(top_srcdir)/../../ltversion.m4 \ $(top_srcdir)/../../ltversion.m4 \
$(top_srcdir)/../../lt~obsolete.m4 \ $(top_srcdir)/../../lt~obsolete.m4 \
$(top_srcdir)/m4/ac_prog_antlr.m4 \
$(top_srcdir)/m4/ac_prog_java.m4 \
$(top_srcdir)/m4/ac_prog_java_works.m4 \
$(top_srcdir)/m4/ac_prog_javac.m4 \ $(top_srcdir)/m4/ac_prog_javac.m4 \
$(top_srcdir)/m4/ac_prog_javac_works.m4 \ $(top_srcdir)/m4/ac_prog_javac_works.m4 \
$(top_srcdir)/m4/acattribute.m4 $(top_srcdir)/m4/accross.m4 \ $(top_srcdir)/m4/acattribute.m4 $(top_srcdir)/m4/accross.m4 \
@ -83,6 +86,8 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@ AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
ANTLR = @ANTLR@
ANTLR_JAR = @ANTLR_JAR@
AR = @AR@ AR = @AR@
AUTOCONF = @AUTOCONF@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
@ -114,6 +119,12 @@ CREATE_DSSI_LIBRARIES_FALSE = @CREATE_DSSI_LIBRARIES_FALSE@
CREATE_DSSI_LIBRARIES_TRUE = @CREATE_DSSI_LIBRARIES_TRUE@ CREATE_DSSI_LIBRARIES_TRUE = @CREATE_DSSI_LIBRARIES_TRUE@
CREATE_GCONF_PEER_LIBRARIES_FALSE = @CREATE_GCONF_PEER_LIBRARIES_FALSE@ CREATE_GCONF_PEER_LIBRARIES_FALSE = @CREATE_GCONF_PEER_LIBRARIES_FALSE@
CREATE_GCONF_PEER_LIBRARIES_TRUE = @CREATE_GCONF_PEER_LIBRARIES_TRUE@ CREATE_GCONF_PEER_LIBRARIES_TRUE = @CREATE_GCONF_PEER_LIBRARIES_TRUE@
CREATE_GJDOC_FALSE = @CREATE_GJDOC_FALSE@
CREATE_GJDOC_PARSER_FALSE = @CREATE_GJDOC_PARSER_FALSE@
CREATE_GJDOC_PARSER_TRUE = @CREATE_GJDOC_PARSER_TRUE@
CREATE_GJDOC_TRUE = @CREATE_GJDOC_TRUE@
CREATE_GMPBI_LIBRARY_FALSE = @CREATE_GMPBI_LIBRARY_FALSE@
CREATE_GMPBI_LIBRARY_TRUE = @CREATE_GMPBI_LIBRARY_TRUE@
CREATE_GSTREAMER_PEER_LIBRARIES_FALSE = @CREATE_GSTREAMER_PEER_LIBRARIES_FALSE@ CREATE_GSTREAMER_PEER_LIBRARIES_FALSE = @CREATE_GSTREAMER_PEER_LIBRARIES_FALSE@
CREATE_GSTREAMER_PEER_LIBRARIES_TRUE = @CREATE_GSTREAMER_PEER_LIBRARIES_TRUE@ CREATE_GSTREAMER_PEER_LIBRARIES_TRUE = @CREATE_GSTREAMER_PEER_LIBRARIES_TRUE@
CREATE_GTK_PEER_LIBRARIES_FALSE = @CREATE_GTK_PEER_LIBRARIES_FALSE@ CREATE_GTK_PEER_LIBRARIES_FALSE = @CREATE_GTK_PEER_LIBRARIES_FALSE@
@ -152,11 +163,12 @@ ERROR_CFLAGS = @ERROR_CFLAGS@
EXAMPLESDIR = @EXAMPLESDIR@ EXAMPLESDIR = @EXAMPLESDIR@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
EXTRA_CFLAGS = @EXTRA_CFLAGS@ EXTRA_CFLAGS = @EXTRA_CFLAGS@
FASTJAR = @FASTJAR@
FGREP = @FGREP@ FGREP = @FGREP@
FIND = @FIND@ FIND = @FIND@
FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@ FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@
FREETYPE2_LIBS = @FREETYPE2_LIBS@ FREETYPE2_LIBS = @FREETYPE2_LIBS@
GCJ_JAVAC_FALSE = @GCJ_JAVAC_FALSE@
GCJ_JAVAC_TRUE = @GCJ_JAVAC_TRUE@
GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@ GCONF_LIBS = @GCONF_LIBS@
GDK_CFLAGS = @GDK_CFLAGS@ GDK_CFLAGS = @GDK_CFLAGS@
@ -166,6 +178,8 @@ GENINSRC_TRUE = @GENINSRC_TRUE@
GJDOC = @GJDOC@ GJDOC = @GJDOC@
GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@ GLIB_LIBS = @GLIB_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
GMP_LIBS = @GMP_LIBS@
GREP = @GREP@ GREP = @GREP@
GSTREAMER_BASE_CFLAGS = @GSTREAMER_BASE_CFLAGS@ GSTREAMER_BASE_CFLAGS = @GSTREAMER_BASE_CFLAGS@
GSTREAMER_BASE_LIBS = @GSTREAMER_BASE_LIBS@ GSTREAMER_BASE_LIBS = @GSTREAMER_BASE_LIBS@
@ -187,7 +201,10 @@ INSTALL_GLIBJ_ZIP_TRUE = @INSTALL_GLIBJ_ZIP_TRUE@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JAR = @JAR@
JAVA = @JAVA@
JAVAC = @JAVAC@ JAVAC = @JAVAC@
JAVAC_IS_GCJ = @JAVAC_IS_GCJ@
JAVAC_MEM_OPT = @JAVAC_MEM_OPT@ JAVAC_MEM_OPT = @JAVAC_MEM_OPT@
JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@ JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@
JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@ JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@
@ -253,8 +270,10 @@ USE_ESCHER_TRUE = @USE_ESCHER_TRUE@
USE_PREBUILT_GLIBJ_ZIP_FALSE = @USE_PREBUILT_GLIBJ_ZIP_FALSE@ USE_PREBUILT_GLIBJ_ZIP_FALSE = @USE_PREBUILT_GLIBJ_ZIP_FALSE@
USE_PREBUILT_GLIBJ_ZIP_TRUE = @USE_PREBUILT_GLIBJ_ZIP_TRUE@ USE_PREBUILT_GLIBJ_ZIP_TRUE = @USE_PREBUILT_GLIBJ_ZIP_TRUE@
VERSION = @VERSION@ VERSION = @VERSION@
VM_BINARY = @VM_BINARY@ WANT_NATIVE_BIG_INTEGER = @WANT_NATIVE_BIG_INTEGER@
WARNING_CFLAGS = @WARNING_CFLAGS@ WARNING_CFLAGS = @WARNING_CFLAGS@
WITH_JAR_FALSE = @WITH_JAR_FALSE@
WITH_JAR_TRUE = @WITH_JAR_TRUE@
XML_CFLAGS = @XML_CFLAGS@ XML_CFLAGS = @XML_CFLAGS@
XML_LIBS = @XML_LIBS@ XML_LIBS = @XML_LIBS@
XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CFLAGS = @XSLT_CFLAGS@
@ -265,6 +284,7 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@ X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@
ZIP = @ZIP@ ZIP = @ZIP@
ac_ct_ANTLR = @ac_ct_ANTLR@
ac_ct_AR = @ac_ct_AR@ ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_CXX = @ac_ct_CXX@
@ -324,9 +344,11 @@ target_cpu = @target_cpu@
target_os = @target_os@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@ toolexeclibdir = @toolexeclibdir@
uudecode = @uudecode@
vm_classes = @vm_classes@ vm_classes = @vm_classes@
GLIBJ_CLASSPATH = '$(top_builddir)/lib/glibj.zip' GLIBJ_CLASSPATH = '$(top_builddir)/lib/glibj.zip:$(top_builddir)/lib'
JCOMPILER = $(JAVAC) $(JAVACFLAGS) -source 1.5 -target 1.5 -encoding UTF-8 -bootclasspath $(GLIBJ_CLASSPATH) -classpath '$(top_builddir)/tools/tools.zip' @GCJ_JAVAC_FALSE@JCOMPILER = $(JAVAC) $(JAVACFLAGS) -source 1.5 -target 1.5 -encoding UTF-8 -bootclasspath $(GLIBJ_CLASSPATH) -classpath '$(top_builddir)/tools/tools.zip'
@GCJ_JAVAC_TRUE@JCOMPILER = $(JAVAC) $(JAVACFLAGS) -fsource=1.5 -ftarget=1.5 --encoding=UTF-8 --bootclasspath=$(GLIBJ_CLASSPATH) --classpath='$(top_builddir)/tools/tools.zip'
# All our example java source files # All our example java source files
EXAMPLE_JAVA_FILES = $(srcdir)/gnu/classpath/examples/*/*.java $(srcdir)/gnu/classpath/examples/*/*/*.java $(srcdir)/gnu/classpath/examples/*/*/*/*.java EXAMPLE_JAVA_FILES = $(srcdir)/gnu/classpath/examples/*/*.java $(srcdir)/gnu/classpath/examples/*/*/*.java $(srcdir)/gnu/classpath/examples/*/*/*/*.java
@ -362,6 +384,12 @@ exampledir = $(pkgdatadir)/examples
# Make sure everything is included in the distribution. # Make sure everything is included in the distribution.
EXTRA_DIST = README Makefile.jawt.in Makefile.java2d.in EXTRA_DIST = README Makefile.jawt.in Makefile.java2d.in
@WITH_JAR_FALSE@CREATE_EXAMPLE_ZIP = $(ZIP) -r ../$(EXAMPLE_ZIP) .
# To generate the example zip just depend on the sources and ignore the
# class files. Always regenerate all .class files and remove them immediatly.
# And copy the png icons we use to the classes dir so they get also included.
@WITH_JAR_TRUE@CREATE_EXAMPLE_ZIP = $(JAR) cf ../$(EXAMPLE_ZIP) .
all: $(BUILT_SOURCES) all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am $(MAKE) $(AM_MAKEFLAGS) all-am
@ -599,18 +627,14 @@ dist-hook:
cp -p $$file $(distdir)/$$f; \ cp -p $$file $(distdir)/$$f; \
done done
# To generate the example zip just depend on the sources and ignore the
# class files. Always regenerate all .class files and remove them immediatly.
# And copy the png icons we use to the classes dir so they get also included.
$(EXAMPLE_ZIP): $(EXAMPLE_JAVA_FILES) $(EXAMPLE_ZIP): $(EXAMPLE_JAVA_FILES)
mkdir -p classes/gnu/classpath/examples/icons @mkdir_p@ classes/gnu/classpath/examples/icons
cp $(EXAMPLE_ICONS) classes/gnu/classpath/examples/icons cp $(EXAMPLE_ICONS) classes/gnu/classpath/examples/icons
mkdir -p classes/gnu/classpath/examples/swing @mkdir_p@ classes/gnu/classpath/examples/swing
cp $(EXAMPLE_HTML) classes/gnu/classpath/examples/swing cp $(EXAMPLE_HTML) classes/gnu/classpath/examples/swing
$(JCOMPILER) -d classes $(EXAMPLE_JAVA_FILES) $(JCOMPILER) -d classes $(EXAMPLE_JAVA_FILES)
(cd classes; \ (cd classes; \
if test "$(ZIP)" != ""; then $(ZIP) -r ../$(EXAMPLE_ZIP) .; fi; \ $(CREATE_EXAMPLE_ZIP); \
if test "$(FASTJAR)" != ""; then $(FASTJAR) cf ../$(EXAMPLE_ZIP) .; fi; \
cd ..) cd ..)
rm -rf classes rm -rf classes

View File

@ -145,7 +145,7 @@ public class DemoServant
{ {
System.out.println("SERVER: ***** Transferring tree"); System.out.println("SERVER: ***** Transferring tree");
StringBuffer b = new StringBuffer(); StringBuilder b = new StringBuilder();
// This both creates the tree string representation // This both creates the tree string representation
// and changes the TreeNode names. // and changes the TreeNode names.
@ -214,7 +214,7 @@ public class DemoServant
* @param b the buffer to collect the string representation. * @param b the buffer to collect the string representation.
* @param n the rott tree TreeNode. * @param n the rott tree TreeNode.
*/ */
private void getImage(StringBuffer b, TreeNode n) private void getImage(StringBuilder b, TreeNode n)
{ {
b.append(n.name); b.append(n.name);
n.name = n.name + "++"; n.name = n.name + "++";

View File

@ -269,7 +269,7 @@ public class DirectTest
object.passTree(nh); object.passTree(nh);
// Convert the returned tree to some strig representation. // Convert the returned tree to some strig representation.
StringBuffer img = new StringBuffer(); StringBuilder img = new StringBuilder();
getImage(img, nh.value); getImage(img, nh.value);
System.out.println("Returned tree: " + img.toString()); System.out.println("Returned tree: " + img.toString());
@ -314,7 +314,7 @@ public class DirectTest
* @param b the string buffer to accumulate the representation. * @param b the string buffer to accumulate the representation.
* @param n the tree (root TreeNode). * @param n the tree (root TreeNode).
*/ */
private void getImage(StringBuffer b, TreeNode n) private void getImage(StringBuilder b, TreeNode n)
{ {
b.append(n.name); b.append(n.name);
b.append(": ("); b.append(": (");

View File

@ -79,7 +79,7 @@ public class IorReader
{ {
InputStreamReader r = new InputStreamReader(u.openStream()); InputStreamReader r = new InputStreamReader(u.openStream());
StringBuffer b = new StringBuffer(); StringBuilder b = new StringBuilder();
int c; int c;
while ((c = r.read()) > 0) while ((c = r.read()) > 0)

View File

@ -147,7 +147,7 @@ public class X5Server
int length = GameManagerImpl.ior.length(); int length = GameManagerImpl.ior.length();
StringBuffer b = new StringBuffer(); StringBuilder b = new StringBuilder();
b.append("HTTP/1.0 200 OK\r\n"); b.append("HTTP/1.0 200 OK\r\n");
b.append("Content-Length: " + length + "\r\n"); b.append("Content-Length: " + length + "\r\n");
b.append("Connection: close\r\n"); b.append("Connection: close\r\n");

View File

@ -94,7 +94,7 @@ public class Demo
if (node == null) if (node == null)
return; return;
StringBuffer tab = new StringBuffer(); StringBuilder tab = new StringBuilder();
stream.println(); stream.println();
for (int i = 0; i < ident; i++) for (int i = 0; i < ident; i++)
{ {

View File

@ -50,6 +50,9 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/../../ltsugar.m4 \ $(top_srcdir)/../../ltsugar.m4 \
$(top_srcdir)/../../ltversion.m4 \ $(top_srcdir)/../../ltversion.m4 \
$(top_srcdir)/../../lt~obsolete.m4 \ $(top_srcdir)/../../lt~obsolete.m4 \
$(top_srcdir)/m4/ac_prog_antlr.m4 \
$(top_srcdir)/m4/ac_prog_java.m4 \
$(top_srcdir)/m4/ac_prog_java_works.m4 \
$(top_srcdir)/m4/ac_prog_javac.m4 \ $(top_srcdir)/m4/ac_prog_javac.m4 \
$(top_srcdir)/m4/ac_prog_javac_works.m4 \ $(top_srcdir)/m4/ac_prog_javac_works.m4 \
$(top_srcdir)/m4/acattribute.m4 $(top_srcdir)/m4/accross.m4 \ $(top_srcdir)/m4/acattribute.m4 $(top_srcdir)/m4/accross.m4 \
@ -81,6 +84,8 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@ AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
ANTLR = @ANTLR@
ANTLR_JAR = @ANTLR_JAR@
AR = @AR@ AR = @AR@
AUTOCONF = @AUTOCONF@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
@ -112,6 +117,12 @@ CREATE_DSSI_LIBRARIES_FALSE = @CREATE_DSSI_LIBRARIES_FALSE@
CREATE_DSSI_LIBRARIES_TRUE = @CREATE_DSSI_LIBRARIES_TRUE@ CREATE_DSSI_LIBRARIES_TRUE = @CREATE_DSSI_LIBRARIES_TRUE@
CREATE_GCONF_PEER_LIBRARIES_FALSE = @CREATE_GCONF_PEER_LIBRARIES_FALSE@ CREATE_GCONF_PEER_LIBRARIES_FALSE = @CREATE_GCONF_PEER_LIBRARIES_FALSE@
CREATE_GCONF_PEER_LIBRARIES_TRUE = @CREATE_GCONF_PEER_LIBRARIES_TRUE@ CREATE_GCONF_PEER_LIBRARIES_TRUE = @CREATE_GCONF_PEER_LIBRARIES_TRUE@
CREATE_GJDOC_FALSE = @CREATE_GJDOC_FALSE@
CREATE_GJDOC_PARSER_FALSE = @CREATE_GJDOC_PARSER_FALSE@
CREATE_GJDOC_PARSER_TRUE = @CREATE_GJDOC_PARSER_TRUE@
CREATE_GJDOC_TRUE = @CREATE_GJDOC_TRUE@
CREATE_GMPBI_LIBRARY_FALSE = @CREATE_GMPBI_LIBRARY_FALSE@
CREATE_GMPBI_LIBRARY_TRUE = @CREATE_GMPBI_LIBRARY_TRUE@
CREATE_GSTREAMER_PEER_LIBRARIES_FALSE = @CREATE_GSTREAMER_PEER_LIBRARIES_FALSE@ CREATE_GSTREAMER_PEER_LIBRARIES_FALSE = @CREATE_GSTREAMER_PEER_LIBRARIES_FALSE@
CREATE_GSTREAMER_PEER_LIBRARIES_TRUE = @CREATE_GSTREAMER_PEER_LIBRARIES_TRUE@ CREATE_GSTREAMER_PEER_LIBRARIES_TRUE = @CREATE_GSTREAMER_PEER_LIBRARIES_TRUE@
CREATE_GTK_PEER_LIBRARIES_FALSE = @CREATE_GTK_PEER_LIBRARIES_FALSE@ CREATE_GTK_PEER_LIBRARIES_FALSE = @CREATE_GTK_PEER_LIBRARIES_FALSE@
@ -150,11 +161,12 @@ ERROR_CFLAGS = @ERROR_CFLAGS@
EXAMPLESDIR = @EXAMPLESDIR@ EXAMPLESDIR = @EXAMPLESDIR@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
EXTRA_CFLAGS = @EXTRA_CFLAGS@ EXTRA_CFLAGS = @EXTRA_CFLAGS@
FASTJAR = @FASTJAR@
FGREP = @FGREP@ FGREP = @FGREP@
FIND = @FIND@ FIND = @FIND@
FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@ FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@
FREETYPE2_LIBS = @FREETYPE2_LIBS@ FREETYPE2_LIBS = @FREETYPE2_LIBS@
GCJ_JAVAC_FALSE = @GCJ_JAVAC_FALSE@
GCJ_JAVAC_TRUE = @GCJ_JAVAC_TRUE@
GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@ GCONF_LIBS = @GCONF_LIBS@
GDK_CFLAGS = @GDK_CFLAGS@ GDK_CFLAGS = @GDK_CFLAGS@
@ -164,6 +176,8 @@ GENINSRC_TRUE = @GENINSRC_TRUE@
GJDOC = @GJDOC@ GJDOC = @GJDOC@
GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@ GLIB_LIBS = @GLIB_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
GMP_LIBS = @GMP_LIBS@
GREP = @GREP@ GREP = @GREP@
GSTREAMER_BASE_CFLAGS = @GSTREAMER_BASE_CFLAGS@ GSTREAMER_BASE_CFLAGS = @GSTREAMER_BASE_CFLAGS@
GSTREAMER_BASE_LIBS = @GSTREAMER_BASE_LIBS@ GSTREAMER_BASE_LIBS = @GSTREAMER_BASE_LIBS@
@ -185,7 +199,10 @@ INSTALL_GLIBJ_ZIP_TRUE = @INSTALL_GLIBJ_ZIP_TRUE@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JAR = @JAR@
JAVA = @JAVA@
JAVAC = @JAVAC@ JAVAC = @JAVAC@
JAVAC_IS_GCJ = @JAVAC_IS_GCJ@
JAVAC_MEM_OPT = @JAVAC_MEM_OPT@ JAVAC_MEM_OPT = @JAVAC_MEM_OPT@
JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@ JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@
JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@ JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@
@ -251,8 +268,10 @@ USE_ESCHER_TRUE = @USE_ESCHER_TRUE@
USE_PREBUILT_GLIBJ_ZIP_FALSE = @USE_PREBUILT_GLIBJ_ZIP_FALSE@ USE_PREBUILT_GLIBJ_ZIP_FALSE = @USE_PREBUILT_GLIBJ_ZIP_FALSE@
USE_PREBUILT_GLIBJ_ZIP_TRUE = @USE_PREBUILT_GLIBJ_ZIP_TRUE@ USE_PREBUILT_GLIBJ_ZIP_TRUE = @USE_PREBUILT_GLIBJ_ZIP_TRUE@
VERSION = @VERSION@ VERSION = @VERSION@
VM_BINARY = @VM_BINARY@ WANT_NATIVE_BIG_INTEGER = @WANT_NATIVE_BIG_INTEGER@
WARNING_CFLAGS = @WARNING_CFLAGS@ WARNING_CFLAGS = @WARNING_CFLAGS@
WITH_JAR_FALSE = @WITH_JAR_FALSE@
WITH_JAR_TRUE = @WITH_JAR_TRUE@
XML_CFLAGS = @XML_CFLAGS@ XML_CFLAGS = @XML_CFLAGS@
XML_LIBS = @XML_LIBS@ XML_LIBS = @XML_LIBS@
XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CFLAGS = @XSLT_CFLAGS@
@ -263,6 +282,7 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@ X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@
ZIP = @ZIP@ ZIP = @ZIP@
ac_ct_ANTLR = @ac_ct_ANTLR@
ac_ct_AR = @ac_ct_AR@ ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_CXX = @ac_ct_CXX@
@ -322,6 +342,7 @@ target_cpu = @target_cpu@
target_os = @target_os@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@ toolexeclibdir = @toolexeclibdir@
uudecode = @uudecode@
vm_classes = @vm_classes@ vm_classes = @vm_classes@
SUBDIRS = sax w3c_dom relaxngDatatype jsr166 SUBDIRS = sax w3c_dom relaxngDatatype jsr166
EXTRA_DIST = README EXTRA_DIST = README

View File

@ -50,6 +50,9 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/../../ltsugar.m4 \ $(top_srcdir)/../../ltsugar.m4 \
$(top_srcdir)/../../ltversion.m4 \ $(top_srcdir)/../../ltversion.m4 \
$(top_srcdir)/../../lt~obsolete.m4 \ $(top_srcdir)/../../lt~obsolete.m4 \
$(top_srcdir)/m4/ac_prog_antlr.m4 \
$(top_srcdir)/m4/ac_prog_java.m4 \
$(top_srcdir)/m4/ac_prog_java_works.m4 \
$(top_srcdir)/m4/ac_prog_javac.m4 \ $(top_srcdir)/m4/ac_prog_javac.m4 \
$(top_srcdir)/m4/ac_prog_javac_works.m4 \ $(top_srcdir)/m4/ac_prog_javac_works.m4 \
$(top_srcdir)/m4/acattribute.m4 $(top_srcdir)/m4/accross.m4 \ $(top_srcdir)/m4/acattribute.m4 $(top_srcdir)/m4/accross.m4 \
@ -72,6 +75,8 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@ AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
ANTLR = @ANTLR@
ANTLR_JAR = @ANTLR_JAR@
AR = @AR@ AR = @AR@
AUTOCONF = @AUTOCONF@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
@ -103,6 +108,12 @@ CREATE_DSSI_LIBRARIES_FALSE = @CREATE_DSSI_LIBRARIES_FALSE@
CREATE_DSSI_LIBRARIES_TRUE = @CREATE_DSSI_LIBRARIES_TRUE@ CREATE_DSSI_LIBRARIES_TRUE = @CREATE_DSSI_LIBRARIES_TRUE@
CREATE_GCONF_PEER_LIBRARIES_FALSE = @CREATE_GCONF_PEER_LIBRARIES_FALSE@ CREATE_GCONF_PEER_LIBRARIES_FALSE = @CREATE_GCONF_PEER_LIBRARIES_FALSE@
CREATE_GCONF_PEER_LIBRARIES_TRUE = @CREATE_GCONF_PEER_LIBRARIES_TRUE@ CREATE_GCONF_PEER_LIBRARIES_TRUE = @CREATE_GCONF_PEER_LIBRARIES_TRUE@
CREATE_GJDOC_FALSE = @CREATE_GJDOC_FALSE@
CREATE_GJDOC_PARSER_FALSE = @CREATE_GJDOC_PARSER_FALSE@
CREATE_GJDOC_PARSER_TRUE = @CREATE_GJDOC_PARSER_TRUE@
CREATE_GJDOC_TRUE = @CREATE_GJDOC_TRUE@
CREATE_GMPBI_LIBRARY_FALSE = @CREATE_GMPBI_LIBRARY_FALSE@
CREATE_GMPBI_LIBRARY_TRUE = @CREATE_GMPBI_LIBRARY_TRUE@
CREATE_GSTREAMER_PEER_LIBRARIES_FALSE = @CREATE_GSTREAMER_PEER_LIBRARIES_FALSE@ CREATE_GSTREAMER_PEER_LIBRARIES_FALSE = @CREATE_GSTREAMER_PEER_LIBRARIES_FALSE@
CREATE_GSTREAMER_PEER_LIBRARIES_TRUE = @CREATE_GSTREAMER_PEER_LIBRARIES_TRUE@ CREATE_GSTREAMER_PEER_LIBRARIES_TRUE = @CREATE_GSTREAMER_PEER_LIBRARIES_TRUE@
CREATE_GTK_PEER_LIBRARIES_FALSE = @CREATE_GTK_PEER_LIBRARIES_FALSE@ CREATE_GTK_PEER_LIBRARIES_FALSE = @CREATE_GTK_PEER_LIBRARIES_FALSE@
@ -141,11 +152,12 @@ ERROR_CFLAGS = @ERROR_CFLAGS@
EXAMPLESDIR = @EXAMPLESDIR@ EXAMPLESDIR = @EXAMPLESDIR@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
EXTRA_CFLAGS = @EXTRA_CFLAGS@ EXTRA_CFLAGS = @EXTRA_CFLAGS@
FASTJAR = @FASTJAR@
FGREP = @FGREP@ FGREP = @FGREP@
FIND = @FIND@ FIND = @FIND@
FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@ FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@
FREETYPE2_LIBS = @FREETYPE2_LIBS@ FREETYPE2_LIBS = @FREETYPE2_LIBS@
GCJ_JAVAC_FALSE = @GCJ_JAVAC_FALSE@
GCJ_JAVAC_TRUE = @GCJ_JAVAC_TRUE@
GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@ GCONF_LIBS = @GCONF_LIBS@
GDK_CFLAGS = @GDK_CFLAGS@ GDK_CFLAGS = @GDK_CFLAGS@
@ -155,6 +167,8 @@ GENINSRC_TRUE = @GENINSRC_TRUE@
GJDOC = @GJDOC@ GJDOC = @GJDOC@
GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@ GLIB_LIBS = @GLIB_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
GMP_LIBS = @GMP_LIBS@
GREP = @GREP@ GREP = @GREP@
GSTREAMER_BASE_CFLAGS = @GSTREAMER_BASE_CFLAGS@ GSTREAMER_BASE_CFLAGS = @GSTREAMER_BASE_CFLAGS@
GSTREAMER_BASE_LIBS = @GSTREAMER_BASE_LIBS@ GSTREAMER_BASE_LIBS = @GSTREAMER_BASE_LIBS@
@ -176,7 +190,10 @@ INSTALL_GLIBJ_ZIP_TRUE = @INSTALL_GLIBJ_ZIP_TRUE@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JAR = @JAR@
JAVA = @JAVA@
JAVAC = @JAVAC@ JAVAC = @JAVAC@
JAVAC_IS_GCJ = @JAVAC_IS_GCJ@
JAVAC_MEM_OPT = @JAVAC_MEM_OPT@ JAVAC_MEM_OPT = @JAVAC_MEM_OPT@
JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@ JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@
JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@ JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@
@ -242,8 +259,10 @@ USE_ESCHER_TRUE = @USE_ESCHER_TRUE@
USE_PREBUILT_GLIBJ_ZIP_FALSE = @USE_PREBUILT_GLIBJ_ZIP_FALSE@ USE_PREBUILT_GLIBJ_ZIP_FALSE = @USE_PREBUILT_GLIBJ_ZIP_FALSE@
USE_PREBUILT_GLIBJ_ZIP_TRUE = @USE_PREBUILT_GLIBJ_ZIP_TRUE@ USE_PREBUILT_GLIBJ_ZIP_TRUE = @USE_PREBUILT_GLIBJ_ZIP_TRUE@
VERSION = @VERSION@ VERSION = @VERSION@
VM_BINARY = @VM_BINARY@ WANT_NATIVE_BIG_INTEGER = @WANT_NATIVE_BIG_INTEGER@
WARNING_CFLAGS = @WARNING_CFLAGS@ WARNING_CFLAGS = @WARNING_CFLAGS@
WITH_JAR_FALSE = @WITH_JAR_FALSE@
WITH_JAR_TRUE = @WITH_JAR_TRUE@
XML_CFLAGS = @XML_CFLAGS@ XML_CFLAGS = @XML_CFLAGS@
XML_LIBS = @XML_LIBS@ XML_LIBS = @XML_LIBS@
XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CFLAGS = @XSLT_CFLAGS@
@ -254,6 +273,7 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@ X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@
ZIP = @ZIP@ ZIP = @ZIP@
ac_ct_ANTLR = @ac_ct_ANTLR@
ac_ct_AR = @ac_ct_AR@ ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_CXX = @ac_ct_CXX@
@ -313,6 +333,7 @@ target_cpu = @target_cpu@
target_os = @target_os@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@ toolexeclibdir = @toolexeclibdir@
uudecode = @uudecode@
vm_classes = @vm_classes@ vm_classes = @vm_classes@
EXTRA_DIST = IMPORTING \ EXTRA_DIST = IMPORTING \
readme \ readme \

View File

@ -50,6 +50,9 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/../../ltsugar.m4 \ $(top_srcdir)/../../ltsugar.m4 \
$(top_srcdir)/../../ltversion.m4 \ $(top_srcdir)/../../ltversion.m4 \
$(top_srcdir)/../../lt~obsolete.m4 \ $(top_srcdir)/../../lt~obsolete.m4 \
$(top_srcdir)/m4/ac_prog_antlr.m4 \
$(top_srcdir)/m4/ac_prog_java.m4 \
$(top_srcdir)/m4/ac_prog_java_works.m4 \
$(top_srcdir)/m4/ac_prog_javac.m4 \ $(top_srcdir)/m4/ac_prog_javac.m4 \
$(top_srcdir)/m4/ac_prog_javac_works.m4 \ $(top_srcdir)/m4/ac_prog_javac_works.m4 \
$(top_srcdir)/m4/acattribute.m4 $(top_srcdir)/m4/accross.m4 \ $(top_srcdir)/m4/acattribute.m4 $(top_srcdir)/m4/accross.m4 \
@ -72,6 +75,8 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@ AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
ANTLR = @ANTLR@
ANTLR_JAR = @ANTLR_JAR@
AR = @AR@ AR = @AR@
AUTOCONF = @AUTOCONF@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
@ -103,6 +108,12 @@ CREATE_DSSI_LIBRARIES_FALSE = @CREATE_DSSI_LIBRARIES_FALSE@
CREATE_DSSI_LIBRARIES_TRUE = @CREATE_DSSI_LIBRARIES_TRUE@ CREATE_DSSI_LIBRARIES_TRUE = @CREATE_DSSI_LIBRARIES_TRUE@
CREATE_GCONF_PEER_LIBRARIES_FALSE = @CREATE_GCONF_PEER_LIBRARIES_FALSE@ CREATE_GCONF_PEER_LIBRARIES_FALSE = @CREATE_GCONF_PEER_LIBRARIES_FALSE@
CREATE_GCONF_PEER_LIBRARIES_TRUE = @CREATE_GCONF_PEER_LIBRARIES_TRUE@ CREATE_GCONF_PEER_LIBRARIES_TRUE = @CREATE_GCONF_PEER_LIBRARIES_TRUE@
CREATE_GJDOC_FALSE = @CREATE_GJDOC_FALSE@
CREATE_GJDOC_PARSER_FALSE = @CREATE_GJDOC_PARSER_FALSE@
CREATE_GJDOC_PARSER_TRUE = @CREATE_GJDOC_PARSER_TRUE@
CREATE_GJDOC_TRUE = @CREATE_GJDOC_TRUE@
CREATE_GMPBI_LIBRARY_FALSE = @CREATE_GMPBI_LIBRARY_FALSE@
CREATE_GMPBI_LIBRARY_TRUE = @CREATE_GMPBI_LIBRARY_TRUE@
CREATE_GSTREAMER_PEER_LIBRARIES_FALSE = @CREATE_GSTREAMER_PEER_LIBRARIES_FALSE@ CREATE_GSTREAMER_PEER_LIBRARIES_FALSE = @CREATE_GSTREAMER_PEER_LIBRARIES_FALSE@
CREATE_GSTREAMER_PEER_LIBRARIES_TRUE = @CREATE_GSTREAMER_PEER_LIBRARIES_TRUE@ CREATE_GSTREAMER_PEER_LIBRARIES_TRUE = @CREATE_GSTREAMER_PEER_LIBRARIES_TRUE@
CREATE_GTK_PEER_LIBRARIES_FALSE = @CREATE_GTK_PEER_LIBRARIES_FALSE@ CREATE_GTK_PEER_LIBRARIES_FALSE = @CREATE_GTK_PEER_LIBRARIES_FALSE@
@ -141,11 +152,12 @@ ERROR_CFLAGS = @ERROR_CFLAGS@
EXAMPLESDIR = @EXAMPLESDIR@ EXAMPLESDIR = @EXAMPLESDIR@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
EXTRA_CFLAGS = @EXTRA_CFLAGS@ EXTRA_CFLAGS = @EXTRA_CFLAGS@
FASTJAR = @FASTJAR@
FGREP = @FGREP@ FGREP = @FGREP@
FIND = @FIND@ FIND = @FIND@
FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@ FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@
FREETYPE2_LIBS = @FREETYPE2_LIBS@ FREETYPE2_LIBS = @FREETYPE2_LIBS@
GCJ_JAVAC_FALSE = @GCJ_JAVAC_FALSE@
GCJ_JAVAC_TRUE = @GCJ_JAVAC_TRUE@
GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@ GCONF_LIBS = @GCONF_LIBS@
GDK_CFLAGS = @GDK_CFLAGS@ GDK_CFLAGS = @GDK_CFLAGS@
@ -155,6 +167,8 @@ GENINSRC_TRUE = @GENINSRC_TRUE@
GJDOC = @GJDOC@ GJDOC = @GJDOC@
GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@ GLIB_LIBS = @GLIB_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
GMP_LIBS = @GMP_LIBS@
GREP = @GREP@ GREP = @GREP@
GSTREAMER_BASE_CFLAGS = @GSTREAMER_BASE_CFLAGS@ GSTREAMER_BASE_CFLAGS = @GSTREAMER_BASE_CFLAGS@
GSTREAMER_BASE_LIBS = @GSTREAMER_BASE_LIBS@ GSTREAMER_BASE_LIBS = @GSTREAMER_BASE_LIBS@
@ -176,7 +190,10 @@ INSTALL_GLIBJ_ZIP_TRUE = @INSTALL_GLIBJ_ZIP_TRUE@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JAR = @JAR@
JAVA = @JAVA@
JAVAC = @JAVAC@ JAVAC = @JAVAC@
JAVAC_IS_GCJ = @JAVAC_IS_GCJ@
JAVAC_MEM_OPT = @JAVAC_MEM_OPT@ JAVAC_MEM_OPT = @JAVAC_MEM_OPT@
JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@ JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@
JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@ JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@
@ -242,8 +259,10 @@ USE_ESCHER_TRUE = @USE_ESCHER_TRUE@
USE_PREBUILT_GLIBJ_ZIP_FALSE = @USE_PREBUILT_GLIBJ_ZIP_FALSE@ USE_PREBUILT_GLIBJ_ZIP_FALSE = @USE_PREBUILT_GLIBJ_ZIP_FALSE@
USE_PREBUILT_GLIBJ_ZIP_TRUE = @USE_PREBUILT_GLIBJ_ZIP_TRUE@ USE_PREBUILT_GLIBJ_ZIP_TRUE = @USE_PREBUILT_GLIBJ_ZIP_TRUE@
VERSION = @VERSION@ VERSION = @VERSION@
VM_BINARY = @VM_BINARY@ WANT_NATIVE_BIG_INTEGER = @WANT_NATIVE_BIG_INTEGER@
WARNING_CFLAGS = @WARNING_CFLAGS@ WARNING_CFLAGS = @WARNING_CFLAGS@
WITH_JAR_FALSE = @WITH_JAR_FALSE@
WITH_JAR_TRUE = @WITH_JAR_TRUE@
XML_CFLAGS = @XML_CFLAGS@ XML_CFLAGS = @XML_CFLAGS@
XML_LIBS = @XML_LIBS@ XML_LIBS = @XML_LIBS@
XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CFLAGS = @XSLT_CFLAGS@
@ -254,6 +273,7 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@ X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@
ZIP = @ZIP@ ZIP = @ZIP@
ac_ct_ANTLR = @ac_ct_ANTLR@
ac_ct_AR = @ac_ct_AR@ ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_CXX = @ac_ct_CXX@
@ -313,6 +333,7 @@ target_cpu = @target_cpu@
target_os = @target_os@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@ toolexeclibdir = @toolexeclibdir@
uudecode = @uudecode@
vm_classes = @vm_classes@ vm_classes = @vm_classes@
EXTRA_DIST = README.txt \ EXTRA_DIST = README.txt \
copying.txt \ copying.txt \

View File

@ -50,6 +50,9 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/../../ltsugar.m4 \ $(top_srcdir)/../../ltsugar.m4 \
$(top_srcdir)/../../ltversion.m4 \ $(top_srcdir)/../../ltversion.m4 \
$(top_srcdir)/../../lt~obsolete.m4 \ $(top_srcdir)/../../lt~obsolete.m4 \
$(top_srcdir)/m4/ac_prog_antlr.m4 \
$(top_srcdir)/m4/ac_prog_java.m4 \
$(top_srcdir)/m4/ac_prog_java_works.m4 \
$(top_srcdir)/m4/ac_prog_javac.m4 \ $(top_srcdir)/m4/ac_prog_javac.m4 \
$(top_srcdir)/m4/ac_prog_javac_works.m4 \ $(top_srcdir)/m4/ac_prog_javac_works.m4 \
$(top_srcdir)/m4/acattribute.m4 $(top_srcdir)/m4/accross.m4 \ $(top_srcdir)/m4/acattribute.m4 $(top_srcdir)/m4/accross.m4 \
@ -72,6 +75,8 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@ AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
ANTLR = @ANTLR@
ANTLR_JAR = @ANTLR_JAR@
AR = @AR@ AR = @AR@
AUTOCONF = @AUTOCONF@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
@ -103,6 +108,12 @@ CREATE_DSSI_LIBRARIES_FALSE = @CREATE_DSSI_LIBRARIES_FALSE@
CREATE_DSSI_LIBRARIES_TRUE = @CREATE_DSSI_LIBRARIES_TRUE@ CREATE_DSSI_LIBRARIES_TRUE = @CREATE_DSSI_LIBRARIES_TRUE@
CREATE_GCONF_PEER_LIBRARIES_FALSE = @CREATE_GCONF_PEER_LIBRARIES_FALSE@ CREATE_GCONF_PEER_LIBRARIES_FALSE = @CREATE_GCONF_PEER_LIBRARIES_FALSE@
CREATE_GCONF_PEER_LIBRARIES_TRUE = @CREATE_GCONF_PEER_LIBRARIES_TRUE@ CREATE_GCONF_PEER_LIBRARIES_TRUE = @CREATE_GCONF_PEER_LIBRARIES_TRUE@
CREATE_GJDOC_FALSE = @CREATE_GJDOC_FALSE@
CREATE_GJDOC_PARSER_FALSE = @CREATE_GJDOC_PARSER_FALSE@
CREATE_GJDOC_PARSER_TRUE = @CREATE_GJDOC_PARSER_TRUE@
CREATE_GJDOC_TRUE = @CREATE_GJDOC_TRUE@
CREATE_GMPBI_LIBRARY_FALSE = @CREATE_GMPBI_LIBRARY_FALSE@
CREATE_GMPBI_LIBRARY_TRUE = @CREATE_GMPBI_LIBRARY_TRUE@
CREATE_GSTREAMER_PEER_LIBRARIES_FALSE = @CREATE_GSTREAMER_PEER_LIBRARIES_FALSE@ CREATE_GSTREAMER_PEER_LIBRARIES_FALSE = @CREATE_GSTREAMER_PEER_LIBRARIES_FALSE@
CREATE_GSTREAMER_PEER_LIBRARIES_TRUE = @CREATE_GSTREAMER_PEER_LIBRARIES_TRUE@ CREATE_GSTREAMER_PEER_LIBRARIES_TRUE = @CREATE_GSTREAMER_PEER_LIBRARIES_TRUE@
CREATE_GTK_PEER_LIBRARIES_FALSE = @CREATE_GTK_PEER_LIBRARIES_FALSE@ CREATE_GTK_PEER_LIBRARIES_FALSE = @CREATE_GTK_PEER_LIBRARIES_FALSE@
@ -141,11 +152,12 @@ ERROR_CFLAGS = @ERROR_CFLAGS@
EXAMPLESDIR = @EXAMPLESDIR@ EXAMPLESDIR = @EXAMPLESDIR@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
EXTRA_CFLAGS = @EXTRA_CFLAGS@ EXTRA_CFLAGS = @EXTRA_CFLAGS@
FASTJAR = @FASTJAR@
FGREP = @FGREP@ FGREP = @FGREP@
FIND = @FIND@ FIND = @FIND@
FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@ FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@
FREETYPE2_LIBS = @FREETYPE2_LIBS@ FREETYPE2_LIBS = @FREETYPE2_LIBS@
GCJ_JAVAC_FALSE = @GCJ_JAVAC_FALSE@
GCJ_JAVAC_TRUE = @GCJ_JAVAC_TRUE@
GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@ GCONF_LIBS = @GCONF_LIBS@
GDK_CFLAGS = @GDK_CFLAGS@ GDK_CFLAGS = @GDK_CFLAGS@
@ -155,6 +167,8 @@ GENINSRC_TRUE = @GENINSRC_TRUE@
GJDOC = @GJDOC@ GJDOC = @GJDOC@
GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@ GLIB_LIBS = @GLIB_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
GMP_LIBS = @GMP_LIBS@
GREP = @GREP@ GREP = @GREP@
GSTREAMER_BASE_CFLAGS = @GSTREAMER_BASE_CFLAGS@ GSTREAMER_BASE_CFLAGS = @GSTREAMER_BASE_CFLAGS@
GSTREAMER_BASE_LIBS = @GSTREAMER_BASE_LIBS@ GSTREAMER_BASE_LIBS = @GSTREAMER_BASE_LIBS@
@ -176,7 +190,10 @@ INSTALL_GLIBJ_ZIP_TRUE = @INSTALL_GLIBJ_ZIP_TRUE@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JAR = @JAR@
JAVA = @JAVA@
JAVAC = @JAVAC@ JAVAC = @JAVAC@
JAVAC_IS_GCJ = @JAVAC_IS_GCJ@
JAVAC_MEM_OPT = @JAVAC_MEM_OPT@ JAVAC_MEM_OPT = @JAVAC_MEM_OPT@
JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@ JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@
JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@ JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@
@ -242,8 +259,10 @@ USE_ESCHER_TRUE = @USE_ESCHER_TRUE@
USE_PREBUILT_GLIBJ_ZIP_FALSE = @USE_PREBUILT_GLIBJ_ZIP_FALSE@ USE_PREBUILT_GLIBJ_ZIP_FALSE = @USE_PREBUILT_GLIBJ_ZIP_FALSE@
USE_PREBUILT_GLIBJ_ZIP_TRUE = @USE_PREBUILT_GLIBJ_ZIP_TRUE@ USE_PREBUILT_GLIBJ_ZIP_TRUE = @USE_PREBUILT_GLIBJ_ZIP_TRUE@
VERSION = @VERSION@ VERSION = @VERSION@
VM_BINARY = @VM_BINARY@ WANT_NATIVE_BIG_INTEGER = @WANT_NATIVE_BIG_INTEGER@
WARNING_CFLAGS = @WARNING_CFLAGS@ WARNING_CFLAGS = @WARNING_CFLAGS@
WITH_JAR_FALSE = @WITH_JAR_FALSE@
WITH_JAR_TRUE = @WITH_JAR_TRUE@
XML_CFLAGS = @XML_CFLAGS@ XML_CFLAGS = @XML_CFLAGS@
XML_LIBS = @XML_LIBS@ XML_LIBS = @XML_LIBS@
XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CFLAGS = @XSLT_CFLAGS@
@ -254,6 +273,7 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@ X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@
ZIP = @ZIP@ ZIP = @ZIP@
ac_ct_ANTLR = @ac_ct_ANTLR@
ac_ct_AR = @ac_ct_AR@ ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_CXX = @ac_ct_CXX@
@ -313,6 +333,7 @@ target_cpu = @target_cpu@
target_os = @target_os@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@ toolexeclibdir = @toolexeclibdir@
uudecode = @uudecode@
vm_classes = @vm_classes@ vm_classes = @vm_classes@
EXTRA_DIST = README \ EXTRA_DIST = README \
org/xml/sax/ext/Attributes2.java \ org/xml/sax/ext/Attributes2.java \

View File

@ -50,6 +50,9 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/../../ltsugar.m4 \ $(top_srcdir)/../../ltsugar.m4 \
$(top_srcdir)/../../ltversion.m4 \ $(top_srcdir)/../../ltversion.m4 \
$(top_srcdir)/../../lt~obsolete.m4 \ $(top_srcdir)/../../lt~obsolete.m4 \
$(top_srcdir)/m4/ac_prog_antlr.m4 \
$(top_srcdir)/m4/ac_prog_java.m4 \
$(top_srcdir)/m4/ac_prog_java_works.m4 \
$(top_srcdir)/m4/ac_prog_javac.m4 \ $(top_srcdir)/m4/ac_prog_javac.m4 \
$(top_srcdir)/m4/ac_prog_javac_works.m4 \ $(top_srcdir)/m4/ac_prog_javac_works.m4 \
$(top_srcdir)/m4/acattribute.m4 $(top_srcdir)/m4/accross.m4 \ $(top_srcdir)/m4/acattribute.m4 $(top_srcdir)/m4/accross.m4 \
@ -72,6 +75,8 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@ AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
ANTLR = @ANTLR@
ANTLR_JAR = @ANTLR_JAR@
AR = @AR@ AR = @AR@
AUTOCONF = @AUTOCONF@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
@ -103,6 +108,12 @@ CREATE_DSSI_LIBRARIES_FALSE = @CREATE_DSSI_LIBRARIES_FALSE@
CREATE_DSSI_LIBRARIES_TRUE = @CREATE_DSSI_LIBRARIES_TRUE@ CREATE_DSSI_LIBRARIES_TRUE = @CREATE_DSSI_LIBRARIES_TRUE@
CREATE_GCONF_PEER_LIBRARIES_FALSE = @CREATE_GCONF_PEER_LIBRARIES_FALSE@ CREATE_GCONF_PEER_LIBRARIES_FALSE = @CREATE_GCONF_PEER_LIBRARIES_FALSE@
CREATE_GCONF_PEER_LIBRARIES_TRUE = @CREATE_GCONF_PEER_LIBRARIES_TRUE@ CREATE_GCONF_PEER_LIBRARIES_TRUE = @CREATE_GCONF_PEER_LIBRARIES_TRUE@
CREATE_GJDOC_FALSE = @CREATE_GJDOC_FALSE@
CREATE_GJDOC_PARSER_FALSE = @CREATE_GJDOC_PARSER_FALSE@
CREATE_GJDOC_PARSER_TRUE = @CREATE_GJDOC_PARSER_TRUE@
CREATE_GJDOC_TRUE = @CREATE_GJDOC_TRUE@
CREATE_GMPBI_LIBRARY_FALSE = @CREATE_GMPBI_LIBRARY_FALSE@
CREATE_GMPBI_LIBRARY_TRUE = @CREATE_GMPBI_LIBRARY_TRUE@
CREATE_GSTREAMER_PEER_LIBRARIES_FALSE = @CREATE_GSTREAMER_PEER_LIBRARIES_FALSE@ CREATE_GSTREAMER_PEER_LIBRARIES_FALSE = @CREATE_GSTREAMER_PEER_LIBRARIES_FALSE@
CREATE_GSTREAMER_PEER_LIBRARIES_TRUE = @CREATE_GSTREAMER_PEER_LIBRARIES_TRUE@ CREATE_GSTREAMER_PEER_LIBRARIES_TRUE = @CREATE_GSTREAMER_PEER_LIBRARIES_TRUE@
CREATE_GTK_PEER_LIBRARIES_FALSE = @CREATE_GTK_PEER_LIBRARIES_FALSE@ CREATE_GTK_PEER_LIBRARIES_FALSE = @CREATE_GTK_PEER_LIBRARIES_FALSE@
@ -141,11 +152,12 @@ ERROR_CFLAGS = @ERROR_CFLAGS@
EXAMPLESDIR = @EXAMPLESDIR@ EXAMPLESDIR = @EXAMPLESDIR@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
EXTRA_CFLAGS = @EXTRA_CFLAGS@ EXTRA_CFLAGS = @EXTRA_CFLAGS@
FASTJAR = @FASTJAR@
FGREP = @FGREP@ FGREP = @FGREP@
FIND = @FIND@ FIND = @FIND@
FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@ FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@
FREETYPE2_LIBS = @FREETYPE2_LIBS@ FREETYPE2_LIBS = @FREETYPE2_LIBS@
GCJ_JAVAC_FALSE = @GCJ_JAVAC_FALSE@
GCJ_JAVAC_TRUE = @GCJ_JAVAC_TRUE@
GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@ GCONF_LIBS = @GCONF_LIBS@
GDK_CFLAGS = @GDK_CFLAGS@ GDK_CFLAGS = @GDK_CFLAGS@
@ -155,6 +167,8 @@ GENINSRC_TRUE = @GENINSRC_TRUE@
GJDOC = @GJDOC@ GJDOC = @GJDOC@
GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@ GLIB_LIBS = @GLIB_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
GMP_LIBS = @GMP_LIBS@
GREP = @GREP@ GREP = @GREP@
GSTREAMER_BASE_CFLAGS = @GSTREAMER_BASE_CFLAGS@ GSTREAMER_BASE_CFLAGS = @GSTREAMER_BASE_CFLAGS@
GSTREAMER_BASE_LIBS = @GSTREAMER_BASE_LIBS@ GSTREAMER_BASE_LIBS = @GSTREAMER_BASE_LIBS@
@ -176,7 +190,10 @@ INSTALL_GLIBJ_ZIP_TRUE = @INSTALL_GLIBJ_ZIP_TRUE@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JAR = @JAR@
JAVA = @JAVA@
JAVAC = @JAVAC@ JAVAC = @JAVAC@
JAVAC_IS_GCJ = @JAVAC_IS_GCJ@
JAVAC_MEM_OPT = @JAVAC_MEM_OPT@ JAVAC_MEM_OPT = @JAVAC_MEM_OPT@
JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@ JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@
JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@ JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@
@ -242,8 +259,10 @@ USE_ESCHER_TRUE = @USE_ESCHER_TRUE@
USE_PREBUILT_GLIBJ_ZIP_FALSE = @USE_PREBUILT_GLIBJ_ZIP_FALSE@ USE_PREBUILT_GLIBJ_ZIP_FALSE = @USE_PREBUILT_GLIBJ_ZIP_FALSE@
USE_PREBUILT_GLIBJ_ZIP_TRUE = @USE_PREBUILT_GLIBJ_ZIP_TRUE@ USE_PREBUILT_GLIBJ_ZIP_TRUE = @USE_PREBUILT_GLIBJ_ZIP_TRUE@
VERSION = @VERSION@ VERSION = @VERSION@
VM_BINARY = @VM_BINARY@ WANT_NATIVE_BIG_INTEGER = @WANT_NATIVE_BIG_INTEGER@
WARNING_CFLAGS = @WARNING_CFLAGS@ WARNING_CFLAGS = @WARNING_CFLAGS@
WITH_JAR_FALSE = @WITH_JAR_FALSE@
WITH_JAR_TRUE = @WITH_JAR_TRUE@
XML_CFLAGS = @XML_CFLAGS@ XML_CFLAGS = @XML_CFLAGS@
XML_LIBS = @XML_LIBS@ XML_LIBS = @XML_LIBS@
XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CFLAGS = @XSLT_CFLAGS@
@ -254,6 +273,7 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@ X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@
ZIP = @ZIP@ ZIP = @ZIP@
ac_ct_ANTLR = @ac_ct_ANTLR@
ac_ct_AR = @ac_ct_AR@ ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_CXX = @ac_ct_CXX@
@ -313,6 +333,7 @@ target_cpu = @target_cpu@
target_os = @target_os@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@ toolexeclibdir = @toolexeclibdir@
uudecode = @uudecode@
vm_classes = @vm_classes@ vm_classes = @vm_classes@
EXTRA_DIST = README \ EXTRA_DIST = README \
org/w3c/dom/Attr.java \ org/w3c/dom/Attr.java \

View File

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.CORBA; package gnu.CORBA;
import gnu.java.lang.CPStringBuilder;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
@ -135,7 +137,7 @@ public class BigDecimalHelper
public static void write(java.io.OutputStream out, BigDecimal x) public static void write(java.io.OutputStream out, BigDecimal x)
throws IOException, BadKind throws IOException, BadKind
{ {
StringBuffer v = new StringBuffer(x.unscaledValue().toString()); CPStringBuilder v = new CPStringBuilder(x.unscaledValue().toString());
boolean negative = v.charAt(0) == '-'; boolean negative = v.charAt(0) == '-';
@ -165,7 +167,7 @@ public class BigDecimalHelper
*/ */
private static BigDecimal createFixed(int scale, byte[] d) private static BigDecimal createFixed(int scale, byte[] d)
{ {
StringBuffer s = new StringBuffer(2 * d.length); CPStringBuilder s = new CPStringBuilder(2 * d.length);
int last = d.length - 1; int last = d.length - 1;

View File

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.CORBA.CDR; package gnu.CORBA.CDR;
import gnu.java.lang.CPStringBuilder;
import java.io.EOFException; import java.io.EOFException;
import java.io.FilterInputStream; import java.io.FilterInputStream;
import java.io.IOException; import java.io.IOException;
@ -360,7 +362,7 @@ public class LittleEndianInputStream
public String readLine() public String readLine()
throws IOException throws IOException
{ {
StringBuffer strb = new StringBuffer(); CPStringBuilder strb = new CPStringBuilder();
while (true) while (true)
{ {
@ -629,4 +631,4 @@ public class LittleEndianInputStream
{ {
throw new InternalError(); throw new InternalError();
} }
} }

View File

@ -41,6 +41,8 @@ package gnu.CORBA.CDR;
import gnu.CORBA.Minor; import gnu.CORBA.Minor;
import gnu.CORBA.ObjectCreator; import gnu.CORBA.ObjectCreator;
import gnu.java.lang.CPStringBuilder;
import org.omg.CORBA.CustomMarshal; import org.omg.CORBA.CustomMarshal;
import org.omg.CORBA.DataInputStream; import org.omg.CORBA.DataInputStream;
import org.omg.CORBA.DataOutputStream; import org.omg.CORBA.DataOutputStream;
@ -754,7 +756,7 @@ public abstract class Vio
return "null"; return "null";
else else
{ {
StringBuffer b = new StringBuffer("{"); CPStringBuilder b = new CPStringBuilder("{");
for (int i = 0; i < s.length; i++) for (int i = 0; i < s.length; i++)
{ {
b.append(s[i]); b.append(s[i]);
@ -1469,4 +1471,4 @@ public abstract class Vio
return VMVio.allocateObject(clazz, constructor.getDeclaringClass(), return VMVio.allocateObject(clazz, constructor.getDeclaringClass(),
constructor); constructor);
} }
} }

View File

@ -40,6 +40,8 @@ package gnu.CORBA.CDR;
import gnu.CORBA.Minor; import gnu.CORBA.Minor;
import gnu.java.lang.CPStringBuilder;
import org.omg.CORBA.LocalObject; import org.omg.CORBA.LocalObject;
import org.omg.CORBA.MARSHAL; import org.omg.CORBA.MARSHAL;
@ -318,7 +320,7 @@ public class gnuRuntime
*/ */
public String dump() public String dump()
{ {
StringBuffer b = new StringBuffer(" Stream content: \n"); CPStringBuilder b = new CPStringBuilder(" Stream content: \n");
// Sort by position. // Sort by position.
TreeSet t = new TreeSet(positions.keySet()); TreeSet t = new TreeSet(positions.keySet());

View File

@ -47,6 +47,8 @@ import gnu.CORBA.CDR.LittleEndianOutputStream;
import gnu.CORBA.CDR.AbstractDataInput; import gnu.CORBA.CDR.AbstractDataInput;
import gnu.CORBA.CDR.AbstractDataOutput; import gnu.CORBA.CDR.AbstractDataOutput;
import gnu.java.lang.CPStringBuilder;
import org.omg.CORBA.MARSHAL; import org.omg.CORBA.MARSHAL;
import org.omg.CORBA.portable.IDLEntity; import org.omg.CORBA.portable.IDLEntity;
@ -286,7 +288,7 @@ public class MessageHeader
int minor; int minor;
if (! Arrays.equals(xMagic, MAGIC)) if (! Arrays.equals(xMagic, MAGIC))
{ {
StringBuffer b = new StringBuffer(); CPStringBuilder b = new CPStringBuilder();
if (r == - 1) if (r == - 1)
{ {
b.append("Immediate EOF"); b.append("Immediate EOF");
@ -460,4 +462,4 @@ public class MessageHeader
throw m; throw m;
} }
} }
} }

View File

@ -41,6 +41,8 @@ package gnu.CORBA.GIOP;
import gnu.CORBA.CDR.AbstractCdrInput; import gnu.CORBA.CDR.AbstractCdrInput;
import gnu.CORBA.CDR.AbstractCdrOutput; import gnu.CORBA.CDR.AbstractCdrOutput;
import gnu.java.lang.CPStringBuilder;
import org.omg.CORBA.portable.IDLEntity; import org.omg.CORBA.portable.IDLEntity;
/** /**
@ -123,7 +125,7 @@ public abstract class RequestHeader
*/ */
public String bytes(byte[] array) public String bytes(byte[] array)
{ {
StringBuffer b = new StringBuffer(); CPStringBuilder b = new CPStringBuilder();
for (int i = 0; i < array.length; i++) for (int i = 0; i < array.length; i++)
{ {
b.append(Integer.toHexString(array[i] & 0xFF)); b.append(Integer.toHexString(array[i] & 0xFF));

View File

@ -43,6 +43,8 @@ import gnu.CORBA.CDR.AbstractCdrOutput;
import gnu.CORBA.GIOP.ServiceContext; import gnu.CORBA.GIOP.ServiceContext;
import gnu.CORBA.GIOP.CodeSetServiceContext; import gnu.CORBA.GIOP.CodeSetServiceContext;
import gnu.java.lang.CPStringBuilder;
/** /**
* The header of the standard reply. * The header of the standard reply.
* *
@ -80,7 +82,7 @@ public class ReplyHeader
*/ */
public String contexts() public String contexts()
{ {
StringBuffer b = new StringBuffer(); CPStringBuilder b = new CPStringBuilder();
for (int i = 0; i < service_context.length; i++) for (int i = 0; i < service_context.length; i++)
{ {
b.append(service_context [ i ].toString()); b.append(service_context [ i ].toString());

View File

@ -43,6 +43,8 @@ import gnu.CORBA.CDR.AbstractCdrOutput;
import gnu.CORBA.GIOP.ServiceContext; import gnu.CORBA.GIOP.ServiceContext;
import gnu.CORBA.GIOP.CodeSetServiceContext; import gnu.CORBA.GIOP.CodeSetServiceContext;
import gnu.java.lang.CPStringBuilder;
import org.omg.CORBA.portable.IDLEntity; import org.omg.CORBA.portable.IDLEntity;
/** /**
@ -81,7 +83,7 @@ public class RequestHeader
public String bytes(byte[] array) public String bytes(byte[] array)
{ {
StringBuffer b = new StringBuffer(); CPStringBuilder b = new CPStringBuilder();
for (int i = 0; i < array.length; i++) for (int i = 0; i < array.length; i++)
{ {
b.append(Integer.toHexString(array [ i ] & 0xFF)); b.append(Integer.toHexString(array [ i ] & 0xFF));
@ -95,7 +97,7 @@ public class RequestHeader
*/ */
public String contexts() public String contexts()
{ {
StringBuffer b = new StringBuffer(); CPStringBuilder b = new CPStringBuilder();
for (int i = 0; i < service_context.length; i++) for (int i = 0; i < service_context.length; i++)
{ {
b.append(service_context [ i ].toString()); b.append(service_context [ i ].toString());

View File

@ -45,6 +45,8 @@ import gnu.CORBA.CDR.AbstractCdrOutput;
import gnu.CORBA.GIOP.CharSets_OSF; import gnu.CORBA.GIOP.CharSets_OSF;
import gnu.CORBA.GIOP.CodeSetServiceContext; import gnu.CORBA.GIOP.CodeSetServiceContext;
import gnu.java.lang.CPStringBuilder;
import org.omg.CORBA.BAD_PARAM; import org.omg.CORBA.BAD_PARAM;
import org.omg.CORBA.CompletionStatus; import org.omg.CORBA.CompletionStatus;
import org.omg.CORBA.MARSHAL; import org.omg.CORBA.MARSHAL;
@ -126,7 +128,7 @@ public class IOR
*/ */
public String toString() public String toString()
{ {
StringBuffer b = new StringBuffer(); CPStringBuilder b = new CPStringBuilder();
b.append("native " + name(native_set)); b.append("native " + name(native_set));
if (conversion != null && conversion.length > 0) if (conversion != null && conversion.length > 0)
{ {
@ -146,7 +148,7 @@ public class IOR
*/ */
public String toStringFormatted() public String toStringFormatted()
{ {
StringBuffer b = new StringBuffer(); CPStringBuilder b = new CPStringBuilder();
b.append("\n Native set " + name(native_set)); b.append("\n Native set " + name(native_set));
if (conversion != null && conversion.length > 0) if (conversion != null && conversion.length > 0)
{ {
@ -282,7 +284,7 @@ public class IOR
*/ */
public String toString() public String toString()
{ {
StringBuffer b = new StringBuffer(); CPStringBuilder b = new CPStringBuilder();
b.append(host); b.append(host);
b.append(":"); b.append(":");
b.append(port); b.append(port);
@ -591,7 +593,7 @@ public class IOR
*/ */
public String toString() public String toString()
{ {
StringBuffer b = new StringBuffer(); CPStringBuilder b = new CPStringBuilder();
b.append(Id); b.append(Id);
b.append(" at "); b.append(" at ");
b.append(Internet); b.append(Internet);
@ -618,7 +620,7 @@ public class IOR
*/ */
public String toStringFormatted() public String toStringFormatted()
{ {
StringBuffer b = new StringBuffer(); CPStringBuilder b = new CPStringBuilder();
b.append("\nObject Id:\n "); b.append("\nObject Id:\n ");
b.append(Id); b.append(Id);
b.append("\nObject is accessible at:\n "); b.append("\nObject is accessible at:\n ");
@ -656,7 +658,7 @@ public class IOR
_write(out); _write(out);
StringBuffer b = new StringBuffer("IOR:"); CPStringBuilder b = new CPStringBuilder("IOR:");
byte[] binary = out.buffer.toByteArray(); byte[] binary = out.buffer.toByteArray();
String s; String s;
@ -819,4 +821,4 @@ public class IOR
} }
return (int) adler.getValue(); return (int) adler.getValue();
} }
} }

View File

@ -44,6 +44,8 @@ import gnu.CORBA.IOR;
import gnu.CORBA.Unexpected; import gnu.CORBA.Unexpected;
import gnu.CORBA.Version; import gnu.CORBA.Version;
import gnu.java.lang.CPStringBuilder;
import org.omg.CORBA.BAD_PARAM; import org.omg.CORBA.BAD_PARAM;
import org.omg.CORBA.DATA_CONVERSION; import org.omg.CORBA.DATA_CONVERSION;
import org.omg.CORBA.ORB; import org.omg.CORBA.ORB;
@ -301,7 +303,7 @@ public class NameParser
ior.Internet.version = new Version(major, minor); ior.Internet.version = new Version(major, minor);
// Then host data goes till '/' or ':'. // Then host data goes till '/' or ':'.
StringBuffer bhost = new StringBuffer(corbaloc.length()); CPStringBuilder bhost = new CPStringBuilder(corbaloc.length());
while (!t[p].equals(":") && !t[p].equals("/") && !t[p].equals(",")) while (!t[p].equals(":") && !t[p].equals("/") && !t[p].equals(","))
bhost.append(t[p++]); bhost.append(t[p++]);
@ -394,7 +396,7 @@ public class NameParser
{ {
InputStreamReader r = new InputStreamReader(u.openStream()); InputStreamReader r = new InputStreamReader(u.openStream());
StringBuffer b = new StringBuffer(); CPStringBuilder b = new CPStringBuilder();
int c; int c;
while ((c = r.read()) > 0) while ((c = r.read()) > 0)
@ -465,7 +467,7 @@ public class NameParser
+ "' found"); + "' found");
} }
StringBuffer bKey = new StringBuffer(); CPStringBuilder bKey = new CPStringBuilder();
p++; p++;
while (p < t.length && !t[p].equals("#")) while (p < t.length && !t[p].equals("#"))

View File

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.CORBA.NamingService; package gnu.CORBA.NamingService;
import gnu.java.lang.CPStringBuilder;
import org.omg.CORBA.IntHolder; import org.omg.CORBA.IntHolder;
import org.omg.CosNaming.NameComponent; import org.omg.CosNaming.NameComponent;
import org.omg.CosNaming.NamingContextPackage.InvalidName; import org.omg.CosNaming.NamingContextPackage.InvalidName;
@ -125,7 +127,7 @@ public class NameTransformer
{ {
NameValidator.check(a_name); NameValidator.check(a_name);
StringBuffer b = new StringBuffer(); CPStringBuilder b = new CPStringBuilder();
NameComponent n; NameComponent n;
@ -152,7 +154,7 @@ public class NameTransformer
* @param b a buffer to append the contents to. * @param b a buffer to append the contents to.
* @param s a string to append. * @param s a string to append.
*/ */
private void appEscaping(StringBuffer b, String s) private void appEscaping(CPStringBuilder b, String s)
{ {
char c; char c;
for (int i = 0; i < s.length(); i++) for (int i = 0; i < s.length(); i++)
@ -271,7 +273,7 @@ public class NameTransformer
*/ */
private String readPart(IntHolder p, String[] t) private String readPart(IntHolder p, String[] t)
{ {
StringBuffer part = new StringBuffer(); CPStringBuilder part = new CPStringBuilder();
while (t [ p.value ] != null && !t [ p.value ].equals(".") && while (t [ p.value ] != null && !t [ p.value ].equals(".") &&
!t [ p.value ].equals("/") !t [ p.value ].equals("/")

View File

@ -1194,7 +1194,7 @@ public class OrbFunctional extends OrbRestricted
*/ */
protected void set_parameters(String[] para, Properties props) protected void set_parameters(String[] para, Properties props)
{ {
if (para.length > 1) if ((para != null) && para.length > 1)
{ {
for (int i = 0; i < para.length - 1; i++) for (int i = 0; i < para.length - 1; i++)
{ {

View File

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.CORBA.Poa; package gnu.CORBA.Poa;
import gnu.java.lang.CPStringBuilder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
@ -1604,7 +1606,7 @@ public class gnuPOA
*/ */
public String toString() public String toString()
{ {
StringBuffer b = new StringBuffer(name); CPStringBuilder b = new CPStringBuilder(name);
if (children.size() != 0) if (children.size() != 0)
{ {

View File

@ -51,6 +51,8 @@ import gnu.CORBA.Unexpected;
import gnu.CORBA.ResponseHandlerImpl; import gnu.CORBA.ResponseHandlerImpl;
import gnu.CORBA.StreamHolder; import gnu.CORBA.StreamHolder;
import gnu.java.lang.CPStringBuilder;
import org.omg.CORBA.Any; import org.omg.CORBA.Any;
import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.BAD_OPERATION;
import org.omg.CORBA.BAD_PARAM; import org.omg.CORBA.BAD_PARAM;
@ -357,7 +359,7 @@ public class gnuServantObject extends ObjectImpl
*/ */
public String toString() public String toString()
{ {
StringBuffer b = new StringBuffer("Servant object ("); CPStringBuilder b = new CPStringBuilder("Servant object (");
for (int i = 0; i < Id.length; i++) for (int i = 0; i < Id.length; i++)
{ {
b.append(Integer.toHexString(Id [ i ] & 0xFF)); b.append(Integer.toHexString(Id [ i ] & 0xFF));
@ -820,4 +822,4 @@ public class gnuServantObject extends ObjectImpl
} }
return super._is_equivalent(other); return super._is_equivalent(other);
} }
} }

View File

@ -101,4 +101,14 @@ public interface Configuration
* com.sun.tools.javac implementation in tools.zip. * com.sun.tools.javac implementation in tools.zip.
*/ */
String ECJ_JAR = "@ECJ_JAR@"; String ECJ_JAR = "@ECJ_JAR@";
/**
* Set to <code>true</code> if the config script found that (a) an
* implementation of java.math.BigInteger, based on the GNU MP library, is
* desired in preference to a pure Java one, and (b) the GNU MP library was
* found on the platform where the JVM is to run. Otherwise, this field is
* set to <code>false</code>.
*/
boolean WANT_NATIVE_BIG_INTEGER = @WANT_NATIVE_BIG_INTEGER@;
} }

View File

@ -264,7 +264,7 @@ public class VirtualMachineCommandSet
ThreadGroup root = getRootThreadGroup(jdwpGroup); ThreadGroup root = getRootThreadGroup(jdwpGroup);
os.writeInt(1); // Just one top level group allowed? os.writeInt(1); // Just one top level group allowed?
idMan.getObjectId(root); idMan.getObjectId(root).write(os);
} }
private void executeDispose(ByteBuffer bb, DataOutputStream os) private void executeDispose(ByteBuffer bb, DataOutputStream os)

View File

@ -39,6 +39,8 @@ exception statement from your version. */
package gnu.classpath.jdwp.util; package gnu.classpath.jdwp.util;
import gnu.java.lang.CPStringBuilder;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;
@ -59,7 +61,7 @@ public class Signature
*/ */
public static String computeClassSignature (Class theClass) public static String computeClassSignature (Class theClass)
{ {
StringBuffer sb = new StringBuffer (); CPStringBuilder sb = new CPStringBuilder ();
_addToSignature (sb, theClass); _addToSignature (sb, theClass);
return sb.toString (); return sb.toString ();
} }
@ -93,7 +95,7 @@ public class Signature
private static String _computeSignature (Class returnType, private static String _computeSignature (Class returnType,
Class[] paramTypes) Class[] paramTypes)
{ {
StringBuffer sb = new StringBuffer ("("); CPStringBuilder sb = new CPStringBuilder ("(");
if (paramTypes != null) if (paramTypes != null)
{ {
for (int i = 0; i < paramTypes.length; ++i) for (int i = 0; i < paramTypes.length; ++i)
@ -104,7 +106,7 @@ public class Signature
return sb.toString(); return sb.toString();
} }
private static void _addToSignature (StringBuffer sb, Class k) private static void _addToSignature (CPStringBuilder sb, Class k)
{ {
// For some reason there's no easy way to get the signature of a // For some reason there's no easy way to get the signature of a
// class. // class.

View File

@ -37,6 +37,10 @@ exception statement from your version. */
package gnu.java.awt.font; package gnu.java.awt.font;
import gnu.java.awt.peer.ClasspathFontPeer;
import gnu.java.lang.CPStringBuilder;
import java.awt.Font; import java.awt.Font;
import java.awt.FontMetrics; import java.awt.FontMetrics;
import java.awt.font.FontRenderContext; import java.awt.font.FontRenderContext;
@ -61,8 +65,6 @@ import java.util.Map;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
import gnu.java.awt.peer.ClasspathFontPeer;
public class OpenTypeFontPeer public class OpenTypeFontPeer
extends ClasspathFontPeer extends ClasspathFontPeer
{ {
@ -422,7 +424,7 @@ public class OpenTypeFontPeer
*/ */
static String encodeFont(String name, int style) static String encodeFont(String name, int style)
{ {
StringBuilder key = new StringBuilder(); CPStringBuilder key = new CPStringBuilder();
key.append(validName(name)); key.append(validName(name));
key.append('/'); key.append('/');
switch (style) switch (style)

View File

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.java.awt.font.autofit; package gnu.java.awt.font.autofit;
import gnu.java.lang.CPStringBuilder;
class Edge class Edge
{ {
int fpos; int fpos;
@ -54,7 +56,7 @@ class Edge
public String toString() public String toString()
{ {
StringBuilder s = new StringBuilder(); CPStringBuilder s = new CPStringBuilder();
s.append("[Edge] id"); s.append("[Edge] id");
s.append(hashCode()); s.append(hashCode());
s.append(", fpos: "); s.append(", fpos: ");

View File

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.java.awt.font.autofit; package gnu.java.awt.font.autofit;
import gnu.java.lang.CPStringBuilder;
public class LatinBlue public class LatinBlue
{ {
static final int FLAG_BLUE_ACTIVE = 1 << 0; static final int FLAG_BLUE_ACTIVE = 1 << 0;
@ -48,7 +50,7 @@ public class LatinBlue
int flags; int flags;
public String toString() public String toString()
{ {
StringBuilder s = new StringBuilder(); CPStringBuilder s = new CPStringBuilder();
s.append("[BlueZone]"); s.append("[BlueZone]");
s.append(" ref: "); s.append(" ref: ");
s.append(ref.org); s.append(ref.org);

View File

@ -40,6 +40,8 @@ package gnu.java.awt.font.autofit;
import gnu.java.awt.font.opentype.truetype.Point; import gnu.java.awt.font.opentype.truetype.Point;
import gnu.java.lang.CPStringBuilder;
class Segment class Segment
{ {
@ -65,7 +67,7 @@ class Segment
public String toString() public String toString()
{ {
StringBuilder s = new StringBuilder(); CPStringBuilder s = new CPStringBuilder();
s.append("[Segment] id: "); s.append("[Segment] id: ");
s.append(hashCode()); s.append(hashCode());
s.append(", len:"); s.append(", len:");

View File

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.java.awt.font.autofit; package gnu.java.awt.font.autofit;
import gnu.java.lang.CPStringBuilder;
public class Width public class Width
{ {
int org; int org;
@ -50,7 +52,7 @@ public class Width
public String toString() public String toString()
{ {
StringBuilder s = new StringBuilder(); CPStringBuilder s = new CPStringBuilder();
s.append("[Width] org: "); s.append("[Width] org: ");
s.append(org); s.append(org);
s.append(", cur: "); s.append(", cur: ");

View File

@ -37,6 +37,8 @@ exception statement from your version. */
package gnu.java.awt.font.opentype; package gnu.java.awt.font.opentype;
import gnu.java.lang.CPStringBuilder;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.IntBuffer; import java.nio.IntBuffer;
import java.nio.CharBuffer; import java.nio.CharBuffer;
@ -1077,7 +1079,7 @@ final class GlyphNamer
return name; return name;
} }
StringBuffer buf = new StringBuffer(numChars * 8); CPStringBuilder buf = new CPStringBuilder(numChars * 8);
for (int i = 0; i < numChars; i++) for (int i = 0; i < numChars; i++)
{ {
if (i > 0) if (i > 0)

View File

@ -38,6 +38,7 @@ exception statement from your version. */
package gnu.java.awt.font.opentype.truetype; package gnu.java.awt.font.opentype.truetype;
import gnu.java.lang.CPStringBuilder;
/** /**
* A utility class for fixed-point arithmetics, where numbers are * A utility class for fixed-point arithmetics, where numbers are
@ -164,7 +165,7 @@ public final class Fixed
public static String toString(int x, int y) public static String toString(int x, int y)
{ {
StringBuffer sbuf = new StringBuffer(40); CPStringBuilder sbuf = new CPStringBuilder(40);
sbuf.append('('); sbuf.append('(');
sbuf.append(((float) x) / 64); sbuf.append(((float) x) / 64);
sbuf.append(", "); sbuf.append(", ");

View File

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.java.awt.font.opentype.truetype; package gnu.java.awt.font.opentype.truetype;
import gnu.java.lang.CPStringBuilder;
/** /**
* Encapsulates information regarding one point on a glyph outline. * Encapsulates information regarding one point on a glyph outline.
*/ */
@ -234,7 +236,7 @@ public class Point
public String toString() public String toString()
{ {
StringBuilder s = new StringBuilder(); CPStringBuilder s = new CPStringBuilder();
s.append("[Point] origX: "); s.append("[Point] origX: ");
s.append(origX); s.append(origX);
s.append(", origY: "); s.append(", origY: ");

View File

@ -37,6 +37,8 @@ exception statement from your version. */
package gnu.java.awt.font.opentype.truetype; package gnu.java.awt.font.opentype.truetype;
import gnu.java.lang.CPStringBuilder;
import java.awt.FontFormatException; import java.awt.FontFormatException;
import java.awt.geom.AffineTransform; import java.awt.geom.AffineTransform;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
@ -514,7 +516,7 @@ class VirtualMachine
*/ */
private void dumpInstruction(ByteBuffer inst) private void dumpInstruction(ByteBuffer inst)
{ {
StringBuffer sbuf = new StringBuffer(40); CPStringBuilder sbuf = new CPStringBuilder(40);
int pc = inst.position(); int pc = inst.position();
int bcode = inst.get(pc) & 0xff; int bcode = inst.get(pc) & 0xff;
int count; int count;

View File

@ -46,6 +46,7 @@ import java.awt.BasicStroke;
import java.awt.Color; import java.awt.Color;
import java.awt.Composite; import java.awt.Composite;
import java.awt.CompositeContext; import java.awt.CompositeContext;
import java.awt.Dimension;
import java.awt.Font; import java.awt.Font;
import java.awt.FontMetrics; import java.awt.FontMetrics;
import java.awt.Graphics; import java.awt.Graphics;
@ -75,9 +76,12 @@ import java.awt.image.BufferedImage;
import java.awt.image.BufferedImageOp; import java.awt.image.BufferedImageOp;
import java.awt.image.ColorModel; import java.awt.image.ColorModel;
import java.awt.image.DataBuffer; import java.awt.image.DataBuffer;
import java.awt.image.FilteredImageSource;
import java.awt.image.ImageObserver; import java.awt.image.ImageObserver;
import java.awt.image.ImageProducer;
import java.awt.image.Raster; import java.awt.image.Raster;
import java.awt.image.RenderedImage; import java.awt.image.RenderedImage;
import java.awt.image.ReplicateScaleFilter;
import java.awt.image.SampleModel; import java.awt.image.SampleModel;
import java.awt.image.WritableRaster; import java.awt.image.WritableRaster;
import java.awt.image.renderable.RenderableImage; import java.awt.image.renderable.RenderableImage;
@ -86,6 +90,7 @@ import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.Map; import java.util.Map;
import java.util.WeakHashMap;
/** /**
* This is a 100% Java implementation of the Java2D rendering pipeline. It is * This is a 100% Java implementation of the Java2D rendering pipeline. It is
@ -154,7 +159,14 @@ public abstract class AbstractGraphics2D
extends Graphics2D extends Graphics2D
implements Cloneable, Pixelizer implements Cloneable, Pixelizer
{ {
/**
* Caches scaled versions of an image.
*
* @see #drawImage(Image, int, int, int, int, ImageObserver)
*/
protected static final WeakHashMap<Image, HashMap<Dimension,Image>> imageCache =
new WeakHashMap<Image, HashMap<Dimension, Image>>();
/** /**
* Wether we use anti aliasing for rendering text by default or not. * Wether we use anti aliasing for rendering text by default or not.
*/ */
@ -210,13 +222,19 @@ public abstract class AbstractGraphics2D
/** /**
* The paint context during rendering. * The paint context during rendering.
*/ */
private PaintContext paintContext; private PaintContext paintContext = null;
/** /**
* The background. * The background.
*/ */
private Color background; private Color background = Color.WHITE;
/**
* Foreground color, as set by setColor.
*/
private Color foreground = Color.BLACK;
private boolean isForegroundColorNull = true;
/** /**
* The current font. * The current font.
*/ */
@ -266,15 +284,19 @@ public abstract class AbstractGraphics2D
private static final BasicStroke STANDARD_STROKE = new BasicStroke(); private static final BasicStroke STANDARD_STROKE = new BasicStroke();
private static final HashMap STANDARD_HINTS; private static final HashMap<Key, Object> STANDARD_HINTS;
static { static
HashMap hints = new HashMap(); {
hints.put(RenderingHints.KEY_TEXT_ANTIALIASING,
RenderingHints.VALUE_TEXT_ANTIALIAS_DEFAULT); HashMap<Key, Object> hints = new HashMap<Key, Object>();
hints.put(RenderingHints.KEY_ANTIALIASING, hints.put(RenderingHints.KEY_TEXT_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_DEFAULT); RenderingHints.VALUE_TEXT_ANTIALIAS_DEFAULT);
STANDARD_HINTS = hints; hints.put(RenderingHints.KEY_ANTIALIASING,
} RenderingHints.VALUE_ANTIALIAS_DEFAULT);
STANDARD_HINTS = hints;
}
/** /**
* Creates a new AbstractGraphics2D instance. * Creates a new AbstractGraphics2D instance.
*/ */
@ -626,14 +648,29 @@ public abstract class AbstractGraphics2D
if (p != null) if (p != null)
{ {
paint = p; paint = p;
if (! (paint instanceof Color)) if (! (paint instanceof Color))
isOptimized = false; {
isOptimized = false;
}
else else
{ {
this.foreground = (Color) paint;
isForegroundColorNull = false;
updateOptimization(); updateOptimization();
} }
} }
else
{
this.foreground = Color.BLACK;
isForegroundColorNull = true;
}
// free resources if needed, then put the paint context to null
if (this.paintContext != null)
this.paintContext.dispose();
this.paintContext = null;
} }
/** /**
@ -1058,10 +1095,10 @@ public abstract class AbstractGraphics2D
*/ */
public Color getColor() public Color getColor()
{ {
Color c = null; if (isForegroundColorNull)
if (paint instanceof Color) return null;
c = (Color) paint;
return c; return this.foreground;
} }
/** /**
@ -1070,8 +1107,8 @@ public abstract class AbstractGraphics2D
* @param color the foreground to set * @param color the foreground to set
*/ */
public void setColor(Color color) public void setColor(Color color)
{ {
setPaint(color); this.setPaint(color);
} }
public void setPaintMode() public void setPaintMode()
@ -1468,11 +1505,19 @@ public abstract class AbstractGraphics2D
ImageObserver observer) ImageObserver observer)
{ {
AffineTransform t = new AffineTransform(); AffineTransform t = new AffineTransform();
t.translate(x, y); int imWidth = image.getWidth(observer);
double scaleX = (double) width / (double) image.getWidth(observer); int imHeight = image.getHeight(observer);
double scaleY = (double) height / (double) image.getHeight(observer); if (imWidth == width && imHeight == height)
t.scale(scaleX, scaleY); {
return drawImage(image, t, observer); // No need to scale, fall back to non-scaling loops.
return drawImage(image, x, y, observer);
}
else
{
Image scaled = prepareImage(image, width, height);
// Ideally, this should notify the observer about the scaling progress.
return drawImage(scaled, x, y, observer);
}
} }
/** /**
@ -1639,10 +1684,7 @@ public abstract class AbstractGraphics2D
* *
* @return the bounds of the target * @return the bounds of the target
*/ */
protected Rectangle getDeviceBounds() protected abstract Rectangle getDeviceBounds();
{
return destinationRaster.getBounds();
}
/** /**
* Draws a line in optimization mode. The implementation should respect the * Draws a line in optimization mode. The implementation should respect the
@ -1763,7 +1805,8 @@ public abstract class AbstractGraphics2D
*/ */
public void renderScanline(int y, ScanlineCoverage c) public void renderScanline(int y, ScanlineCoverage c)
{ {
PaintContext pCtx = paintContext; PaintContext pCtx = getPaintContext();
int x0 = c.getMinX(); int x0 = c.getMinX();
int x1 = c.getMaxX(); int x1 = c.getMaxX();
Raster paintRaster = pCtx.getRaster(x0, y, x1 - x0, 1); Raster paintRaster = pCtx.getRaster(x0, y, x1 - x0, 1);
@ -1797,9 +1840,11 @@ public abstract class AbstractGraphics2D
CompositeContext cCtx = composite.createContext(paintColorModel, CompositeContext cCtx = composite.createContext(paintColorModel,
getColorModel(), getColorModel(),
renderingHints); renderingHints);
WritableRaster targetChild = destinationRaster.createWritableTranslatedChild(-x0,- y); WritableRaster raster = getDestinationRaster();
WritableRaster targetChild = raster.createWritableTranslatedChild(-x0, -y);
cCtx.compose(paintRaster, targetChild, targetChild); cCtx.compose(paintRaster, targetChild, targetChild);
updateRaster(destinationRaster, x0, y, x1 - x0, 1); updateRaster(raster, x0, y, x1 - x0, 1);
cCtx.dispose(); cCtx.dispose();
} }
@ -1986,4 +2031,64 @@ public abstract class AbstractGraphics2D
} }
} }
private PaintContext getPaintContext()
{
if (this.paintContext == null)
{
this.paintContext =
this.foreground.createContext(getColorModel(),
getDeviceBounds(),
getClipBounds(),
getTransform(),
getRenderingHints());
}
return this.paintContext;
}
/**
* Scales an image to the specified width and height. This should also
* be used to implement
* {@link Toolkit#prepareImage(Image, int, int, ImageObserver)}.
* This uses {@link Toolkit#createImage(ImageProducer)} to create the actual
* image.
*
* @param image the image to prepare
* @param w the width
* @param h the height
*
* @return the scaled image
*/
public static Image prepareImage(Image image, int w, int h)
{
// Try to find cached scaled image.
HashMap<Dimension,Image> scaledTable = imageCache.get(image);
Dimension size = new Dimension(w, h);
Image scaled = null;
if (scaledTable != null)
{
scaled = scaledTable.get(size);
}
if (scaled == null)
{
// No cached scaled image. Start scaling image now.
ImageProducer source = image.getSource();
ReplicateScaleFilter scaler = new ReplicateScaleFilter(w, h);
FilteredImageSource filteredSource =
new FilteredImageSource(source, scaler);
// Ideally, this should asynchronously scale the image.
Image scaledImage =
Toolkit.getDefaultToolkit().createImage(filteredSource);
scaled = scaledImage;
// Put scaled image in cache.
if (scaledTable == null)
{
scaledTable = new HashMap<Dimension,Image>();
imageCache.put(image, scaledTable);
}
scaledTable.put(size, scaledImage);
}
return scaled;
}
} }

View File

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.java.awt.java2d; package gnu.java.awt.java2d;
import gnu.java.lang.CPStringBuilder;
/** /**
* A collection of active edges for scanline conversion. * A collection of active edges for scanline conversion.
*/ */
@ -183,7 +185,7 @@ final class ActiveEdges
public String toString() public String toString()
{ {
StringBuilder s = new StringBuilder(); CPStringBuilder s = new CPStringBuilder();
s.append("[ActiveEdges] "); s.append("[ActiveEdges] ");
for (int i = 0; i < numActiveEdges; i++) for (int i = 0; i < numActiveEdges; i++)
{ {

View File

@ -39,6 +39,7 @@ exception statement from your version. */
package gnu.java.awt.java2d; package gnu.java.awt.java2d;
import java.awt.GraphicsConfiguration; import java.awt.GraphicsConfiguration;
import java.awt.Rectangle;
import java.awt.image.ColorModel; import java.awt.image.ColorModel;
import java.awt.image.WritableRaster; import java.awt.image.WritableRaster;
@ -71,6 +72,15 @@ public class RasterGraphics
init(); init();
} }
@Override
public void renderScanline(int y, ScanlineCoverage c)
{
if (y >= getDeviceBounds().width)
return;
super.renderScanline(y, c);
}
/** /**
* Returns the color model of this Graphics object. * Returns the color model of this Graphics object.
* *
@ -100,4 +110,9 @@ public class RasterGraphics
return null; return null;
} }
@Override
protected Rectangle getDeviceBounds()
{
return this.raster.getBounds();
}
} }

View File

@ -206,6 +206,7 @@ public final class ScanlineConverter
// Ok, now we can perform the actual scanlining. // Ok, now we can perform the actual scanlining.
int realY = Fixed.intValue(FIXED_DIGITS, y + resolution); int realY = Fixed.intValue(FIXED_DIGITS, y + resolution);
boolean push = lastRealY != realY; boolean push = lastRealY != realY;
doScanline(p, y, push, haveClip); doScanline(p, y, push, haveClip);
// Remove obsolete active edges. // Remove obsolete active edges.

View File

@ -37,6 +37,8 @@
package gnu.java.awt.peer; package gnu.java.awt.peer;
import gnu.java.lang.CPStringBuilder;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.URI; import java.net.URI;
@ -124,7 +126,7 @@ public class GnomeDesktopPeer
protected String execQuery(String command) throws IOException protected String execQuery(String command) throws IOException
{ {
InputStream in = null; InputStream in = null;
StringBuilder output = new StringBuilder(); CPStringBuilder output = new CPStringBuilder();
try try
{ {

View File

@ -37,6 +37,8 @@
package gnu.java.awt.peer; package gnu.java.awt.peer;
import gnu.java.lang.CPStringBuilder;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -104,7 +106,7 @@ public class KDEDesktopPeer
protected String execQuery(String command) throws IOException protected String execQuery(String command) throws IOException
{ {
InputStream in = null; InputStream in = null;
StringBuilder output = new StringBuilder(); CPStringBuilder output = new CPStringBuilder();
try try
{ {

View File

@ -45,6 +45,8 @@ import gnu.java.awt.ClasspathToolkit;
import gnu.java.awt.peer.ClasspathFontPeer; import gnu.java.awt.peer.ClasspathFontPeer;
import gnu.java.awt.font.opentype.NameDecoder; import gnu.java.awt.font.opentype.NameDecoder;
import gnu.java.lang.CPStringBuilder;
import java.awt.Font; import java.awt.Font;
import java.awt.FontMetrics; import java.awt.FontMetrics;
import java.awt.Toolkit; import java.awt.Toolkit;
@ -211,7 +213,7 @@ public class GdkFontPeer extends ClasspathFontPeer
private String buildString(CharacterIterator iter) private String buildString(CharacterIterator iter)
{ {
StringBuffer sb = new StringBuffer(); CPStringBuilder sb = new CPStringBuilder();
for(char c = iter.first(); c != CharacterIterator.DONE; c = iter.next()) for(char c = iter.first(); c != CharacterIterator.DONE; c = iter.next())
sb.append(c); sb.append(c);
return sb.toString(); return sb.toString();
@ -219,7 +221,7 @@ public class GdkFontPeer extends ClasspathFontPeer
private String buildString(CharacterIterator iter, int begin, int limit) private String buildString(CharacterIterator iter, int begin, int limit)
{ {
StringBuffer sb = new StringBuffer(); CPStringBuilder sb = new CPStringBuilder();
int i = 0; int i = 0;
for(char c = iter.first(); c != CharacterIterator.DONE; c = iter.next(), i++) for(char c = iter.first(); c != CharacterIterator.DONE; c = iter.next(), i++)
{ {

View File

@ -38,10 +38,25 @@ exception statement from your version. */
package gnu.java.awt.peer.gtk; package gnu.java.awt.peer.gtk;
import java.awt.Image; import gnu.java.lang.CPStringBuilder;
import java.awt.datatransfer.*;
import java.io.*; import java.awt.Image;
import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.ClipboardOwner;
import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.StringSelection;
import java.awt.datatransfer.Transferable;
import java.awt.datatransfer.UnsupportedFlavorException;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.InputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.io.Reader;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.List; import java.util.List;
import java.util.Iterator; import java.util.Iterator;
@ -247,7 +262,7 @@ public class GtkClipboard extends Clipboard
Reader r = plainText.getReaderForText(contents); Reader r = plainText.getReaderForText(contents);
if (r != null) if (r != null)
{ {
StringBuffer sb = new StringBuffer(); CPStringBuilder sb = new CPStringBuilder();
char[] cs = new char[1024]; char[] cs = new char[1024];
int l = r.read(cs); int l = r.read(cs);
while (l != -1) while (l != -1)

View File

@ -39,7 +39,9 @@ package gnu.java.awt.peer.x;
import java.awt.Color; import java.awt.Color;
import java.awt.GraphicsConfiguration; import java.awt.GraphicsConfiguration;
import java.awt.Rectangle;
import java.awt.image.ColorModel; import java.awt.image.ColorModel;
import java.util.Map;
import gnu.java.awt.java2d.AbstractGraphics2D; import gnu.java.awt.java2d.AbstractGraphics2D;
import gnu.x11.extension.glx.GL; import gnu.x11.extension.glx.GL;
@ -70,7 +72,8 @@ public class GLGraphics extends AbstractGraphics2D
public void setBackground(Color b) public void setBackground(Color b)
{ {
super.setBackground(b); super.setBackground(b);
gl.clear_color(b.getRed() / 255.F, b.getGreen() / 255.F,
gl.clearColor(b.getRed() / 255.F, b.getGreen() / 255.F,
b.getBlue() / 255.F, b.getAlpha() / 255.F); b.getBlue() / 255.F, b.getAlpha() / 255.F);
} }
@ -120,4 +123,12 @@ public class GLGraphics extends AbstractGraphics2D
throw new UnsupportedOperationException("Not yet implemented"); throw new UnsupportedOperationException("Not yet implemented");
} }
@Override
protected Rectangle getDeviceBounds()
{
// FIXME: not sure it's correct
return new Rectangle(0, 0,
gl.display.default_screen.width,
gl.display.default_screen.height);
}
} }

View File

@ -38,6 +38,9 @@ exception statement from your version. */
package gnu.java.awt.peer.x; package gnu.java.awt.peer.x;
import java.awt.AWTEvent;
import java.awt.Component;
import java.awt.Container;
import java.awt.Graphics; import java.awt.Graphics;
import java.awt.Insets; import java.awt.Insets;
import java.awt.Rectangle; import java.awt.Rectangle;
@ -47,18 +50,26 @@ import java.awt.event.ComponentEvent;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.PaintEvent; import java.awt.event.PaintEvent;
import java.awt.event.WindowEvent;
import java.util.HashMap; import java.util.HashMap;
import gnu.java.awt.ComponentReshapeEvent;
import gnu.x11.Atom;
import gnu.x11.Display; import gnu.x11.Display;
import gnu.x11.event.ButtonPress; import gnu.x11.event.ButtonPress;
import gnu.x11.event.ButtonRelease; import gnu.x11.event.ButtonRelease;
import gnu.x11.event.ClientMessage;
import gnu.x11.event.ConfigureNotify; import gnu.x11.event.ConfigureNotify;
import gnu.x11.event.DestroyNotify;
import gnu.x11.event.Event; import gnu.x11.event.Event;
import gnu.x11.event.Expose; import gnu.x11.event.Expose;
import gnu.x11.event.Input; import gnu.x11.event.Input;
import gnu.x11.event.KeyPress; import gnu.x11.event.KeyPress;
import gnu.x11.event.KeyRelease; import gnu.x11.event.KeyRelease;
import gnu.x11.event.MotionNotify; import gnu.x11.event.MotionNotify;
import gnu.x11.event.PropertyNotify;
import gnu.x11.event.ResizeRequest;
import gnu.x11.event.UnmapNotify;
/** /**
* Fetches events from X, translates them to AWT events and pumps them up * Fetches events from X, translates them to AWT events and pumps them up
@ -148,122 +159,217 @@ public class XEventPump
windows.remove(new Integer(xWindow.id)); windows.remove(new Integer(xWindow.id));
} }
private void handleButtonPress(ButtonPress event)
{
Integer key = new Integer(event.getEventWindowID());
Window awtWindow = (Window) windows.get(key);
// Create and post the mouse event.
int button = event.detail();
// AWT cannot handle more than 3 buttons and expects 0 instead.
if (button >= gnu.x11.Input.BUTTON3)
button = 0;
drag = button;
Component target =
findMouseEventTarget(awtWindow, event.getEventX(), event.getEventY());
if(target == null)
{
target = awtWindow;
}
MouseEvent mp = new MouseEvent(target, MouseEvent.MOUSE_PRESSED,
System.currentTimeMillis(),
KeyboardMapping.mapModifiers(event.getState())
| buttonToModifier(button),
event.getEventX(), event.getEventY(),
1, false, button);
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(mp);
}
private void handleButtonRelease(ButtonRelease event)
{
Integer key = new Integer(event.getEventWindowID());
Window awtWindow = (Window) windows.get(key);
int button = event.detail();
// AWT cannot handle more than 3 buttons and expects 0 instead.
if (button >= gnu.x11.Input.BUTTON3)
button = 0;
drag = -1;
Component target =
findMouseEventTarget(awtWindow, event.getEventX(), event.getEventY());
if(target == null)
{
target = awtWindow;
}
MouseEvent mr = new MouseEvent(target, MouseEvent.MOUSE_RELEASED,
System.currentTimeMillis(),
KeyboardMapping.mapModifiers(event.getState())
| buttonToModifier(button),
event.getEventX(), event.getEventY(),
1, false, button);
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(mr);
}
private void handleMotionNotify(MotionNotify event)
{
Integer key = new Integer(event.getEventWindowID());
Window awtWindow = (Window) windows.get(key);
int button = event.detail();
// AWT cannot handle more than 3 buttons and expects 0 instead.
if (button >= gnu.x11.Input.BUTTON3)
button = 0;
MouseEvent mm = null;
if (drag == -1)
{
mm = new MouseEvent(awtWindow, MouseEvent.MOUSE_MOVED,
System.currentTimeMillis(),
KeyboardMapping.mapModifiers(event.getState())
| buttonToModifier(button),
event.getEventX(), event.getEventY(),
1, false);
}
else
{
mm = new MouseEvent(awtWindow, MouseEvent.MOUSE_DRAGGED,
System.currentTimeMillis(),
KeyboardMapping.mapModifiers(event.getState())
| buttonToModifier(drag),
event.getEventX(), event.getEventY(),
1, false);
}
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(mm);
}
// FIME: refactor and make faster, maybe caching the event and handle
// and/or check timing (timing is generated for PropertyChange)?
private void handleExpose(Expose event)
{
Integer key = new Integer(event.window_id);
Window awtWindow = (Window) windows.get(key);
if (XToolkit.DEBUG)
System.err.println("expose request for window id: " + key);
Rectangle r = new Rectangle(event.x(), event.y(), event.width(),
event.height());
// We need to clear the background of the exposed rectangle.
assert awtWindow != null : "awtWindow == null for window ID: " + key;
Graphics g = awtWindow.getGraphics();
g.clearRect(r.x, r.y, r.width, r.height);
g.dispose();
XWindowPeer xwindow = (XWindowPeer) awtWindow.getPeer();
Insets i = xwindow.insets();
if (event.width() != awtWindow.getWidth() - i.left - i.right
|| event.height() != awtWindow.getHeight() - i.top - i.bottom)
{
int w = event.width();
int h = event.height();
int x = xwindow.xwindow.x;
int y = xwindow.xwindow.y;
if (XToolkit.DEBUG)
System.err.println("Setting size on AWT window: " + w
+ ", " + h + ", " + awtWindow.getWidth()
+ ", " + awtWindow.getHeight());
// new width and height
xwindow.xwindow.width = w;
xwindow.xwindow.height = h;
// reshape the window
ComponentReshapeEvent cre =
new ComponentReshapeEvent(awtWindow, x, y, w, h);
awtWindow.dispatchEvent(cre);
}
ComponentEvent ce =
new ComponentEvent(awtWindow, ComponentEvent.COMPONENT_RESIZED);
awtWindow.dispatchEvent(ce);
PaintEvent pev = new PaintEvent(awtWindow, PaintEvent.UPDATE, r);
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(pev);
}
private void handleDestroyNotify(DestroyNotify destroyNotify)
{
if (XToolkit.DEBUG)
System.err.println("DestroyNotify event: " + destroyNotify);
Integer key = new Integer(destroyNotify.event_window_id);
Window awtWindow = (Window) windows.get(key);
AWTEvent event = new WindowEvent(awtWindow, WindowEvent.WINDOW_CLOSED);
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(event);
}
private void handleClientMessage(ClientMessage clientMessage)
{
if (XToolkit.DEBUG)
System.err.println("ClientMessage event: " + clientMessage);
if (clientMessage.delete_window())
{
if (XToolkit.DEBUG)
System.err.println("ClientMessage is a delete_window event");
Integer key = new Integer(clientMessage.window_id);
Window awtWindow = (Window) windows.get(key);
AWTEvent event = new WindowEvent(awtWindow, WindowEvent.WINDOW_CLOSING);
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(event);
}
}
private void handleEvent(Event xEvent) private void handleEvent(Event xEvent)
{ {
Integer key = null;
Window awtWindow = null;
if (XToolkit.DEBUG) if (XToolkit.DEBUG)
System.err.println("fetched event: " + xEvent); System.err.println("fetched event: " + xEvent);
switch (xEvent.code())
switch (xEvent.code() & 0x7f)
{ {
case ButtonPress.CODE: case ButtonPress.CODE:
ButtonPress bp = (ButtonPress) xEvent; this.handleButtonPress((ButtonPress) xEvent);
key= new Integer(bp.event_window_id);
awtWindow = (Window) windows.get(key);
// Create and post the mouse event.
int button = bp.detail();
// AWT cannot handle more than 3 buttons and expects 0 instead.
if (button >= gnu.x11.Input.BUTTON3)
button = 0;
drag = button;
MouseEvent mp = new MouseEvent(awtWindow, MouseEvent.MOUSE_PRESSED,
System.currentTimeMillis(),
KeyboardMapping.mapModifiers(bp.state()) | buttonToModifier(button),
bp.event_x(), bp.event_y(),
1, false, button);
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(mp);
break; break;
case ButtonRelease.CODE: case ButtonRelease.CODE:
ButtonRelease br = (ButtonRelease) xEvent; this.handleButtonRelease((ButtonRelease) xEvent);
key= new Integer(br.event_window_id);
awtWindow = (Window) windows.get(key);
button = br.detail();
// AWT cannot handle more than 3 buttons and expects 0 instead.
if (button >= gnu.x11.Input.BUTTON3)
button = 0;
drag = -1;
MouseEvent mr = new MouseEvent(awtWindow, MouseEvent.MOUSE_RELEASED,
System.currentTimeMillis(),
KeyboardMapping.mapModifiers(br.state()) | buttonToModifier(button),
br.event_x(), br.event_y(),
1, false, button);
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(mr);
break; break;
case MotionNotify.CODE: case MotionNotify.CODE:
MotionNotify mn = (MotionNotify) xEvent; this.handleMotionNotify((MotionNotify) xEvent);
key= new Integer(mn.event_window_id);
awtWindow = (Window) windows.get(key);
MouseEvent mm;
if (drag == -1)
{
mm = new MouseEvent(awtWindow, MouseEvent.MOUSE_MOVED,
System.currentTimeMillis(), 0,
mn.event_x(), mn.event_y(),
1, false);
}
else
{
mm = new MouseEvent(awtWindow, MouseEvent.MOUSE_DRAGGED,
System.currentTimeMillis(), 0,
mn.event_x(), mn.event_y(),
1, false);
}
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(mm);
break;
case ConfigureNotify.CODE:
key= new Integer(((ConfigureNotify) xEvent).event_window_id);
awtWindow = (Window) windows.get(key);
ConfigureNotify c = (ConfigureNotify) xEvent;
if (XToolkit.DEBUG)
System.err.println("resize request for window id: " + key);
// Detect and report size changes.
XWindowPeer xwindow = (XWindowPeer) awtWindow.getPeer();
Insets i = xwindow.insets();
if (c.width() != awtWindow.getWidth() - i.left - i.right
|| c.height() != awtWindow.getHeight() - i.top - i.bottom)
{
if (XToolkit.DEBUG)
System.err.println("Setting size on AWT window: " + c.width()
+ ", " + c.height() + ", " + awtWindow.getWidth()
+ ", " + awtWindow.getHeight());
xwindow.callback = true;
xwindow.xwindow.width = c.width();
xwindow.xwindow.height = c.height();
awtWindow.setSize(c.width() + i.left + i.right,
c.height() + i.top + i.bottom);
xwindow.callback = false;
}
break; break;
case Expose.CODE: case Expose.CODE:
key= new Integer(((Expose) xEvent).window_id); this.handleExpose((Expose) xEvent);
awtWindow = (Window) windows.get(key);
Expose exp = (Expose) xEvent;
if (XToolkit.DEBUG)
System.err.println("expose request for window id: " + key);
Rectangle r = new Rectangle(exp.x(), exp.y(), exp.width(),
exp.height());
//System.err.println("expose paint: " + r);
// We need to clear the background of the exposed rectangle.
assert awtWindow != null : "awtWindow == null for window ID: " + key;
Graphics g = awtWindow.getGraphics();
g.clearRect(r.x, r.y, r.width, r.height);
g.dispose();
PaintEvent pev = new PaintEvent(awtWindow, PaintEvent.PAINT, r);
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(pev);
break; break;
case KeyPress.CODE: case KeyPress.CODE:
case KeyRelease.CODE: case KeyRelease.CODE:
key = new Integer(((Input) xEvent).event_window_id); Integer key = new Integer(((Input) xEvent).getEventWindowID());
awtWindow = (Window) windows.get(key); Window awtWindow = (Window) windows.get(key);
handleKeyEvent(xEvent, awtWindow); handleKeyEvent(xEvent, awtWindow);
break; break;
case DestroyNotify.CODE:
this.handleDestroyNotify((DestroyNotify) xEvent);
break;
case ClientMessage.CODE:
this.handleClientMessage((ClientMessage) xEvent);
break;
case PropertyNotify.CODE:
key = new Integer (((PropertyNotify) xEvent).getWindowID());
awtWindow = (Window) windows.get(key);
AWTEvent event = new WindowEvent(awtWindow, WindowEvent.WINDOW_STATE_CHANGED);
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(event);
break;
default: default:
if (XToolkit.DEBUG) if (XToolkit.DEBUG)
System.err.println("Unhandled X event: " + xEvent); System.err.println("Unhandled X event: " + xEvent);
@ -280,7 +386,7 @@ public class XEventPump
{ {
Input keyEvent = (Input) xEvent; Input keyEvent = (Input) xEvent;
int xKeyCode = keyEvent.detail(); int xKeyCode = keyEvent.detail();
int xMods = keyEvent.state(); int xMods = keyEvent.getState();
int keyCode = KeyboardMapping.mapToKeyCode(xEvent.display.input, xKeyCode, int keyCode = KeyboardMapping.mapToKeyCode(xEvent.display.input, xKeyCode,
xMods); xMods);
char keyChar = KeyboardMapping.mapToKeyChar(xEvent.display.input, xKeyCode, char keyChar = KeyboardMapping.mapToKeyChar(xEvent.display.input, xKeyCode,
@ -334,5 +440,47 @@ public class XEventPump
return 0; return 0;
} }
/**
* Finds the heavyweight mouse event target.
*
* @param src the original source of the event
*
* @param pt the event coordinates
*
* @return the real mouse event target
*/
private Component findMouseEventTarget(Component src, int x, int y)
{
Component found = null;
if (src instanceof Container)
{
Container cont = (Container) src;
int numChildren = cont.getComponentCount();
for (int i = 0; i < numChildren && found == null; i++)
{
Component child = cont.getComponent(i);
if (child != null && child.isVisible()
&& child.contains(x - child.getX(), y - child.getY()))
{
if (child instanceof Container)
{
Component deeper = findMouseEventTarget(child,
x - child.getX(),
y - child.getY());
if (deeper != null)
found = deeper;
}
else if (! child.isLightweight())
found = child;
}
}
}
// Consider the source itself.
if (found == null && src.contains(x, y) && ! src.isLightweight())
found = src;
return found;
}
} }

View File

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.java.awt.peer.x; package gnu.java.awt.peer.x;
import gnu.java.lang.CPStringBuilder;
import java.awt.AWTError; import java.awt.AWTError;
import java.awt.Font; import java.awt.Font;
import java.awt.FontMetrics; import java.awt.FontMetrics;
@ -675,7 +677,7 @@ public class XFontPeer
*/ */
static String encodeFont(String name, int style, int size) static String encodeFont(String name, int style, int size)
{ {
StringBuilder key = new StringBuilder(); CPStringBuilder key = new CPStringBuilder();
key.append(validName(name)); key.append(validName(name));
key.append('.'); key.append('.');
switch (style) switch (style)

View File

@ -93,8 +93,7 @@ public class XFramePeer
public int getState() public int getState()
{ {
// TODO: Implement this. return 0;
throw new UnsupportedOperationException("Not yet implemented.");
} }
public void setState(int state) public void setState(int state)

View File

@ -313,7 +313,7 @@ public class XGraphics2D
{ {
// TODO: Optimize for different standard bit-depths. // TODO: Optimize for different standard bit-depths.
Color c = (Color) p; Color c = (Color) p;
XToolkit tk = (XToolkit) Toolkit.getDefaultToolkit(); /* XToolkit tk = (XToolkit) Toolkit.getDefaultToolkit();
HashMap colorMap = tk.colorMap; HashMap colorMap = tk.colorMap;
gnu.x11.Color col = (gnu.x11.Color) colorMap.get(c); gnu.x11.Color col = (gnu.x11.Color) colorMap.get(c);
if (col == null) if (col == null)
@ -323,8 +323,10 @@ public class XGraphics2D
c.getGreen() * 256, c.getGreen() * 256,
c.getBlue() * 256); c.getBlue() * 256);
colorMap.put(c, col); colorMap.put(c, col);
} }*/
xgc.set_foreground(col); //xgc.set_foreground(col);
xgc.set_foreground(c.getRGB());
foreground = c; foreground = c;
} }
} }
@ -392,9 +394,23 @@ public class XGraphics2D
xdrawable.put_image(xgc, zpixmap, x, y); xdrawable.put_image(xgc, zpixmap, x, y);
imageCache.put(image, zpixmap); imageCache.put(image, zpixmap);
} else { } else {
ZPixmap zpixmap = (ZPixmap) xdrawable.image(x, y, w, h,
0xffffffff, // TODO optimize reusing the rectangles
gnu.x11.image.Image.Format.ZPIXMAP); Rectangle source =
new Rectangle(0, 0, xdrawable.width, xdrawable.height);
Rectangle target = new Rectangle(x, y, w, h);
Rectangle destination = source.intersection(target);
x = destination.x;
y = destination.y;
w = destination.width;
h = destination.height;
ZPixmap zpixmap =
(ZPixmap) xdrawable.image(x, y, w, h,
0xffffffff,
gnu.x11.image.Image.Format.ZPIXMAP);
for (int yy = 0; yy < h; yy++) for (int yy = 0; yy < h; yy++)
{ {
for (int xx = 0; xx < w; xx++) for (int xx = 0; xx < w; xx++)

View File

@ -146,8 +146,7 @@ public class XGraphicsConfiguration
public AffineTransform getDefaultTransform() public AffineTransform getDefaultTransform()
{ {
// TODO: Implement this. return new AffineTransform();
throw new UnsupportedOperationException("Not yet implemented.");
} }
public AffineTransform getNormalizingTransform() public AffineTransform getNormalizingTransform()
@ -158,8 +157,10 @@ public class XGraphicsConfiguration
public Rectangle getBounds() public Rectangle getBounds()
{ {
// TODO: Implement this. Display d = device.getDisplay();
throw new UnsupportedOperationException("Not yet implemented."); Screen screen = d.default_screen;
return new Rectangle(0, 0, screen.width, screen.height);
} }
/** /**

View File

@ -39,6 +39,7 @@ package gnu.java.awt.peer.x;
import gnu.classpath.SystemProperties; import gnu.classpath.SystemProperties;
import gnu.x11.Display; import gnu.x11.Display;
import gnu.x11.EscherServerConnectionException;
import java.awt.GraphicsConfiguration; import java.awt.GraphicsConfiguration;
import java.awt.GraphicsDevice; import java.awt.GraphicsDevice;
@ -127,9 +128,16 @@ public class XGraphicsDevice
Socket socket = createLocalSocket(); Socket socket = createLocalSocket();
if (socket != null) if (socket != null)
{ {
display = new Display(socket, "localhost", try
displayName.display_no, {
displayName.screen_no); display = new Display(socket, "localhost",
displayName.display_no,
displayName.screen_no);
}
catch (EscherServerConnectionException e)
{
throw new RuntimeException(e.getCause());
}
} }
} }
@ -137,8 +145,17 @@ public class XGraphicsDevice
// when the connection is probably remote or when we couldn't load // when the connection is probably remote or when we couldn't load
// the LocalSocket class stuff. // the LocalSocket class stuff.
if (display == null) if (display == null)
display = new Display(displayName); {
try
{
display = new Display(displayName);
}
catch (EscherServerConnectionException e)
{
throw new RuntimeException(e.getCause());
}
}
eventPump = new XEventPump(display); eventPump = new XEventPump(display);
} }
return display; return display;

View File

@ -39,13 +39,19 @@ exception statement from your version. */
package gnu.java.awt.peer.x; package gnu.java.awt.peer.x;
import gnu.x11.Pixmap; import gnu.x11.Pixmap;
import gnu.x11.image.ZPixmap;
import java.awt.Graphics; import java.awt.Graphics;
import java.awt.GraphicsEnvironment; import java.awt.GraphicsEnvironment;
import java.awt.Image; import java.awt.Image;
import java.awt.image.ColorModel;
import java.awt.image.ImageConsumer;
import java.awt.image.ImageObserver; import java.awt.image.ImageObserver;
import java.awt.image.ImageProducer; import java.awt.image.ImageProducer;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.Vector;
public class XImage public class XImage
extends Image extends Image
@ -75,8 +81,7 @@ public class XImage
public ImageProducer getSource() public ImageProducer getSource()
{ {
// TODO: Implement this. return new XImageProducer();
throw new UnsupportedOperationException("Not yet implemented.");
} }
/** /**
@ -108,4 +113,66 @@ public class XImage
{ {
pixmap.free(); pixmap.free();
} }
protected class XImageProducer implements ImageProducer
{
private Vector<ImageConsumer> consumers = new Vector<ImageConsumer>();
public void addConsumer(ImageConsumer ic)
{
if (ic != null && !isConsumer(ic))
this.consumers.add(ic);
}
public boolean isConsumer(ImageConsumer ic)
{
return this.consumers.contains(ic);
}
public void removeConsumer(ImageConsumer ic)
{
if (ic != null)
this.consumers.remove(ic);
}
public void requestTopDownLeftRightResend(ImageConsumer ic)
{
/* just ignore the call */
}
public void startProduction(ImageConsumer ic)
{
this.addConsumer(ic);
for (ImageConsumer consumer : this.consumers)
{
int width = XImage.this.getWidth(null);
int height = XImage.this.getHeight(null);
XGraphics2D graphics = (XGraphics2D) getGraphics();
ColorModel model = graphics.getColorModel();
graphics.dispose();
ZPixmap zpixmap = (ZPixmap)
XImage.this.pixmap.image(0, 0, width, height,
0xffffffff,
gnu.x11.image.Image.Format.ZPIXMAP);
int size = zpixmap.get_data_length();
System.out.println("size: " + size + ", w = " + width + ", h = " + height);
int [] pixel = new int[size];
for (int i = 0; i < size; i++)
pixel[i] = zpixmap.get_data_element(i);
consumer.setHints(ImageConsumer.SINGLEPASS);
consumer.setDimensions(width, height);
consumer.setPixels(0, 0, width, height, model, pixel, 0, width);
consumer.imageComplete(ImageConsumer.STATICIMAGEDONE);
}
System.out.println("done!");
}
}
} }

View File

@ -54,6 +54,7 @@ import java.awt.Frame;
import java.awt.GraphicsConfiguration; import java.awt.GraphicsConfiguration;
import java.awt.GraphicsDevice; import java.awt.GraphicsDevice;
import java.awt.GraphicsEnvironment; import java.awt.GraphicsEnvironment;
import java.awt.HeadlessException;
import java.awt.Image; import java.awt.Image;
import java.awt.Label; import java.awt.Label;
import java.awt.List; import java.awt.List;
@ -120,11 +121,16 @@ import gnu.java.awt.ClasspathToolkit;
import gnu.java.awt.EmbeddedWindow; import gnu.java.awt.EmbeddedWindow;
import gnu.java.awt.font.OpenTypeFontPeer; import gnu.java.awt.font.OpenTypeFontPeer;
import gnu.java.awt.image.ImageConverter; import gnu.java.awt.image.ImageConverter;
import gnu.java.awt.java2d.AbstractGraphics2D;
import gnu.java.awt.peer.ClasspathFontPeer; import gnu.java.awt.peer.ClasspathFontPeer;
import gnu.java.awt.peer.EmbeddedWindowPeer; import gnu.java.awt.peer.EmbeddedWindowPeer;
import gnu.java.awt.peer.swing.SwingButtonPeer;
import gnu.java.awt.peer.swing.SwingCanvasPeer; import gnu.java.awt.peer.swing.SwingCanvasPeer;
import gnu.java.awt.peer.swing.SwingCheckboxPeer;
import gnu.java.awt.peer.swing.SwingLabelPeer; import gnu.java.awt.peer.swing.SwingLabelPeer;
import gnu.java.awt.peer.swing.SwingPanelPeer; import gnu.java.awt.peer.swing.SwingPanelPeer;
import gnu.java.awt.peer.swing.SwingTextAreaPeer;
import gnu.java.awt.peer.swing.SwingTextFieldPeer;
public class XToolkit public class XToolkit
extends ClasspathToolkit extends ClasspathToolkit
@ -232,18 +238,24 @@ public class XToolkit
protected ButtonPeer createButton(Button target) protected ButtonPeer createButton(Button target)
{ {
// TODO: Implement this. checkHeadLess("No ButtonPeer can be created in an headless" +
throw new UnsupportedOperationException("Not yet implemented."); "graphics environment.");
return new SwingButtonPeer(target);
} }
protected TextFieldPeer createTextField(TextField target) protected TextFieldPeer createTextField(TextField target)
{ {
// TODO: Implement this. checkHeadLess("No TextFieldPeer can be created in an headless " +
throw new UnsupportedOperationException("Not yet implemented."); "graphics environment.");
return new SwingTextFieldPeer(target);
} }
protected LabelPeer createLabel(Label target) protected LabelPeer createLabel(Label target)
{ {
checkHeadLess("No LabelPeer can be created in an headless graphics " +
"environment.");
return new SwingLabelPeer(target); return new SwingLabelPeer(target);
} }
@ -255,8 +267,10 @@ public class XToolkit
protected CheckboxPeer createCheckbox(Checkbox target) protected CheckboxPeer createCheckbox(Checkbox target)
{ {
// TODO: Implement this. checkHeadLess("No CheckboxPeer can be created in an headless graphics " +
throw new UnsupportedOperationException("Not yet implemented."); "environment.");
return new SwingCheckboxPeer(target);
} }
protected ScrollbarPeer createScrollbar(Scrollbar target) protected ScrollbarPeer createScrollbar(Scrollbar target)
@ -273,8 +287,10 @@ public class XToolkit
protected TextAreaPeer createTextArea(TextArea target) protected TextAreaPeer createTextArea(TextArea target)
{ {
// TODO: Implement this. checkHeadLess("No TextAreaPeer can be created in an headless graphics " +
throw new UnsupportedOperationException("Not yet implemented."); "environment.");
return new SwingTextAreaPeer(target);
} }
protected ChoicePeer createChoice(Choice target) protected ChoicePeer createChoice(Choice target)
@ -514,14 +530,14 @@ public class XToolkit
public boolean prepareImage(Image image, int width, int height, ImageObserver observer) public boolean prepareImage(Image image, int width, int height, ImageObserver observer)
{ {
// Images are loaded synchronously, so we don't bother and return true. Image scaled = AbstractGraphics2D.prepareImage(image, width, height);
return true; return checkImage(image, width, height, observer) == ImageObserver.ALLBITS;
} }
public int checkImage(Image image, int width, int height, ImageObserver observer) public int checkImage(Image image, int width, int height, ImageObserver observer)
{ {
// TODO: Implement this. // Images are loaded synchronously, so we don't bother and return true.
throw new UnsupportedOperationException("Not yet implemented."); return ImageObserver.ALLBITS;
} }
public Image createImage(ImageProducer producer) public Image createImage(ImageProducer producer)
@ -638,4 +654,14 @@ public class XToolkit
return false; return false;
} }
private void checkHeadLess(String message) throws HeadlessException
{
if(GraphicsEnvironment.isHeadless())
{
if(message == null)
message = "This method cannot be called in headless mode.";
throw new HeadlessException(message);
}
}
} }

View File

@ -71,21 +71,16 @@ public class XWindowPeer
private static int standardSelect = Event.BUTTON_PRESS_MASK private static int standardSelect = Event.BUTTON_PRESS_MASK
| Event.BUTTON_RELEASE_MASK | Event.BUTTON_RELEASE_MASK
| Event.POINTER_MOTION_MASK | Event.POINTER_MOTION_MASK
//| Event.RESIZE_REDIRECT_MASK // | Event.RESIZE_REDIRECT_MASK //
| Event.EXPOSURE_MASK | Event.EXPOSURE_MASK
//| Event.PROPERTY_CHANGE_MASK | Event.PROPERTY_CHANGE_MASK
| Event.STRUCTURE_NOTIFY_MASK //| Event.STRUCTURE_NOTIFY_MASK
//| Event.SUBSTRUCTURE_NOTIFY_MASK
| Event.KEY_PRESS_MASK | Event.KEY_PRESS_MASK
| Event.KEY_RELEASE_MASK | Event.KEY_RELEASE_MASK
//| Event.VISIBILITY_CHANGE_MASK //
; ;
/**
* Indicates if we are in callback mode, that is when a property (like size)
* is changed in reponse to a request from the X server and doesn't need
* to be propagated back to the X server.
*/
boolean callback = false;
/** /**
* The X window. * The X window.
*/ */
@ -110,8 +105,10 @@ public class XWindowPeer
int h = Math.max(window.getHeight(), 1); int h = Math.max(window.getHeight(), 1);
xwindow = new Window(dev.getDisplay().default_root, x, y, w, h, 0, atts); xwindow = new Window(dev.getDisplay().default_root, x, y, w, h, 0, atts);
xwindow.select_input(standardSelect); xwindow.select_input(standardSelect);
dev.getEventPump().registerWindow(xwindow, window); dev.getEventPump().registerWindow(xwindow, window);
xwindow.set_wm_delete_window();
boolean undecorated; boolean undecorated;
if (awtComponent instanceof Frame) if (awtComponent instanceof Frame)
{ {
@ -269,14 +266,9 @@ public class XWindowPeer
*/ */
public void reshape(int x, int y, int width, int height) public void reshape(int x, int y, int width, int height)
{ {
// Need to substract insets because AWT size is including insets, Insets i = insets;
// and X size is excluding insets. xwindow.move_resize(x - i.left, y - i.right, width - i.left - i.right,
if (! callback) height - i.top - i.bottom);
{
Insets i = insets;
xwindow.move_resize(x - i.left, y - i.right, width - i.left - i.right,
height - i.top - i.bottom);
}
} }
public Insets insets() public Insets insets()
@ -303,4 +295,9 @@ public class XWindowPeer
XGraphicsDevice dev = XToolkit.getDefaultDevice(); XGraphicsDevice dev = XToolkit.getDefaultDevice();
dev.getEventPump().unregisterWindow(xwindow); dev.getEventPump().unregisterWindow(xwindow);
} }
public Window getXwindow()
{
return xwindow;
}
} }

File diff suppressed because it is too large Load Diff

View File

@ -102,7 +102,7 @@ public class ClassHelper
String name = klass.getName(); String name = klass.getName();
if (arrayCount == 0) if (arrayCount == 0)
return name; return name;
StringBuilder b = new StringBuilder(name.length() + 2 * arrayCount); CPStringBuilder b = new CPStringBuilder(name.length() + 2 * arrayCount);
b.append(name); b.append(name);
for (int i = 0; i < arrayCount; ++i) for (int i = 0; i < arrayCount; ++i)
b.append("[]"); b.append("[]");

View File

@ -38,7 +38,19 @@ exception statement from your version. */
package gnu.java.lang.reflect; package gnu.java.lang.reflect;
import java.lang.reflect.*; import gnu.java.lang.CPStringBuilder;
import java.lang.reflect.Constructor;
import java.lang.reflect.GenericArrayType;
import java.lang.reflect.GenericDeclaration;
import java.lang.reflect.GenericSignatureFormatError;
import java.lang.reflect.MalformedParameterizedTypeException;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
import java.lang.reflect.WildcardType;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -184,7 +196,7 @@ final class ParameterizedTypeImpl extends TypeImpl implements ParameterizedType
public String toString() public String toString()
{ {
StringBuilder sb = new StringBuilder(); CPStringBuilder sb = new CPStringBuilder();
if (owner != null) if (owner != null)
{ {
sb.append(owner); sb.append(owner);

View File

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.java.lang.reflect; package gnu.java.lang.reflect;
import gnu.java.lang.CPStringBuilder;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Member; import java.lang.reflect.Member;
@ -239,7 +241,7 @@ public class TypeSignature
public static String getEncodingOfMethod(Method m) public static String getEncodingOfMethod(Method m)
{ {
Class[] paramTypes = m.getParameterTypes(); Class[] paramTypes = m.getParameterTypes();
StringBuilder buf = new StringBuilder("("); CPStringBuilder buf = new CPStringBuilder("(");
for (int i = 0; i < paramTypes.length; i++) for (int i = 0; i < paramTypes.length; i++)
buf.append(getEncodingOfClass(paramTypes[i].getName(), true)); buf.append(getEncodingOfClass(paramTypes[i].getName(), true));
buf.append(')').append(getEncodingOfClass(m.getReturnType().getName(), buf.append(')').append(getEncodingOfClass(m.getReturnType().getName(),
@ -261,7 +263,7 @@ public class TypeSignature
public static String getEncodingOfConstructor(Constructor c) public static String getEncodingOfConstructor(Constructor c)
{ {
Class[] paramTypes = c.getParameterTypes(); Class[] paramTypes = c.getParameterTypes();
StringBuilder buf = new StringBuilder("("); CPStringBuilder buf = new CPStringBuilder("(");
for (int i = 0; i < paramTypes.length; i++) for (int i = 0; i < paramTypes.length; i++)
buf.append(getEncodingOfClass(paramTypes[i].getName(), true)); buf.append(getEncodingOfClass(paramTypes[i].getName(), true));
buf.append(")V"); buf.append(")V");

View File

@ -0,0 +1,474 @@
/* gnu.java.math.GMP -- Arbitary precision integers using GMP
Copyright (C) 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
GNU Classpath is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA.
Linking this library statically or dynamically with other modules is
making a combined work based on this library. Thus, the terms and
conditions of the GNU General Public License cover the whole
combination.
As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent
modules, and to copy and distribute the resulting executable under
terms of your choice, provided that you also meet, for each linked
independent module, the terms and conditions of the license of that
module. An independent module is a module which is not derived from
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
package gnu.java.math;
import gnu.classpath.Pointer;
/**
* Implement BigInteger using GMP
*/
public final class GMP
{
private Pointer native_ptr;
private int refCount = 1;
public GMP()
{
super();
natInitialize();
}
private synchronized void acquireRef()
{
refCount++;
}
private synchronized void releaseRef()
{
refCount--;
if (refCount == 0)
{
natFinalize();
native_ptr = null;
}
}
protected void finalize()
{
releaseRef();
}
public void fromByteArray(byte[] v)
{
acquireRef();
natFromByteArray(v);
releaseRef();
}
public void fromBI(GMP x)
{
acquireRef();
x.acquireRef();
natFromBI(x.native_ptr);
x.releaseRef();
releaseRef();
}
public void fromLong(long n)
{
acquireRef();
natFromLong(n);
releaseRef();
}
public int fromString(String s, int rdx)
{
acquireRef();
int result = natFromString(s, rdx);
releaseRef();
return result;
}
public void fromSignedMagnitude(byte[] m, boolean isNegative)
{
acquireRef();
natFromSignedMagnitude(m, isNegative);
releaseRef();
}
public String toString(int b)
{
acquireRef();
String result = natToString(b);
releaseRef();
return result;
}
public void toByteArray(byte[] r)
{
acquireRef();
natToByteArray(r);
releaseRef();
}
public double doubleValue()
{
acquireRef();
double result = natDoubleValue();
releaseRef();
return result;
}
public int absIntValue()
{
acquireRef();
int result = natAbsIntValue();
releaseRef();
return result;
}
public int compare(GMP x)
{
acquireRef();
x.acquireRef();
int result = natCompare(x.native_ptr);
x.releaseRef();
releaseRef();
return result;
}
public void add(GMP x, GMP r)
{
acquireRef();
x.acquireRef();
r.acquireRef();
natAdd(x.native_ptr, r.native_ptr);
r.releaseRef();
x.releaseRef();
releaseRef();
}
public void subtract(GMP x, GMP r)
{
acquireRef();
x.acquireRef();
r.acquireRef();
natSubtract(x.native_ptr, r.native_ptr);
r.releaseRef();
x.releaseRef();
releaseRef();
}
public void multiply(GMP x, GMP r)
{
acquireRef();
x.acquireRef();
r.acquireRef();
natMultiply(x.native_ptr, r.native_ptr);
r.releaseRef();
x.releaseRef();
releaseRef();
}
public void quotient(GMP x, GMP r)
{
acquireRef();
x.acquireRef();
r.acquireRef();
natQuotient(x.native_ptr, r.native_ptr);
r.releaseRef();
x.releaseRef();
releaseRef();
}
public void remainder(GMP x, GMP r)
{
acquireRef();
x.acquireRef();
r.acquireRef();
natRemainder(x.native_ptr, r.native_ptr);
r.releaseRef();
x.releaseRef();
releaseRef();
}
public void quotientAndRemainder(GMP x, GMP q, GMP r)
{
acquireRef();
x.acquireRef();
q.acquireRef();
r.acquireRef();
natQuotientAndRemainder(x.native_ptr, q.native_ptr, r.native_ptr);
r.releaseRef();
q.releaseRef();
x.releaseRef();
releaseRef();
}
public void modulo(GMP x, GMP r)
{
acquireRef();
x.acquireRef();
r.acquireRef();
natModulo(x.native_ptr, r.native_ptr);
r.releaseRef();
x.releaseRef();
releaseRef();
}
public void pow(int n, GMP r)
{
acquireRef();
r.acquireRef();
natPow(n, r.native_ptr);
r.releaseRef();
releaseRef();
}
public void modPow(GMP e, GMP m, GMP r)
{
acquireRef();
e.acquireRef();
m.acquireRef();
r.acquireRef();
natModPow(e.native_ptr, m.native_ptr, r.native_ptr);
r.releaseRef();
m.releaseRef();
e.releaseRef();
releaseRef();
}
public void modInverse(GMP m, GMP r)
{
acquireRef();
m.acquireRef();
r.acquireRef();
natModInverse(m.native_ptr, r.native_ptr);
r.releaseRef();
m.releaseRef();
releaseRef();
}
public void gcd(GMP x, GMP r)
{
acquireRef();
x.acquireRef();
r.acquireRef();
natGCD(x.native_ptr, r.native_ptr);
r.releaseRef();
x.releaseRef();
releaseRef();
}
public void shiftLeft(int n, GMP r)
{
acquireRef();
r.acquireRef();
natShiftLeft(n, r.native_ptr);
r.releaseRef();
releaseRef();
}
public void shiftRight(int n, GMP r)
{
acquireRef();
r.acquireRef();
natShiftRight(n, r.native_ptr);
r.releaseRef();
releaseRef();
}
public void abs(GMP r)
{
acquireRef();
r.acquireRef();
natAbs(r.native_ptr);
r.releaseRef();
releaseRef();
}
public void negate(GMP r)
{
acquireRef();
r.acquireRef();
natNegate(r.native_ptr);
r.releaseRef();
releaseRef();
}
public int bitLength()
{
acquireRef();
int result = natBitLength();
releaseRef();
return result;
}
public int bitCount()
{
acquireRef();
int result = natSetBitCount();
releaseRef();
return result;
}
public void and(GMP x, GMP r)
{
acquireRef();
x.acquireRef();
r.acquireRef();
natAnd(x.native_ptr, r.native_ptr);
r.releaseRef();
x.releaseRef();
releaseRef();
}
public void or(GMP x, GMP r)
{
acquireRef();
x.acquireRef();
r.acquireRef();
natOr(x.native_ptr, r.native_ptr);
r.releaseRef();
x.releaseRef();
releaseRef();
}
public void xor(GMP x, GMP r)
{
acquireRef();
x.acquireRef();
r.acquireRef();
natXor(x.native_ptr, r.native_ptr);
r.releaseRef();
x.releaseRef();
releaseRef();
}
public void andNot(GMP x, GMP r)
{
acquireRef();
x.acquireRef();
r.acquireRef();
natAndNot(x.native_ptr, r.native_ptr);
r.releaseRef();
x.releaseRef();
releaseRef();
}
public void not(GMP r)
{
acquireRef();
r.acquireRef();
natNot(r.native_ptr);
r.releaseRef();
releaseRef();
}
public void flipBit(int n, GMP r)
{
acquireRef();
r.acquireRef();
natFlipBit(n, r.native_ptr);
r.releaseRef();
releaseRef();
}
public int testBit(int n)
{
acquireRef();
int result = natTestBit(n);
releaseRef();
return result;
}
public void setBit(int n, boolean setIt, GMP r)
{
acquireRef();
r.acquireRef();
natSetBit(n, setIt, r.native_ptr);
r.releaseRef();
releaseRef();
}
public int testPrimality(int certainty)
{
acquireRef();
int result = natTestPrimality(certainty);
releaseRef();
return result;
}
public int lowestSetBit()
{
acquireRef();
int result = natLowestSetBit();
releaseRef();
return result;
}
// Native methods .........................................................
public static native void natInitializeLibrary();
private native void natInitialize();
private native void natFinalize();
private native void natFromLong(long n);
private native void natFromBI(Pointer x);
private native void natFromByteArray(byte[] v);
private native int natFromString(String s, int rdx);
private native void natFromSignedMagnitude(byte[] m, boolean isNegative);
private native String natToString(int base);
private native void natToByteArray(byte[] r);
private native int natAbsIntValue();
private native double natDoubleValue();
private native int natCompare(Pointer y);
private native void natAdd(Pointer x, Pointer r);
private native void natSubtract(Pointer x, Pointer r);
private native void natMultiply(Pointer x, Pointer r);
private native void natQuotient(Pointer x, Pointer r);
private native void natRemainder(Pointer x, Pointer r);
private native void natQuotientAndRemainder(Pointer x, Pointer q, Pointer r);
private native void natModulo(Pointer m, Pointer r);
private native void natPow(int n, Pointer r);
private native void natModPow(Pointer e, Pointer m, Pointer r);
private native void natModInverse(Pointer x, Pointer r);
private native void natGCD(Pointer x, Pointer r);
private native int natTestPrimality(int c);
private native void natShiftLeft(int n, Pointer r);
private native void natShiftRight(int n, Pointer r);
private native int natLowestSetBit();
private native void natAbs(Pointer r);
private native void natNegate(Pointer r);
private native int natBitLength();
private native int natSetBitCount();
private native void natXor(Pointer x, Pointer r);
private native void natOr(Pointer x, Pointer r);
private native void natAnd(Pointer x, Pointer r);
private native void natAndNot(Pointer x, Pointer r);
private native void natFlipBit(int n, Pointer r);
private native int natTestBit(int n);
private native void natSetBit(int n, boolean setIt, Pointer r);
private native void natNot(Pointer r);
}

View File

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.java.net.protocol.ftp; package gnu.java.net.protocol.ftp;
import gnu.java.lang.CPStringBuilder;
import gnu.java.net.CRLFInputStream; import gnu.java.net.CRLFInputStream;
import gnu.java.net.CRLFOutputStream; import gnu.java.net.CRLFOutputStream;
import gnu.java.net.EmptyX509TrustManager; import gnu.java.net.EmptyX509TrustManager;
@ -621,7 +623,7 @@ public class FTPConnection
} }
// Send PORT command // Send PORT command
StringBuffer buf = new StringBuffer(PORT); CPStringBuilder buf = new CPStringBuilder(PORT);
buf.append(' '); buf.append(' ');
// Construct the address/port string form // Construct the address/port string form
byte[] address = localhost.getAddress(); byte[] address = localhost.getAddress();
@ -686,7 +688,7 @@ public class FTPConnection
public void setRepresentationType(int type) public void setRepresentationType(int type)
throws IOException throws IOException
{ {
StringBuffer buf = new StringBuffer(TYPE); CPStringBuilder buf = new CPStringBuilder(TYPE);
buf.append(' '); buf.append(' ');
switch (type) switch (type)
{ {
@ -732,7 +734,7 @@ public class FTPConnection
public void setFileStructure(int structure) public void setFileStructure(int structure)
throws IOException throws IOException
{ {
StringBuffer buf = new StringBuffer(STRU); CPStringBuilder buf = new CPStringBuilder(STRU);
buf.append(' '); buf.append(' ');
switch (structure) switch (structure)
{ {
@ -776,7 +778,7 @@ public class FTPConnection
public void setTransferMode(int mode) public void setTransferMode(int mode)
throws IOException throws IOException
{ {
StringBuffer buf = new StringBuffer(MODE); CPStringBuilder buf = new CPStringBuilder(MODE);
buf.append(' '); buf.append(' ');
switch (mode) switch (mode)
{ {
@ -1286,7 +1288,7 @@ public class FTPConnection
} }
else if (c == '-') else if (c == '-')
{ {
StringBuffer buf = new StringBuffer(line.substring(4)); CPStringBuilder buf = new CPStringBuilder(line.substring(4));
buf.append('\n'); buf.append('\n');
while(true) while(true)
{ {

View File

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.java.net.protocol.http; package gnu.java.net.protocol.http;
import gnu.java.lang.CPStringBuilder;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.ProtocolException; import java.net.ProtocolException;
@ -113,7 +115,7 @@ public class ChunkedInputStream
// Read chunk header // Read chunk header
int c, last = 0; int c, last = 0;
boolean seenSemi = false; boolean seenSemi = false;
StringBuilder buf = new StringBuilder(); CPStringBuilder buf = new CPStringBuilder();
do do
{ {
c = in.read(); c = in.read();

View File

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.java.net.protocol.http; package gnu.java.net.protocol.http;
import gnu.java.lang.CPStringBuilder;
import java.util.Date; import java.util.Date;
/** /**
@ -139,7 +141,7 @@ public class Cookie
public String toString(boolean showPath, boolean showDomain) public String toString(boolean showPath, boolean showDomain)
{ {
StringBuilder buf = new StringBuilder(); CPStringBuilder buf = new CPStringBuilder();
buf.append(name); buf.append(name);
buf.append('='); buf.append('=');
buf.append(value); buf.append(value);

View File

@ -39,6 +39,8 @@ exception statement from your version. */
package gnu.java.net.protocol.http; package gnu.java.net.protocol.http;
import gnu.classpath.SystemProperties; import gnu.classpath.SystemProperties;
import gnu.java.lang.CPStringBuilder;
import gnu.java.net.EmptyX509TrustManager; import gnu.java.net.EmptyX509TrustManager;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
@ -668,7 +670,7 @@ public class HTTPConnection
Cookie[] cookies = cookieManager.getCookies(hostname, secure, path); Cookie[] cookies = cookieManager.getCookies(hostname, secure, path);
if (cookies != null && cookies.length > 0) if (cookies != null && cookies.length > 0)
{ {
StringBuilder buf = new StringBuilder(); CPStringBuilder buf = new CPStringBuilder();
buf.append("$Version=1"); buf.append("$Version=1");
for (int i = 0; i < cookies.length; i++) for (int i = 0; i < cookies.length; i++)
{ {
@ -827,7 +829,7 @@ public class HTTPConnection
*/ */
protected String getURI() protected String getURI()
{ {
StringBuilder buf = new StringBuilder(); CPStringBuilder buf = new CPStringBuilder();
buf.append(secure ? "https://" : "http://"); buf.append(secure ? "https://" : "http://");
buf.append(hostname); buf.append(hostname);
if (secure) if (secure)

View File

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.java.net.protocol.http; package gnu.java.net.protocol.http;
import gnu.java.lang.CPStringBuilder;
import gnu.java.net.LineInputStream; import gnu.java.net.LineInputStream;
import java.io.IOException; import java.io.IOException;
@ -280,7 +282,7 @@ class Headers implements Iterable<Headers.HeaderElement>
(LineInputStream) in : new LineInputStream(in); (LineInputStream) in : new LineInputStream(in);
String name = null; String name = null;
StringBuilder value = new StringBuilder(); CPStringBuilder value = new CPStringBuilder();
while (true) while (true)
{ {
String line = lin.readLine(); String line = lin.readLine();

View File

@ -1,5 +1,5 @@
/* LimitedLengthInputStream.java -- /* LimitedLengthInputStream.java --
Copyright (C) 2005 Free Software Foundation, Inc. Copyright (C) 2005, 2008 Free Software Foundation, Inc.
This file is part of GNU Classpath. This file is part of GNU Classpath.
@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option) the Free Software Foundation; either version 2, or (at your option)
any later version. any later version.
GNU Classpath is distributed in the hope that it will be useful, but GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
@ -57,20 +57,17 @@ class LimitedLengthInputStream
private boolean eof; private boolean eof;
private InputStream in; private InputStream in;
private boolean doClose; private boolean doClose;
private void handleClose() private void handleClose()
throws IOException throws IOException
{ {
eof = true; eof = true;
if (doClose) if (doClose)
{ in.close();
in.close();
}
else else
{ connection.release();
connection.release();
}
in = null; in = null;
connection = null; connection = null;
} }
@ -85,7 +82,7 @@ class LimitedLengthInputStream
* @param restrictLen if true the number of bytes that can be read * @param restrictLen if true the number of bytes that can be read
* from this stream will be limited to maxLen, otherwise the number * from this stream will be limited to maxLen, otherwise the number
* of bytes is not restricted. * of bytes is not restricted.
* *
* @param con the HTTPConnection associated with this stream * @param con the HTTPConnection associated with this stream
* *
* @param doClose if true con will be closed when finished reading, * @param doClose if true con will be closed when finished reading,
@ -98,7 +95,6 @@ class LimitedLengthInputStream
HTTPConnection con, HTTPConnection con,
boolean doClose) boolean doClose)
throws IOException throws IOException
{ {
this.in = in; this.in = in;
this.remainingLen = maxLen; this.remainingLen = maxLen;
@ -122,7 +118,7 @@ class LimitedLengthInputStream
return -1; // EOF return -1; // EOF
int r; int r;
if (restrictLen) if (restrictLen)
{ {
r = in.read(); r = in.read();
@ -138,7 +134,7 @@ class LimitedLengthInputStream
if (r == -1) if (r == -1)
handleClose(); handleClose();
} }
return r; return r;
} }
@ -156,12 +152,12 @@ class LimitedLengthInputStream
if (restrictLen && length > remainingLen) if (restrictLen && length > remainingLen)
length = (int) remainingLen; length = (int) remainingLen;
int r = in.read(buffer, offset, length); int r = in.read(buffer, offset, length);
if (-1 == r) if (-1 == r)
handleClose(); handleClose();
if (restrictLen && r > 0) if (restrictLen && r > 0)
{ {
remainingLen -= r; remainingLen -= r;
@ -182,7 +178,7 @@ class LimitedLengthInputStream
n = remainingLen; n = remainingLen;
long r = in.skip(n); long r = in.skip(n);
if (restrictLen) if (restrictLen)
{ {
remainingLen -= r; remainingLen -= r;
@ -214,7 +210,7 @@ class LimitedLengthInputStream
// it away. // it away.
doClose = true; doClose = true;
handleClose(); handleClose();
} }
} }

View File

@ -38,6 +38,7 @@ exception statement from your version. */
package gnu.java.net.protocol.http; package gnu.java.net.protocol.http;
import gnu.java.lang.CPStringBuilder;
import gnu.java.net.LineInputStream; import gnu.java.net.LineInputStream;
import gnu.java.util.Base64; import gnu.java.util.Base64;
@ -628,7 +629,7 @@ public class Request
{ {
int len = text.length(); int len = text.length();
String key = null; String key = null;
StringBuilder buf = new StringBuilder(); CPStringBuilder buf = new CPStringBuilder();
Properties ret = new Properties(); Properties ret = new Properties();
boolean inQuote = false; boolean inQuote = false;
for (int i = 0; i < len; i++) for (int i = 0; i < len; i++)
@ -681,7 +682,7 @@ public class Request
{ {
int nc = connection.getNonceCount(nonce); int nc = connection.getNonceCount(nonce);
String hex = Integer.toHexString(nc); String hex = Integer.toHexString(nc);
StringBuilder buf = new StringBuilder(); CPStringBuilder buf = new CPStringBuilder();
for (int i = 8 - hex.length(); i > 0; i--) for (int i = 8 - hex.length(); i > 0; i--)
{ {
buf.append('0'); buf.append('0');
@ -752,7 +753,7 @@ public class Request
int len = text.length(); int len = text.length();
String attr = null; String attr = null;
StringBuilder buf = new StringBuilder(); CPStringBuilder buf = new CPStringBuilder();
boolean inQuote = false; boolean inQuote = false;
for (int i = 0; i <= len; i++) for (int i = 0; i <= len; i++)
{ {

View File

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.java.net.protocol.jar; package gnu.java.net.protocol.jar;
import gnu.java.lang.CPStringBuilder;
import gnu.java.net.URLParseError; import gnu.java.net.URLParseError;
import java.io.IOException; import java.io.IOException;
@ -180,7 +182,7 @@ public class Handler extends URLStreamHandler
tokens.add(token); tokens.add(token);
} }
StringBuffer path = new StringBuffer(url_string.length()); CPStringBuilder path = new CPStringBuilder(url_string.length());
path.append(url_string.substring(0, jar_stop + 1)); path.append(url_string.substring(0, jar_stop + 1));
Iterator<String> it = tokens.iterator(); Iterator<String> it = tokens.iterator();
@ -205,7 +207,7 @@ public class Handler extends URLStreamHandler
// Do the concatenation manually to avoid resize StringBuffer's // Do the concatenation manually to avoid resize StringBuffer's
// internal buffer. The length of ref is not taken into consideration // internal buffer. The length of ref is not taken into consideration
// as it's a rare path. // as it's a rare path.
StringBuffer sb = new StringBuffer (file.length() + 5); CPStringBuilder sb = new CPStringBuilder (file.length() + 5);
sb.append ("jar:"); sb.append ("jar:");
sb.append (file); sb.append (file);
if (ref != null) if (ref != null)

View File

@ -119,6 +119,8 @@ public abstract class ByteDecodeLoopHelper
int inRemaining = in.remaining(); int inRemaining = in.remaining();
int outRemaining = out.remaining(); int outRemaining = out.remaining();
CoderResult result; CoderResult result;
bailOut:
if (inRemaining <= outRemaining) if (inRemaining <= outRemaining)
{ {
for (int i = 0; i < inRemaining; i++) for (int i = 0; i < inRemaining; i++)
@ -129,7 +131,7 @@ public abstract class ByteDecodeLoopHelper
{ {
inPos--; inPos--;
result = CoderResult.unmappableForLength(1); result = CoderResult.unmappableForLength(1);
break; break bailOut;
} }
char c = mapToChar(b); char c = mapToChar(b);
outArray[outPos] = c; outArray[outPos] = c;
@ -147,7 +149,7 @@ public abstract class ByteDecodeLoopHelper
{ {
inPos--; inPos--;
result = CoderResult.unmappableForLength(1); result = CoderResult.unmappableForLength(1);
break; break bailOut;
} }
char c = mapToChar(b); char c = mapToChar(b);
outArray[outPos] = c; outArray[outPos] = c;

View File

@ -120,6 +120,8 @@ public abstract class ByteEncodeLoopHelper
int inRemaining = in.remaining(); int inRemaining = in.remaining();
int outRemaining = out.remaining(); int outRemaining = out.remaining();
CoderResult result; CoderResult result;
bailOut:
if (inRemaining <= outRemaining) if (inRemaining <= outRemaining)
{ {
for (int i = 0; i < inRemaining; i++) for (int i = 0; i < inRemaining; i++)
@ -130,7 +132,7 @@ public abstract class ByteEncodeLoopHelper
{ {
inPos--; inPos--;
result = CoderResult.unmappableForLength(1); result = CoderResult.unmappableForLength(1);
break; break bailOut;
} }
byte b = mapToByte(inChar); byte b = mapToByte(inChar);
outArray[outPos] = b; outArray[outPos] = b;
@ -148,7 +150,7 @@ public abstract class ByteEncodeLoopHelper
{ {
inPos--; inPos--;
result = CoderResult.unmappableForLength(1); result = CoderResult.unmappableForLength(1);
break; break bailOut;
} }
byte b = mapToByte(inChar); byte b = mapToByte(inChar);
outArray[outPos] = b; outArray[outPos] = b;

View File

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.java.rmi.server; package gnu.java.rmi.server;
import gnu.java.lang.CPStringBuilder;
import java.lang.reflect.Proxy; import java.lang.reflect.Proxy;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
@ -69,7 +71,7 @@ public class RMIClassLoaderImpl extends RMIClassLoaderSpi
if (urls.length == 0) if (urls.length == 0)
return null; return null;
StringBuffer annotation = new StringBuffer (64 * urls.length); CPStringBuilder annotation = new CPStringBuilder (64 * urls.length);
for (int i = 0; i < urls.length; i++) for (int i = 0; i < urls.length; i++)
{ {
@ -337,7 +339,7 @@ public class RMIClassLoaderImpl extends RMIClassLoaderSpi
if (urls.length == 0) if (urls.length == 0)
return null; return null;
StringBuffer annotation = new StringBuffer (64 * urls.length); CPStringBuilder annotation = new CPStringBuilder (64 * urls.length);
for (int i = 0; i < urls.length; i++) for (int i = 0; i < urls.length; i++)
{ {

View File

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.java.rmi.server; package gnu.java.rmi.server;
import gnu.java.lang.CPStringBuilder;
import gnu.java.lang.reflect.TypeSignature; import gnu.java.lang.reflect.TypeSignature;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
@ -61,7 +63,7 @@ public class RMIHashes
ByteArrayOutputStream digest_out = new ByteArrayOutputStream(); ByteArrayOutputStream digest_out = new ByteArrayOutputStream();
DataOutputStream data_out = new DataOutputStream (digest_out); DataOutputStream data_out = new DataOutputStream (digest_out);
StringBuffer sbuf = new StringBuffer(); CPStringBuilder sbuf = new CPStringBuilder();
sbuf.append(meth.getName()); sbuf.append(meth.getName());
sbuf.append('('); sbuf.append('(');
Class params[] = meth.getParameterTypes(); Class params[] = meth.getParameterTypes();

View File

@ -37,6 +37,8 @@ exception statement from your version. */
package gnu.java.security; package gnu.java.security;
import gnu.java.lang.CPStringBuilder;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
@ -150,7 +152,7 @@ public final class Engine
String alias; String alias;
int count = 0; int count = 0;
boolean algorithmFound = false; boolean algorithmFound = false;
StringBuilder sb = new StringBuilder(); CPStringBuilder sb = new CPStringBuilder();
while (enumer.hasMoreElements()) while (enumer.hasMoreElements())
{ {
key = (String) enumer.nextElement(); key = (String) enumer.nextElement();

View File

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.java.security; package gnu.java.security;
import gnu.java.lang.CPStringBuilder;
import gnu.java.security.der.DEREncodingException; import gnu.java.security.der.DEREncodingException;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
@ -359,7 +361,7 @@ public class OID implements Cloneable, Comparable, java.io.Serializable
return strRep; return strRep;
else else
{ {
StringBuffer buf = new StringBuffer(); CPStringBuilder buf = new CPStringBuilder();
for (int i = 0; i < components.length; i++) for (int i = 0; i < components.length; i++)
{ {
buf.append((long) components[i] & 0xFFFFFFFFL); buf.append((long) components[i] & 0xFFFFFFFFL);

View File

@ -39,6 +39,8 @@ package gnu.java.security;
import gnu.classpath.debug.Component; import gnu.classpath.debug.Component;
import gnu.classpath.debug.SystemLogger; import gnu.classpath.debug.SystemLogger;
import gnu.java.lang.CPStringBuilder;
import gnu.java.security.action.GetPropertyAction; import gnu.java.security.action.GetPropertyAction;
import java.io.File; import java.io.File;
@ -150,7 +152,7 @@ public final class PolicyFile extends Policy
protected static final Logger logger = SystemLogger.SYSTEM; protected static final Logger logger = SystemLogger.SYSTEM;
// Added to cut redundant AccessController.doPrivileged calls // Added to cut redundant AccessController.doPrivileged calls
private static GetPropertyAction prop = new GetPropertyAction("file.seperator"); private static GetPropertyAction prop = new GetPropertyAction("file.separator");
private static final String fs = (String) AccessController.doPrivileged(prop); private static final String fs = (String) AccessController.doPrivileged(prop);
private static final String DEFAULT_POLICY = private static final String DEFAULT_POLICY =
@ -629,8 +631,8 @@ public final class PolicyFile extends Policy
*/ */
private static String expand(final String s) private static String expand(final String s)
{ {
final StringBuffer result = new StringBuffer(); final CPStringBuilder result = new CPStringBuilder();
final StringBuffer prop = new StringBuffer(); final CPStringBuilder prop = new CPStringBuilder();
int state = 0; int state = 0;
for (int i = 0; i < s.length(); i++) for (int i = 0; i < s.length(); i++)
{ {

View File

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.java.security.der; package gnu.java.security.der;
import gnu.java.lang.CPStringBuilder;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.Arrays; import java.util.Arrays;
@ -314,7 +316,7 @@ public class BitString implements Cloneable, Comparable
public String toString() public String toString()
{ {
StringBuffer sb = new StringBuffer(); CPStringBuilder sb = new CPStringBuilder();
for (int i = 0, j = 7, k = 0; i < size(); i++) for (int i = 0, j = 7, k = 0; i < size(); i++)
{ {
sb.append((bytes[k] & 1 << j) != 0 ? "1" : "0"); sb.append((bytes[k] & 1 << j) != 0 ? "1" : "0");

View File

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.java.security.der; package gnu.java.security.der;
import gnu.java.lang.CPStringBuilder;
import gnu.java.security.OID; import gnu.java.security.OID;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
@ -286,7 +288,7 @@ public class DERReader implements DER
private static String fromIso88591(byte[] bytes) private static String fromIso88591(byte[] bytes)
{ {
StringBuffer str = new StringBuffer(bytes.length); CPStringBuilder str = new CPStringBuilder(bytes.length);
for (int i = 0; i < bytes.length; i++) for (int i = 0; i < bytes.length; i++)
str.append((char) (bytes[i] & 0xFF)); str.append((char) (bytes[i] & 0xFF));
return str.toString(); return str.toString();
@ -296,7 +298,7 @@ public class DERReader implements DER
{ {
if ((bytes.length & 0x01) != 0) if ((bytes.length & 0x01) != 0)
throw new IOException("UTF-16 bytes are odd in length"); throw new IOException("UTF-16 bytes are odd in length");
StringBuffer str = new StringBuffer(bytes.length / 2); CPStringBuilder str = new CPStringBuilder(bytes.length / 2);
for (int i = 0; i < bytes.length; i += 2) for (int i = 0; i < bytes.length; i += 2)
{ {
char c = (char) ((bytes[i] << 8) & 0xFF); char c = (char) ((bytes[i] << 8) & 0xFF);
@ -308,7 +310,7 @@ public class DERReader implements DER
private static String fromUtf8(byte[] bytes) throws IOException private static String fromUtf8(byte[] bytes) throws IOException
{ {
StringBuffer str = new StringBuffer((int)(bytes.length / 1.5)); CPStringBuilder str = new CPStringBuilder((int)(bytes.length / 1.5));
for (int i = 0; i < bytes.length; ) for (int i = 0; i < bytes.length; )
{ {
char c = 0; char c = 0;

View File

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.java.security.hash; package gnu.java.security.hash;
import gnu.java.lang.CPStringBuilder;
import gnu.java.security.Configuration; import gnu.java.security.Configuration;
import gnu.java.security.Registry; import gnu.java.security.Registry;
import gnu.java.security.util.Util; import gnu.java.security.util.Util;
@ -177,10 +179,10 @@ public final class Whirlpool
{ {
log.fine("Static data"); log.fine("Static data");
log.fine("T0[]:"); log.fine("T0[]:");
StringBuilder sb; CPStringBuilder sb;
for (i = 0; i < 64; i++) for (i = 0; i < 64; i++)
{ {
sb = new StringBuilder(); sb = new CPStringBuilder();
for (j = 0; j < 4; j++) for (j = 0; j < 4; j++)
sb.append("0x").append(Util.toString(T0[i * 4 + j])).append(", "); sb.append("0x").append(Util.toString(T0[i * 4 + j])).append(", ");
@ -189,7 +191,7 @@ public final class Whirlpool
log.fine("T1[]:"); log.fine("T1[]:");
for (i = 0; i < 64; i++) for (i = 0; i < 64; i++)
{ {
sb = new StringBuilder(); sb = new CPStringBuilder();
for (j = 0; j < 4; j++) for (j = 0; j < 4; j++)
sb.append("0x").append(Util.toString(T1[i * 4 + j])).append(", "); sb.append("0x").append(Util.toString(T1[i * 4 + j])).append(", ");
@ -198,7 +200,7 @@ public final class Whirlpool
log.fine("T2[]:"); log.fine("T2[]:");
for (i = 0; i < 64; i++) for (i = 0; i < 64; i++)
{ {
sb = new StringBuilder(); sb = new CPStringBuilder();
for (j = 0; j < 4; j++) for (j = 0; j < 4; j++)
sb.append("0x").append(Util.toString(T2[i * 4 + j])).append(", "); sb.append("0x").append(Util.toString(T2[i * 4 + j])).append(", ");
@ -207,7 +209,7 @@ public final class Whirlpool
log.fine("T3[]:"); log.fine("T3[]:");
for (i = 0; i < 64; i++) for (i = 0; i < 64; i++)
{ {
sb = new StringBuilder(); sb = new CPStringBuilder();
for (j = 0; j < 4; j++) for (j = 0; j < 4; j++)
sb.append("0x").append(Util.toString(T3[i * 4 + j])).append(", "); sb.append("0x").append(Util.toString(T3[i * 4 + j])).append(", ");
@ -216,7 +218,7 @@ public final class Whirlpool
log.fine("\nT4[]:"); log.fine("\nT4[]:");
for (i = 0; i < 64; i++) for (i = 0; i < 64; i++)
{ {
sb = new StringBuilder(); sb = new CPStringBuilder();
for (j = 0; j < 4; j++) for (j = 0; j < 4; j++)
sb.append("0x").append(Util.toString(T4[i * 4 + j])).append(", "); sb.append("0x").append(Util.toString(T4[i * 4 + j])).append(", ");
@ -225,7 +227,7 @@ public final class Whirlpool
log.fine("T5[]:"); log.fine("T5[]:");
for (i = 0; i < 64; i++) for (i = 0; i < 64; i++)
{ {
sb = new StringBuilder(); sb = new CPStringBuilder();
for (j = 0; j < 4; j++) for (j = 0; j < 4; j++)
sb.append("0x").append(Util.toString(T5[i * 4 + j])).append(", "); sb.append("0x").append(Util.toString(T5[i * 4 + j])).append(", ");
@ -234,7 +236,7 @@ public final class Whirlpool
log.fine("T6[]:"); log.fine("T6[]:");
for (i = 0; i < 64; i++) for (i = 0; i < 64; i++)
{ {
sb = new StringBuilder(); sb = new CPStringBuilder();
for (j = 0; j < 4; j++) for (j = 0; j < 4; j++)
sb.append("0x").append(Util.toString(T5[i * 4 + j])).append(", "); sb.append("0x").append(Util.toString(T5[i * 4 + j])).append(", ");
@ -243,7 +245,7 @@ public final class Whirlpool
log.fine("T7[]:"); log.fine("T7[]:");
for (i = 0; i < 64; i++) for (i = 0; i < 64; i++)
{ {
sb = new StringBuilder(); sb = new CPStringBuilder();
for (j = 0; j < 4; j++) for (j = 0; j < 4; j++)
sb.append("0x").append(Util.toString(T5[i * 4 + j])).append(", "); sb.append("0x").append(Util.toString(T5[i * 4 + j])).append(", ");

View File

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.java.security.jce.sig; package gnu.java.security.jce.sig;
import gnu.java.lang.CPStringBuilder;
import gnu.java.security.Registry; import gnu.java.security.Registry;
import gnu.java.security.der.DER; import gnu.java.security.der.DER;
import gnu.java.security.der.DERReader; import gnu.java.security.der.DERReader;
@ -195,7 +197,7 @@ public class DSSParameters
protected String engineToString() protected String engineToString()
{ {
StringBuffer sb = new StringBuffer("p="); CPStringBuilder sb = new CPStringBuilder("p=");
if (p == null) if (p == null)
sb.append("???"); sb.append("???");
else else

View File

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.java.security.key.dss; package gnu.java.security.key.dss;
import gnu.java.lang.CPStringBuilder;
import gnu.java.security.Registry; import gnu.java.security.Registry;
import gnu.java.security.action.GetPropertyAction; import gnu.java.security.action.GetPropertyAction;
import gnu.java.security.util.FormatUtil; import gnu.java.security.util.FormatUtil;
@ -181,7 +183,7 @@ public abstract class DSSKey
if (str == null) if (str == null)
{ {
String ls = (String) AccessController.doPrivileged(new GetPropertyAction("line.separator")); String ls = (String) AccessController.doPrivileged(new GetPropertyAction("line.separator"));
StringBuilder sb = new StringBuilder(ls) CPStringBuilder sb = new CPStringBuilder(ls)
.append("defaultFormat=").append(defaultFormat).append(",") .append("defaultFormat=").append(defaultFormat).append(",")
.append(ls); .append(ls);
if (hasInheritedParameters()) if (hasInheritedParameters())

View File

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.java.security.key.dss; package gnu.java.security.key.dss;
import gnu.java.lang.CPStringBuilder;
import gnu.java.security.Configuration; import gnu.java.security.Configuration;
import gnu.java.security.Registry; import gnu.java.security.Registry;
import gnu.java.security.action.GetPropertyAction; import gnu.java.security.action.GetPropertyAction;
@ -191,7 +193,7 @@ public class DSSPrivateKey
{ {
String ls = (String) AccessController.doPrivileged String ls = (String) AccessController.doPrivileged
(new GetPropertyAction("line.separator")); (new GetPropertyAction("line.separator"));
str = new StringBuilder(this.getClass().getName()).append("(") str = new CPStringBuilder(this.getClass().getName()).append("(")
.append(super.toString()).append(",").append(ls) .append(super.toString()).append(",").append(ls)
.append("x=0x").append(Configuration.DEBUG ? x.toString(16) .append("x=0x").append(Configuration.DEBUG ? x.toString(16)
: "**...*").append(ls) : "**...*").append(ls)

Some files were not shown because too many files have changed in this diff Show More