PatchSet 4133
Date: 2003/10/28 16:49:53
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Fix for having an rt.jar in CLASSPATH
This patch removes automatical adding of CLASSPATH's contents to the
CLASSPATH used in the BUILD_ENVIRONMENT.
Members:
ChangeLog:1.1725->1.1726
Makefile.am:INITIAL->1.49
Makefile.in:1.115->1.116
libraries/javalib/Makefile.am:1.141->1.142
libraries/javalib/Makefile.in:1.189->1.190
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1725 kaffe/ChangeLog:1.1726
--- kaffe/ChangeLog:1.1725 Tue Oct 28 15:16:20 2003
+++ kaffe/ChangeLog Tue Oct 28 16:49:53 2003
@@ -1,5 +1,18 @@
2003-10-28 Dalibor Topic <[EMAIL PROTECTED]>
+ Makefile.am:
+ (BUILD_ENVIRONMENT-make) Don't add existing
+ CLASSPATH to CLASSPATH in BUILD_ENVIRONMENT.
+
+ Reported by: jrandom <[EMAIL PROTECTED]>
+
+ * Makefile.in,
+ libraries/javalib/Makefile.am,
+ libraries/javalib/Makefile.in:
+ Regenerated.
+
+2003-10-28 Dalibor Topic <[EMAIL PROTECTED]>
+
* libraries/javalib/java/util/Date.java:
Replaced by implementation from GNU Classpath.
===================================================================
Checking out kaffe/Makefile.am
RCS: /home/cvs/kaffe/kaffe/Makefile.am,v
VERS: 1.49
***************
--- /dev/null Sun Aug 4 19:57:58 2002
+++ kaffe/Makefile.am Tue Oct 28 16:52:22 2003
@@ -0,0 +1,165 @@
+# Top-level Makefile for Kaffe OpenVM.
+#
+# Copyright (c) 1996, 1997, 1998, 1999
+# Transvirtual Technologies, Inc. All rights reserved.
+#
+# Copyright (c) 2003
+# Kaffe.org contributors. All rights reserved.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file.
+
+AUTOMAKE_OPTIONS = foreign 1.3e
+
+SUBDIRS = . config include replace libltdl libraries/clib libraries/extensions kaffe
libraries/javalib test
+
+DIST_SUBDIRS = . config include replace libltdl kaffe libraries test
+
+EXTRA_DIST = \
+ ChangeLog.1 \
+ ChangeLog.2 \
+ ChangeLog.3 \
+ ChangeLog.4 \
+ ChangeLog.5 \
+ THIRDPARTY \
+ WHATSNEW \
+ RELEASE-NOTES \
+ license.terms \
+ license-lesser.terms \
+ license-w3c.terms \
+ gwqt.m4 \
+ herrno.m4 \
+ in6addr.m4 \
+ iconv.m4 \
+ lib-ld.m4 \
+ lib-link.m4 \
+ lib-prefix.m4 \
+ libtool.m4 \
+ sockaddrin6.m4 \
+ sockinttypes.m4 \
+ valist.m4 \
+ FAQ/FAQ.BeOS \
+ FAQ/FAQ.Known-Bugs \
+ FAQ/FAQ.amigaos \
+ FAQ/FAQ.automake \
+ FAQ/FAQ.awt \
+ FAQ/FAQ.benchmarking \
+ FAQ/FAQ.class-states \
+ FAQ/FAQ.classlibrary-compile \
+ FAQ/FAQ.code-layout \
+ FAQ/FAQ.coding-style \
+ FAQ/FAQ.cross-compiling \
+ FAQ/FAQ.debugging \
+ FAQ/FAQ.depend \
+ FAQ/FAQ.dmalloc \
+ FAQ/FAQ.dns \
+ FAQ/FAQ.embedded \
+ FAQ/FAQ.feedback \
+ FAQ/FAQ.gcblock \
+ FAQ/FAQ.gcj \
+ FAQ/FAQ.gcstrategy \
+ FAQ/FAQ.hotjava \
+ FAQ/FAQ.install-root \
+ FAQ/FAQ.jit3 \
+ FAQ/FAQ.jsignal \
+ FAQ/FAQ.kjc \
+ FAQ/FAQ.libffi \
+ FAQ/FAQ.libtool \
+ FAQ/FAQ.linux \
+ FAQ/FAQ.locks \
+ FAQ/FAQ.mauve \
+ FAQ/FAQ.nativemethods \
+ FAQ/FAQ.ncr \
+ FAQ/FAQ.profiler \
+ FAQ/FAQ.ps2linux \
+ FAQ/FAQ.pthreads \
+ FAQ/FAQ.requiredlibraries \
+ FAQ/FAQ.sound \
+ FAQ/FAQ.staticnative \
+ FAQ/FAQ.timing \
+ FAQ/FAQ.unicode \
+ FAQ/FAQ.win32 \
+ FAQ/FAQ.xdebugging \
+ FAQ/FAQ.xprofiler \
+ compat-include/ansidecl.h \
+ compat-include/eh-common.h \
+ compat-include/frame.h \
+ compat-include/gansidecl.h \
+ developers/check-classpath-merge-status \
+ developers/Encode.java \
+ developers/EncodeEUC_JP.java \
+ developers/FullTest.sh \
+ developers/GCJ.note.1 \
+ developers/JavaClass.pm \
+ developers/README \
+ developers/README.unicode \
+ developers/README.EUC_JP \
+ developers/alignment_of_size.c \
+ developers/autogen.sh \
+ developers/createLdScript.pl \
+ developers/dumpClass.pl \
+ developers/gdbinit \
+ developers/fixup.c \
+ developers/geteh_from_libgcc2 \
+ developers/glibc-2.1.1-signal.patch \
+ developers/mangleNative.pl \
+ developers/mauve-html-gen.pl \
+ developers/mauve-kaffe \
+ developers/mauve-results.sh \
+ developers/patch-config.sub-superh.diff \
+ developers/patch-libtool-amiga.diff \
+ developers/patch-libtool-openbsd.diff \
+ developers/patch-libtool-realloc.diff \
+ developers/patch-libtool-amiga-max-command-line-length.diff \
+ developers/patch-libtool-ltdl-memory-header-warning.diff \
+ developers/rpm-kaffe.spec \
+ developers/sp_offset.c \
+ developers/unicode.pl \
+ developers/update-class-list \
+ developers/utf8munge.pl
+
+CLEANFILES = BUILD_ENVIRONMENT
+
+depend:
+ @echo \`make depend\' is no longer needed
+
+noinst_SCRIPTS = libtool BUILD_ENVIRONMENT
+
+libtool: $(LIBTOOL_DEPS)
+ $(SHELL) ./config.status --recheck
+
+BUILD_ENVIRONMENT: Makefile
+ $(MAKE) top_srcdir=`cd $(top_srcdir) >/dev/null; pwd` \
+ top_builddir=`cd $(top_builddir) >/dev/null; pwd` \
+ "DEBUG_ENV=$(DEBUG_ENV)" BUILD_ENVIRONMENT-make
+
+BUILD_ENVIRONMENT-make: Makefile
+ echo
BOOTCLASSPATH=\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/rt.jar\''$(PATHSEP)'\'$(DNSJAVA_JAR)\;
export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' > BUILD_ENVIRONMENT.new; \
+ echo
CLASSPATH=.\''$(PATHSEP)'\'$(top_srcdir)/libraries/javalib/kjc.jar\''$(PATHSEP)'\'$(BCEL_JAR)\;
export CLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >> BUILD_ENVIRONMENT.new; \
+ echo
KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}`for f
in $(JAVA_LIBS); do echo "$$f" | sed 's%/[^/]*$$%%'; done | (tr '\012' ' '; echo) |
sed -e 's/ $$//' -e "s/ /\'$(PATHSEP)\'/g"`\; export KAFFELIBRARYPATH >>
BUILD_ENVIRONMENT.new; \
+ echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA >>
BUILD_ENVIRONMENT.new
+ rm -f BUILD_ENVIRONMENT
+ mv BUILD_ENVIRONMENT.new BUILD_ENVIRONMENT
+
+CLASSDIRS = libraries/javalib
+
+.PHONY: Klasses new-classes compile-classes jar-classes build-classes
+Klasses new-classes compile-classes jar-classes build-classes:
+ @if test "$(CLASSDIRS)" = all; then \
+ $(MAKE) CLASSDIRS="`echo libraries/javalib \
+ libraries/extensions/*/javalib`" $@; \
+ else \
+ for f in $(CLASSDIRS); do \
+ (cd $$f && $(MAKE) $@); \
+ done; \
+ fi
+
+# Build rt-precompiled.jar and add it to dist
+dist-hook:
+ rm -rf build-dist
+ mkdir build-dist
+ (cd build-dist && \
+ ../$(distdir)/configure --with-extensions=comm,microsoft,pjava,servlet,sound
&& \
+ make && \
+ cp libraries/javalib/rt.jar
../$(distdir)/libraries/javalib/rt-precompiled.jar \
+ )
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.115 kaffe/Makefile.in:1.116
--- kaffe/Makefile.in:1.115 Sat Oct 25 20:00:11 2003
+++ kaffe/Makefile.in Tue Oct 28 16:49:54 2003
@@ -796,7 +796,7 @@
BUILD_ENVIRONMENT-make: Makefile
echo
BOOTCLASSPATH=\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/rt.jar\''$(PATHSEP)'\'$(DNSJAVA_JAR)\;
export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' > BUILD_ENVIRONMENT.new; \
- echo
CLASSPATH=\$${CLASSPATH}\''$(PATHSEP)'\'.\''$(PATHSEP)'\'$(top_srcdir)/libraries/javalib/kjc.jar\''$(PATHSEP)'\'$(BCEL_JAR)\;
export CLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >> BUILD_ENVIRONMENT.new; \
+ echo
CLASSPATH=.\''$(PATHSEP)'\'$(top_srcdir)/libraries/javalib/kjc.jar\''$(PATHSEP)'\'$(BCEL_JAR)\;
export CLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >> BUILD_ENVIRONMENT.new; \
echo
KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}`for f
in $(JAVA_LIBS); do echo "$$f" | sed 's%/[^/]*$$%%'; done | (tr '\012' ' '; echo) |
sed -e 's/ $$//' -e "s/ /\'$(PATHSEP)\'/g"`\; export KAFFELIBRARYPATH >>
BUILD_ENVIRONMENT.new; \
echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA >>
BUILD_ENVIRONMENT.new
rm -f BUILD_ENVIRONMENT
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.141
kaffe/libraries/javalib/Makefile.am:1.142
--- kaffe/libraries/javalib/Makefile.am:1.141 Sat Oct 25 20:00:37 2003
+++ kaffe/libraries/javalib/Makefile.am Tue Oct 28 16:49:54 2003
@@ -387,10 +387,12 @@
gnu/java/locale/LocaleInformation_zh_SG.java \
gnu/java/locale/LocaleInformation_zh_TW.java
gnu_java_net_SRCS = \
+ gnu/java/net/InetAddressImpl.java \
gnu/java/net/PlainDatagramSocketImpl.java \
gnu/java/net/PlainSocketImpl.java \
gnu/java/net/SocketInputStream.java \
- gnu/java/net/SocketOutputStream.java
+ gnu/java/net/SocketOutputStream.java \
+ gnu/java/net/SysInetAddressImpl.java
gnu_java_nio_SRCS = \
gnu/java/nio/DatagramChannelImpl.java \
gnu/java/nio/DatagramChannelSelectionKey.java \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.189
kaffe/libraries/javalib/Makefile.in:1.190
--- kaffe/libraries/javalib/Makefile.in:1.189 Sat Oct 25 20:00:38 2003
+++ kaffe/libraries/javalib/Makefile.in Tue Oct 28 16:49:55 2003
@@ -634,10 +634,12 @@
gnu/java/locale/LocaleInformation_zh_TW.java
gnu_java_net_SRCS = \
+ gnu/java/net/InetAddressImpl.java \
gnu/java/net/PlainDatagramSocketImpl.java \
gnu/java/net/PlainSocketImpl.java \
gnu/java/net/SocketInputStream.java \
- gnu/java/net/SocketOutputStream.java
+ gnu/java/net/SocketOutputStream.java \
+ gnu/java/net/SysInetAddressImpl.java
gnu_java_nio_SRCS = \
gnu/java/nio/DatagramChannelImpl.java \
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
