PatchSet 7538 Date: 2007/09/11 11:02:40 Author: robilad Branch: HEAD Tag: (none) Log: 2007-09-11 Dalibor Topic <[EMAIL PROTECTED]>
Fix for bug #98. * developers/autogen.sh: Drop boehm-gc reconfiguration. * libraries/javalib/Makefile.am: (MAYBE_GLIBJ_ZIP) Removed. (link-glibj-zip, unlink-glibj-zip, install-exec-local) Added when using system classpath, or prebuilt glibj.zip. (clean-local) Use RM instead of hardcoding 'rm'. (SUBDIRS) Don't evaluate '.' first. (jrelib_DATA) Removed MAYBE_GLIBJ_ZIP. (uninstall-local) Add unlink-glibj-zip as a dependency, to make sure that glibj.zip link is removed in the cases when it is set (i.e. when configure to use system classpath or prebuilt glibj.zip). * libraries/javalib/external/classpath/lib/Makefile.am: (all-local) Add glibj.zip as a dependency to make sure the built continues to function for tools when prebuilt glibj.zip is used. Members: ChangeLog:1.5036->1.5037 developers/autogen.sh:1.77->1.78 libraries/javalib/Makefile.am:1.458->1.459 libraries/javalib/Makefile.in:1.579->1.580 libraries/javalib/external/classpath/lib/Makefile.am:1.17->1.18 libraries/javalib/external/classpath/lib/Makefile.in:1.36->1.37 po/de.po:1.12->1.13 po/fr.po:1.27->1.28 po/kaffe.pot:1.24->1.25 po/zh_CN.po:1.16->1.17 po/zh_TW.po:1.33->1.34 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.5036 kaffe/ChangeLog:1.5037 --- kaffe/ChangeLog:1.5036 Tue Aug 28 15:13:34 2007 +++ kaffe/ChangeLog Tue Sep 11 11:02:40 2007 @@ -1,3 +1,26 @@ +2007-09-11 Dalibor Topic <[EMAIL PROTECTED]> + + Fix for bug #98. + * developers/autogen.sh: + Drop boehm-gc reconfiguration. + + * libraries/javalib/Makefile.am: + (MAYBE_GLIBJ_ZIP) Removed. + (link-glibj-zip, unlink-glibj-zip, install-exec-local) Added + when using system classpath, or prebuilt glibj.zip. + (clean-local) Use RM instead of hardcoding 'rm'. + (SUBDIRS) Don't evaluate '.' first. + (jrelib_DATA) Removed MAYBE_GLIBJ_ZIP. + (uninstall-local) Add unlink-glibj-zip as a dependency, to + make sure that glibj.zip link is removed in the cases + when it is set (i.e. when configure to use system classpath + or prebuilt glibj.zip). + + * libraries/javalib/external/classpath/lib/Makefile.am: + (all-local) Add glibj.zip as a dependency to make sure + the built continues to function for tools when prebuilt glibj.zip + is used. + 2007-08-27 Ito Kazumitsu <[EMAIL PROTECTED]> Fixes bug #100 Index: kaffe/developers/autogen.sh diff -u kaffe/developers/autogen.sh:1.77 kaffe/developers/autogen.sh:1.78 --- kaffe/developers/autogen.sh:1.77 Tue Aug 7 10:54:58 2007 +++ kaffe/developers/autogen.sh Tue Sep 11 11:02:41 2007 @@ -136,12 +136,6 @@ autoreconf -i -f ) -( - cd kaffe/kaffevm/boehm-gc/boehm - - autoreconf -i -f # -Wall -) - # drops specific patches ( cd scripts Index: kaffe/libraries/javalib/Makefile.am diff -u kaffe/libraries/javalib/Makefile.am:1.458 kaffe/libraries/javalib/Makefile.am:1.459 --- kaffe/libraries/javalib/Makefile.am:1.458 Wed Jun 13 02:19:39 2007 +++ kaffe/libraries/javalib/Makefile.am Tue Sep 11 11:02:41 2007 @@ -37,23 +37,52 @@ @$(LN_S) $(CLASSPATH_CLASSES) glibj.zip @touch stamp-glibj -MAYBE_GLIBJ_ZIP= glibj.zip - 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 + else if USE_PRECOMPILED_RT_JAR stamp-glibj: @echo Importing glibj.zip from $(GLIBJ_ZIP) - @cp $(GLIBJ_ZIP) external/classpath/lib/glibj.zip - @$(LN_S) external/classpath/lib/glibj.zip glibj.zip + @$(LN_S) $(GLIBJ_ZIP) external/classpath/lib/glibj.zip + @$(LN_S) $(GLIBJ_ZIP) glibj.zip @touch stamp-glibj -MAYBE_GLIBJ_ZIP= glibj.zip - 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) $(GLIBJ_ZIP) $(DESTDIR)${jrelibdir}/glibj.zip ; \ + fi + +unlink-glibj-zip: + if test -f $(DESTDIR)${jrelibdir}/glibj.zip ; then \ + $(RM) $(DESTDIR)${jrelibdir}/glibj.zip ; \ + fi + +# link glibj.zip in as part of installation +install-exec-local: link-glibj-zip + else stamp-glibj: @touch stamp-glibj + +# do nothing, the classpath build takes care of uninstalling it +unlink-glibj-zip: + endif # if we're not using the system classpath, build our own. @@ -61,10 +90,9 @@ endif clean-local: - rm -rf stamp-glibj glibj.zip + $(RM) stamp-glibj glibj.zip SUBDIRS= \ - . \ $(MAYBE_CLASSPATH) \ vmspecific \ gnu-inet \ @@ -75,8 +103,7 @@ $(MAYBE_ZLIB_ZIP) jrelib_DATA= \ - logging.properties \ - $(MAYBE_GLIBJ_ZIP) + logging.properties export JAVA_COMPILER @@ -87,7 +114,7 @@ fi ; \ fi -uninstall-local: +uninstall-local: unlink-glibj-zip $(RM) $(DESTDIR)${jrelibdir}/rt.jar EXTRA_DIST= \ Index: kaffe/libraries/javalib/Makefile.in diff -u kaffe/libraries/javalib/Makefile.in:1.579 kaffe/libraries/javalib/Makefile.in:1.580 --- kaffe/libraries/javalib/Makefile.in:1.579 Tue Aug 7 01:44:56 2007 +++ kaffe/libraries/javalib/Makefile.in Tue Sep 11 11:02:41 2007 @@ -82,7 +82,7 @@ distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = . external/classpath vmspecific gnu-inet dnsjava \ +DIST_SUBDIRS = external/classpath vmspecific gnu-inet dnsjava \ awt-implementations gmp-math tritonus-sound zlib-zip DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -309,13 +309,10 @@ @[EMAIL PROTECTED] = gmp-math @[EMAIL PROTECTED] = tritonus-sound @[EMAIL PROTECTED] = zlib-zip [EMAIL PROTECTED]@@[EMAIL PROTECTED] = glibj.zip [EMAIL PROTECTED]@MAYBE_GLIBJ_ZIP = glibj.zip # if we're not using the system classpath, build our own. @[EMAIL PROTECTED] = external/classpath SUBDIRS = \ - . \ $(MAYBE_CLASSPATH) \ vmspecific \ gnu-inet \ @@ -326,8 +323,7 @@ $(MAYBE_ZLIB_ZIP) jrelib_DATA = \ - logging.properties \ - $(MAYBE_GLIBJ_ZIP) + logging.properties EXTRA_DIST = \ logging.properties @@ -594,6 +590,7 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." [EMAIL PROTECTED]@@[EMAIL PROTECTED]: clean: clean-recursive clean-am: clean-generic clean-libtool clean-local mostlyclean-am @@ -616,7 +613,7 @@ install-dvi: install-dvi-recursive -install-exec-am: +install-exec-am: install-exec-local install-html: install-html-recursive @@ -657,14 +654,14 @@ 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-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 + 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 @[EMAIL PROTECTED]: @@ -673,18 +670,50 @@ @USE_SYSTEM_CLASSPATH_TRUE@ @touch stamp-glibj @[EMAIL PROTECTED]: stamp-glibj + +# used to link the system/precompiled glibj.zip on install [EMAIL PROTECTED]@link-glibj-zip: [EMAIL PROTECTED]@ if ! test -f $(DESTDIR)${jrelibdir}/glibj.zip ; then \ [EMAIL PROTECTED]@ $(LN_S) $(CLASSPATH_CLASSES) $(DESTDIR)${jrelibdir}/glibj.zip ; \ [EMAIL PROTECTED]@ fi + [EMAIL PROTECTED]@unlink-glibj-zip: [EMAIL PROTECTED]@ if test -f $(DESTDIR)${jrelibdir}/glibj.zip ; then \ [EMAIL PROTECTED]@ $(RM) $(DESTDIR)${jrelibdir}/glibj.zip ; \ [EMAIL PROTECTED]@ fi + [EMAIL PROTECTED]@install-exec-local: link-glibj-zip + @USE_PRECOMPILED_RT_JAR_TRUE@@[EMAIL PROTECTED]: @USE_PRECOMPILED_RT_JAR_TRUE@@USE_SYSTEM_CLASSPATH_FALSE@ @echo Importing glibj.zip from $(GLIBJ_ZIP) [EMAIL PROTECTED]@@USE_SYSTEM_CLASSPATH_FALSE@ @cp $(GLIBJ_ZIP) external/classpath/lib/glibj.zip [EMAIL PROTECTED]@@USE_SYSTEM_CLASSPATH_FALSE@ @$(LN_S) external/classpath/lib/glibj.zip glibj.zip [EMAIL PROTECTED]@@USE_SYSTEM_CLASSPATH_FALSE@ @$(LN_S) $(GLIBJ_ZIP) external/classpath/lib/glibj.zip [EMAIL PROTECTED]@@USE_SYSTEM_CLASSPATH_FALSE@ @$(LN_S) $(GLIBJ_ZIP) glibj.zip @USE_PRECOMPILED_RT_JAR_TRUE@@USE_SYSTEM_CLASSPATH_FALSE@ @touch stamp-glibj @USE_PRECOMPILED_RT_JAR_TRUE@@[EMAIL PROTECTED]: stamp-glibj + +# used to link the system/precompiled glibj.zip on install [EMAIL PROTECTED]@@[EMAIL PROTECTED]: [EMAIL PROTECTED]@@USE_SYSTEM_CLASSPATH_FALSE@ if ! test -f $(DESTDIR)${jrelibdir}/glibj.zip ; then \ [EMAIL PROTECTED]@@USE_SYSTEM_CLASSPATH_FALSE@ $(LN_S) $(GLIBJ_ZIP) $(DESTDIR)${jrelibdir}/glibj.zip ; \ [EMAIL PROTECTED]@@USE_SYSTEM_CLASSPATH_FALSE@ fi + [EMAIL PROTECTED]@@[EMAIL PROTECTED]: [EMAIL PROTECTED]@@USE_SYSTEM_CLASSPATH_FALSE@ if test -f $(DESTDIR)${jrelibdir}/glibj.zip ; then \ [EMAIL PROTECTED]@@USE_SYSTEM_CLASSPATH_FALSE@ $(RM) $(DESTDIR)${jrelibdir}/glibj.zip ; \ [EMAIL PROTECTED]@@USE_SYSTEM_CLASSPATH_FALSE@ fi + +# link glibj.zip in as part of installation [EMAIL PROTECTED]@@[EMAIL PROTECTED]: link-glibj-zip + @USE_PRECOMPILED_RT_JAR_FALSE@@[EMAIL PROTECTED]: @USE_PRECOMPILED_RT_JAR_FALSE@@USE_SYSTEM_CLASSPATH_FALSE@ @touch stamp-glibj +# do nothing, the classpath build takes care of uninstalling it [EMAIL PROTECTED]@@[EMAIL PROTECTED]: + clean-local: - rm -rf stamp-glibj glibj.zip + $(RM) stamp-glibj glibj.zip export JAVA_COMPILER @@ -695,7 +724,7 @@ fi ; \ fi -uninstall-local: +uninstall-local: unlink-glibj-zip $(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. Index: kaffe/libraries/javalib/external/classpath/lib/Makefile.am diff -u kaffe/libraries/javalib/external/classpath/lib/Makefile.am:1.17 kaffe/libraries/javalib/external/classpath/lib/Makefile.am:1.18 --- kaffe/libraries/javalib/external/classpath/lib/Makefile.am:1.17 Fri Jan 5 19:45:59 2007 +++ kaffe/libraries/javalib/external/classpath/lib/Makefile.am Tue Sep 11 11:02:41 2007 @@ -94,6 +94,8 @@ glibj.zip: cp $(PATH_TO_GLIBJ_ZIP) . +all-local: glibj.zip + else glibj.zip: classes compile-classes resources Index: kaffe/libraries/javalib/external/classpath/lib/Makefile.in diff -u kaffe/libraries/javalib/external/classpath/lib/Makefile.in:1.36 kaffe/libraries/javalib/external/classpath/lib/Makefile.in:1.37 --- kaffe/libraries/javalib/external/classpath/lib/Makefile.in:1.36 Tue Aug 7 10:54:59 2007 +++ kaffe/libraries/javalib/external/classpath/lib/Makefile.in Tue Sep 11 11:02:41 2007 @@ -369,7 +369,8 @@ dist-hook check-am: all-am check: check-am -all-am: Makefile $(DATA) [EMAIL PROTECTED]@all-local: +all-am: Makefile $(DATA) all-local installdirs: for dir in "$(DESTDIR)$(glibjdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ @@ -458,18 +459,18 @@ .MAKE: install-am install-strip -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - clean-local dist-hook distclean distclean-generic \ - distclean-libtool 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-glibjDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-glibjDATA uninstall-local +.PHONY: all all-am all-local check check-am clean clean-generic \ + clean-libtool clean-local dist-hook distclean \ + distclean-generic distclean-libtool 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-glibjDATA install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-glibjDATA uninstall-local sinclude $(JAVA_DEPEND) @@ -506,6 +507,8 @@ @[EMAIL PROTECTED]: @USE_PREBUILT_GLIBJ_ZIP_TRUE@ cp $(PATH_TO_GLIBJ_ZIP) . + [EMAIL PROTECTED]@all-local: glibj.zip @[EMAIL PROTECTED]: classes compile-classes resources @USE_PREBUILT_GLIBJ_ZIP_FALSE@ if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax org sun META-INF > /dev/null; fi Index: kaffe/po/de.po diff -u kaffe/po/de.po:1.12 kaffe/po/de.po:1.13 --- kaffe/po/de.po:1.12 Sat Sep 9 01:06:17 2006 +++ kaffe/po/de.po Tue Sep 11 11:02:42 2007 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2006-09-08 02:10+0200\n" +"POT-Creation-Date: 2007-08-07 22:42+0200\n" "PO-Revision-Date: 2005-07-18 23:27+0200\n" "Last-Translator: \n" "Language-Team: <[EMAIL PROTECTED]>\n" @@ -260,7 +260,7 @@ #: kaffe/kaffe/version.c:46 #, fuzzy msgid "" -"Copyright (c) 1996-2006 Kaffe.org project contributors (please see\n" +"Copyright (c) 1996-2007 Kaffe.org project contributors (please see\n" " the source code for a full list of contributors). All rights reserved.\n" "Portions Copyright (c) 1996-2002 Transvirtual Technologies, Inc.\n" "\n" Index: kaffe/po/fr.po diff -u kaffe/po/fr.po:1.27 kaffe/po/fr.po:1.28 --- kaffe/po/fr.po:1.27 Sat Sep 9 01:06:17 2006 +++ kaffe/po/fr.po Tue Sep 11 11:02:42 2007 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kaffe Virtual Machine 1.1.x-cvs\n" "Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2006-09-08 02:10+0200\n" +"POT-Creation-Date: 2007-08-07 22:42+0200\n" "PO-Revision-Date: 2004-06-03 22:00+0200\n" "Last-Translator: Guilhem Lavaux <[EMAIL PROTECTED]>\n" "Language-Team: French <kaffe@kaffe.org>\n" @@ -267,7 +267,7 @@ #: kaffe/kaffe/version.c:46 #, fuzzy msgid "" -"Copyright (c) 1996-2006 Kaffe.org project contributors (please see\n" +"Copyright (c) 1996-2007 Kaffe.org project contributors (please see\n" " the source code for a full list of contributors). All rights reserved.\n" "Portions Copyright (c) 1996-2002 Transvirtual Technologies, Inc.\n" "\n" Index: kaffe/po/kaffe.pot diff -u kaffe/po/kaffe.pot:1.24 kaffe/po/kaffe.pot:1.25 --- kaffe/po/kaffe.pot:1.24 Sat Sep 9 01:06:17 2006 +++ kaffe/po/kaffe.pot Tue Sep 11 11:02:42 2007 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2006-09-08 02:10+0200\n" +"POT-Creation-Date: 2007-08-07 22:42+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n" "Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n" @@ -207,7 +207,7 @@ #: kaffe/kaffe/version.c:46 msgid "" -"Copyright (c) 1996-2006 Kaffe.org project contributors (please see\n" +"Copyright (c) 1996-2007 Kaffe.org project contributors (please see\n" " the source code for a full list of contributors). All rights reserved.\n" "Portions Copyright (c) 1996-2002 Transvirtual Technologies, Inc.\n" "\n" Index: kaffe/po/zh_CN.po diff -u kaffe/po/zh_CN.po:1.16 kaffe/po/zh_CN.po:1.17 --- kaffe/po/zh_CN.po:1.16 Sun Sep 10 11:33:45 2006 +++ kaffe/po/zh_CN.po Tue Sep 11 11:02:42 2007 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Kaffe Virtual Machine 1.1.x-cvs\n" "Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2006-09-08 02:10+0200\n" +"POT-Creation-Date: 2007-08-07 22:42+0200\n" "PO-Revision-Date: 2005-04-13 07:39+0800\n" "Last-Translator: DexterK Kidd <[EMAIL PROTECTED]>\n" "Language-Team: Simplified Chinese <kaffe@kaffe.org>\n" @@ -248,7 +248,7 @@ #: kaffe/kaffe/version.c:46 msgid "" -"Copyright (c) 1996-2006 Kaffe.org project contributors (please see\n" +"Copyright (c) 1996-2007 Kaffe.org project contributors (please see\n" " the source code for a full list of contributors). All rights reserved.\n" "Portions Copyright (c) 1996-2002 Transvirtual Technologies, Inc.\n" "\n" Index: kaffe/po/zh_TW.po diff -u kaffe/po/zh_TW.po:1.33 kaffe/po/zh_TW.po:1.34 --- kaffe/po/zh_TW.po:1.33 Sun Sep 10 11:33:45 2006 +++ kaffe/po/zh_TW.po Tue Sep 11 11:02:42 2007 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Kaffe Virtual Machine 1.1.x-cvs\n" "Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2006-09-08 02:10+0200\n" +"POT-Creation-Date: 2007-08-07 22:42+0200\n" "PO-Revision-Date: 2005-03-06 07:39+0800\n" "Last-Translator: Jim Huang <[EMAIL PROTECTED]>\n" "Language-Team: Traditional Chinese <kaffe@kaffe.org>\n" @@ -247,8 +247,9 @@ "\t-cp <è·¯å¾> \t\t è¨å® classpath\n" #: kaffe/kaffe/version.c:46 +#, fuzzy msgid "" -"Copyright (c) 1996-2006 Kaffe.org project contributors (please see\n" +"Copyright (c) 1996-2007 Kaffe.org project contributors (please see\n" " the source code for a full list of contributors). All rights reserved.\n" "Portions Copyright (c) 1996-2002 Transvirtual Technologies, Inc.\n" "\n" _______________________________________________ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe