[kaffe] CVS kaffe (robilad): removed rebuildLib

Kaffe CVS cvs-commits at kaffe.org
Sun Aug 13 14:24:17 PDT 2006


PatchSet 7385 
Date: 2006/08/13 21:15:18
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed rebuildLib

2006-08-13  Dalibor Topic  <robilad at kaffe.org>

        * configure.ac: Don't output libraries/javalib/rebuildLib.

        * libraries/javalib/rebuildLib.in: Removed.

Members: 
	ChangeLog:1.4887->1.4888 
	Makefile.in:1.263->1.264 
	configure:1.565->1.566 
	configure.ac:1.243->1.244 
	libraries/javalib/Makefile.in:1.569->1.570 
	libraries/javalib/rebuildLib.in:1.47->1.48(DEAD) 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4887 kaffe/ChangeLog:1.4888
--- kaffe/ChangeLog:1.4887	Sun Aug 13 19:19:29 2006
+++ kaffe/ChangeLog	Sun Aug 13 21:15:18 2006
@@ -1,5 +1,11 @@
 2006-08-13  Dalibor Topic  <robilad at kaffe.org>
 
+	* configure.ac: Don't output libraries/javalib/rebuildLib.
+
+	* libraries/javalib/rebuildLib.in: Removed.
+
+2006-08-13  Dalibor Topic  <robilad at kaffe.org>
+
 	* tools/gjdoc/javalib/Makefile.am: 
 	Replaced by new build system.
 
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.263 kaffe/Makefile.in:1.264
--- kaffe/Makefile.in:1.263	Sun Aug 13 01:46:46 2006
+++ kaffe/Makefile.in	Sun Aug 13 21:15:26 2006
@@ -732,7 +732,7 @@
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/. $(distdir)/FAQ $(distdir)/compat-include $(distdir)/developers $(distdir)/kaffe/kaffevm $(distdir)/kaffe/man $(distdir)/kaffe/scripts $(distdir)/kaffe/scripts/compat $(distdir)/libraries/javalib $(distdir)/m4 $(distdir)/po $(distdir)/scripts $(distdir)/test/regression $(distdir)/test/regression/compile_time $(distdir)/test/regression/compiler $(distdir)/test/regression/run_time $(distdir)/tools/gjdoc/javalib
+	$(mkdir_p) $(distdir)/. $(distdir)/FAQ $(distdir)/compat-include $(distdir)/developers $(distdir)/kaffe/kaffevm $(distdir)/kaffe/man $(distdir)/kaffe/scripts $(distdir)/kaffe/scripts/compat $(distdir)/m4 $(distdir)/po $(distdir)/scripts $(distdir)/test/regression $(distdir)/test/regression/compile_time $(distdir)/test/regression/compiler $(distdir)/test/regression/run_time $(distdir)/tools/gjdoc/javalib
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
Index: kaffe/configure
diff -u kaffe/configure:1.565 kaffe/configure:1.566
--- kaffe/configure:1.565	Sun Aug 13 01:46:46 2006
+++ kaffe/configure	Sun Aug 13 21:15:26 2006
@@ -51120,8 +51120,6 @@
 
           ac_config_files="$ac_config_files libraries/clib/sound/esd/Makefile"
 
-          ac_config_files="$ac_config_files libraries/javalib/rebuildLib"
-
           ac_config_files="$ac_config_files kaffe/man/kaffe.1"
 
           ac_config_files="$ac_config_files kaffe/scripts/install-jar"
@@ -52118,7 +52116,6 @@
   "libraries/clib/sound/alsa/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/sound/alsa/Makefile" ;;
   "libraries/clib/sound/common/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/sound/common/Makefile" ;;
   "libraries/clib/sound/esd/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/sound/esd/Makefile" ;;
-  "libraries/javalib/rebuildLib" ) CONFIG_FILES="$CONFIG_FILES libraries/javalib/rebuildLib" ;;
   "kaffe/man/kaffe.1" ) CONFIG_FILES="$CONFIG_FILES kaffe/man/kaffe.1" ;;
   "kaffe/scripts/install-jar" ) CONFIG_FILES="$CONFIG_FILES kaffe/scripts/install-jar" ;;
   "kaffe/scripts/kaffe" ) CONFIG_FILES="$CONFIG_FILES kaffe/scripts/kaffe" ;;
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.243 kaffe/configure.ac:1.244
--- kaffe/configure.ac:1.243	Sun Aug 13 01:46:53 2006
+++ kaffe/configure.ac	Sun Aug 13 21:15:36 2006
@@ -2547,7 +2547,6 @@
 AC_CONFIG_FILES([libraries/clib/sound/alsa/Makefile])
 AC_CONFIG_FILES([libraries/clib/sound/common/Makefile])
 AC_CONFIG_FILES([libraries/clib/sound/esd/Makefile])
