[kaffe] CVS kaffe (robilad): symlink rt.jar directly to glibj.zip
Kaffe CVS
cvs-commits at kaffe.org
Mon Dec 17 10:31:34 PST 2007
PatchSet 7609
Date: 2007/12/17 18:28:32
Author: robilad
Branch: HEAD
Tag: (none)
Log:
symlink rt.jar directly to glibj.zip
2007-12-17 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/Makefile.am: Symlink GNU Classpath's glibj.zip as rt.jar.
Don't symlink it as glibj.zip, too.
* kaffe/scripts/compat/javac.in,
kaffe/scripts/kaffe.in: Use rt.jar instead of glibj.zip.
Members:
ChangeLog:1.5106->1.5107
kaffe/scripts/kaffe.in:1.41->1.42
kaffe/scripts/compat/javac.in:1.10->1.11
libraries/javalib/Makefile.am:1.461->1.462
libraries/javalib/Makefile.in:1.584->1.585
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5106 kaffe/ChangeLog:1.5107
--- kaffe/ChangeLog:1.5106 Mon Dec 17 16:17:26 2007
+++ kaffe/ChangeLog Mon Dec 17 18:28:32 2007
@@ -1,5 +1,13 @@
2007-12-17 Dalibor Topic <robilad at kaffe.org>
+ * libraries/javalib/Makefile.am: Symlink GNU Classpath's glibj.zip as rt.jar.
+ Don't symlink it as glibj.zip, too.
+
+ * kaffe/scripts/compat/javac.in,
+ kaffe/scripts/kaffe.in: Use rt.jar instead of glibj.zip.
+
+2007-12-17 Dalibor Topic <robilad at kaffe.org>
+
* kaffe/scripts/javap.in: Use tools.jar instead of kaffe-classpath-tools-jar.
* tools/javatools/Makefile.am (CLASSFILE): Renamed to tools.jar.
Index: kaffe/kaffe/scripts/kaffe.in
diff -u kaffe/kaffe/scripts/kaffe.in:1.41 kaffe/kaffe/scripts/kaffe.in:1.42
--- kaffe/kaffe/scripts/kaffe.in:1.41 Thu Aug 9 01:48:45 2007
+++ kaffe/kaffe/scripts/kaffe.in Mon Dec 17 18:28:43 2007
@@ -62,7 +62,7 @@
if test x"${BOOTCLASSPATH+set}"x != x"set"x ; then
BOOTCLASSPATH=
fi
-for f in kaffe-vminterface.jar kaffe-gnuinet.jar kaffe-dnsjava.jar kaffe-tritonus.jar kaffe-zlib.jar glibj.zip; do
+for f in kaffe-vminterface.jar kaffe-gnuinet.jar kaffe-dnsjava.jar kaffe-tritonus.jar kaffe-zlib.jar rt.jar; do
if test -f "$KAFFE_LIBDIR/$f"; then
BOOTCLASSPATH="$BOOTCLASSPATH$PATHSEP$KAFFE_LIBDIR/$f"
fi
Index: kaffe/kaffe/scripts/compat/javac.in
diff -u kaffe/kaffe/scripts/compat/javac.in:1.10 kaffe/kaffe/scripts/compat/javac.in:1.11
--- kaffe/kaffe/scripts/compat/javac.in:1.10 Sat Oct 29 18:18:08 2005
+++ kaffe/kaffe/scripts/compat/javac.in Mon Dec 17 18:28:43 2007
@@ -1,4 +1,4 @@
#! /bin/sh
# We use the jikes compiler detected by configure
- at JIKESPROG@ -bootclasspath @prefix@/jre/lib/glibj.zip ${1+"$@"}
+ at JIKESPROG@ -bootclasspath @prefix@/jre/lib/rt.jar ${1+"$@"}
exit $?
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.461 kaffe/libraries/javalib/Makefile.am:1.462
--- kaffe/libraries/javalib/Makefile.am:1.461 Tue Oct 23 13:13:00 2007
+++ kaffe/libraries/javalib/Makefile.am Mon Dec 17 18:28:43 2007
@@ -31,29 +31,6 @@
MAYBE_ZLIB_ZIP=zlib-zip
endif
-stamp-glibj:
- @echo Importing glibj.zip from $(CLASSPATH_CLASSES)
- @$(LN_S) $(CLASSPATH_CLASSES) glibj.zip
- @touch stamp-glibj
-
-glibj.zip: stamp-glibj
-
-# used to link the system/precompiled glibj.zip on install
-link-glibj-zip:
- if ! test -f $(DESTDIR)${jrelibdir}/glibj.zip ; then \
- $(LN_S) $(CLASSPATH_CLASSES) $(DESTDIR)${jrelibdir}/glibj.zip ; \
- fi
-
-unlink-glibj-zip:
- if test -f $(DESTDIR)${jrelibdir}/glibj.zip ; then \
- $(RM) $(DESTDIR)${jrelibdir}/glibj.zip ; \
- fi
-
-install-exec-local: link-glibj-zip
-
-clean-local:
- $(RM) stamp-glibj glibj.zip
-
SUBDIRS= \
vmspecific \
gnu-inet \
@@ -67,13 +44,11 @@
logging.properties
install-data-local: installdirs
- if test -f $(DESTDIR)${jrelibdir}/glibj.zip ; then \
- if ! test -f $(DESTDIR)${jrelibdir}/rt.jar ; then \
- $(LN_S) $(DESTDIR)${jrelibdir}/glibj.zip $(DESTDIR)${jrelibdir}/rt.jar ; \
- fi ; \
+ if ! test -f $(DESTDIR)${jrelibdir}/rt.jar ; then \
+ $(LN_S) $(CLASSPATH_CLASSES) $(DESTDIR)${jrelibdir}/rt.jar ; \
fi
-uninstall-local: unlink-glibj-zip
+uninstall-local:
$(RM) $(DESTDIR)${jrelibdir}/rt.jar
EXTRA_DIST= \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.584 kaffe/libraries/javalib/Makefile.in:1.585
--- kaffe/libraries/javalib/Makefile.in:1.584 Sun Dec 9 20:47:16 2007
+++ kaffe/libraries/javalib/Makefile.in Mon Dec 17 18:28:47 2007
@@ -589,7 +589,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-recursive
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
+clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-recursive
-rm -f Makefile
@@ -609,7 +609,7 @@
install-dvi: install-dvi-recursive
-install-exec-am: install-exec-local
+install-exec-am:
install-html: install-html-recursive
@@ -646,51 +646,26 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic clean-libtool \
- clean-local ctags ctags-recursive distclean distclean-generic \
+ ctags ctags-recursive distclean distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-data-local install-dvi install-dvi-am \
- install-exec install-exec-am install-exec-local install-html \
- install-html-am install-info install-info-am \
- install-jrelibDATA install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-jrelibDATA uninstall-local
-
-
-stamp-glibj:
- @echo Importing glibj.zip from $(CLASSPATH_CLASSES)
- @$(LN_S) $(CLASSPATH_CLASSES) glibj.zip
- @touch stamp-glibj
-
-glibj.zip: stamp-glibj
-
-# used to link the system/precompiled glibj.zip on install
-link-glibj-zip:
- if ! test -f $(DESTDIR)${jrelibdir}/glibj.zip ; then \
- $(LN_S) $(CLASSPATH_CLASSES) $(DESTDIR)${jrelibdir}/glibj.zip ; \
- fi
-
-unlink-glibj-zip:
- if test -f $(DESTDIR)${jrelibdir}/glibj.zip ; then \
- $(RM) $(DESTDIR)${jrelibdir}/glibj.zip ; \
- fi
-
-install-exec-local: link-glibj-zip
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-jrelibDATA install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-jrelibDATA uninstall-local
-clean-local:
- $(RM) stamp-glibj glibj.zip
install-data-local: installdirs
- if test -f $(DESTDIR)${jrelibdir}/glibj.zip ; then \
- if ! test -f $(DESTDIR)${jrelibdir}/rt.jar ; then \
- $(LN_S) $(DESTDIR)${jrelibdir}/glibj.zip $(DESTDIR)${jrelibdir}/rt.jar ; \
- fi ; \
+ if ! test -f $(DESTDIR)${jrelibdir}/rt.jar ; then \
+ $(LN_S) $(CLASSPATH_CLASSES) $(DESTDIR)${jrelibdir}/rt.jar ; \
fi
-uninstall-local: unlink-glibj-zip
+uninstall-local:
$(RM) $(DESTDIR)${jrelibdir}/rt.jar
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
More information about the kaffe
mailing list