-AC_CONFIG_FILES([libraries/javalib/rebuildLib])
 AC_CONFIG_FILES([kaffe/man/kaffe.1])
 AC_CONFIG_FILES([kaffe/scripts/install-jar])
 AC_CONFIG_FILES([kaffe/scripts/kaffe])
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.569 kaffe/libraries/javalib/Makefile.in:1.570
--- kaffe/libraries/javalib/Makefile.in:1.569	Sun Aug 13 01:46:58 2006
+++ kaffe/libraries/javalib/Makefile.in	Sun Aug 13 21:15:37 2006
@@ -37,8 +37,7 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = libraries/javalib
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/rebuildLib.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \
 	$(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \
@@ -64,7 +63,7 @@
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config/config.h
-CONFIG_CLEAN_FILES = rebuildLib
+CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -419,8 +418,6 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-rebuildLib: $(top_builddir)/config.status $(srcdir)/rebuildLib.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 mostlyclean-libtool:
 	-rm -f *.lo
===================================================================
Checking out kaffe/libraries/javalib/rebuildLib.in
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/Attic/rebuildLib.in,v
VERS: 1.47
***************
--- kaffe/libraries/javalib/rebuildLib.in	Sun Aug 13 21:24:17 2006
+++ /dev/null	Sun Aug  4 19:57:58 2002
@@ -1,49 +0,0 @@
-#! /bin/sh
-#
-# rebuildLib - rebuild everything in one sweep
-#
-# Copyright (c) 1998, 1999
-#      Transvirtual Technologies, Inc.  All rights reserved.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file.
-#
-
-if [ -z "$1" ] ; then
-    exit 0
-fi
-
-LIBDIR=`cd $LIBDIR && pwd`
-VERBOSE=
-
-issrcdir=`echo $srcdir | egrep '^/.*'`
-if [ -z "${issrcdir:-}" ]; then
-	srcdir="`pwd`/$srcdir"
-fi
-
-if [ -z "${JAVA_COMPILER:-}" ] ; then
-	if [ -z "${JAVA:-}" ]; then
-		test -f ${top_builddir}/BUILD_ENVIRONMENT && . ${top_builddir}/BUILD_ENVIRONMENT
-		BOOTCLASSPATH=${BOOTCLASSPATH}:${CLASSPATH}:${LIBDIR}; export BOOTCLASSPATH
-		JAVA="$JAVA -verbosegc"
-	fi
-	if [ -z "${JAVAC:-}" ]; then
-# Kaffe needs more than 64 M of memory to compile all of the
-# class library at once using kjc. Set maximal memory to 512 M
-# to be on the safe side. Actual usage is around 200M.
-		JAVAC="$JAVA -ss 500k -mx 512M at.dms.kjc.Main"
-		VERBOSE=-v
-	fi
-	CPATH="${CPATH+-classpath $CLASSPATH:$BOOTCLASSPATH}"
-else
-	test -f ${top_builddir}/BUILD_ENVIRONMENT && . ${top_builddir}/BUILD_ENVIRONMENT
-	CLASSPATH=${CLASSPATH}:${LIBDIR}
-	JAVAC="$JAVA_COMPILER"
-	CPATH="${CPATH+-classpath $CLASSPATH:$BOOTCLASSPATH}"
-#	VERBOSE=${VERBOSE-"-verbose"}
-fi
-
-cd ${srcdir}
-
-echo "Compiling classes from " ${1+"$@"} " using " $JAVAC $VERBOSE $JAVAC_FLAGS -bootclasspath ${BOOTCLASSPATH} -classpath ${CLASSPATH} -d $LIBDIR $CPATH
-$JAVAC $VERBOSE $JAVAC_FLAGS -bootclasspath ${BOOTCLASSPATH} -classpath ${CLASSPATH} -d $LIBDIR $CPATH ${1+"$@"}




More information about the kaffe mailing list