[kaffe] CVS kaffe (guilhem): Build system fixes.

Kaffe CVS cvs-commits at kaffe.org
Sat Dec 3 09:03:53 PST 2005 

PatchSet 6982 
Date: 2005/12/03 16:53:08
Author: guilhem
Branch: HEAD
Tag: (none) 
Log:
Build system fixes.

        * Makefile.am,
        test/internal/Makefile.am:
        Fixed BOOTCLASSPATH.

        * kaffe/kaffevm/systems/Makefile.am,
        libraries/javalib/Makefile.am.in,
        test/regression/TestScript.in,
        test/regression/compile_time/CompileScript.in,
        test/regression/compiler/CompileScript.in,
        test/regression/run_time/CompileScript.in
        Use JAVA_COMPILER instead of JIKES

        * Makefile.in,
        kaffe/kaffevm/systems/Makefile.in,
        libraries/javalib/Makefile.am,
        libraries/javalib/Makefile.in,
        test/internal/Makefile.in: Regenerated

Members: 
	ChangeLog:1.4504->1.4505 
	Makefile.am:1.104->1.105 
	Makefile.in:1.233->1.234 
	kaffe/kaffevm/systems/Makefile.am:1.9->1.10 
	kaffe/kaffevm/systems/Makefile.in:1.147->1.148 
	libraries/javalib/Makefile.am:1.405->1.406 
	libraries/javalib/Makefile.am.in:1.54->1.55 
	libraries/javalib/Makefile.in:1.501->1.502 
	test/internal/Makefile.am:1.22->1.23 
	test/internal/Makefile.in:1.119->1.120 
	test/regression/TestScript.in:1.49->1.50 
	test/regression/compile_time/CompileScript.in:1.2->1.3 
	test/regression/compiler/CompileScript.in:INITIAL->1.2 
	test/regression/run_time/CompileScript.in:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4504 kaffe/ChangeLog:1.4505
--- kaffe/ChangeLog:1.4504	Sat Dec  3 15:49:54 2005
+++ kaffe/ChangeLog	Sat Dec  3 16:53:08 2005
@@ -1,5 +1,25 @@
 2005-12-03  Guilhem Lavaux  <guilhem at kaffe.org>
 
+	* Makefile.am,
+	test/internal/Makefile.am:
+	Fixed BOOTCLASSPATH.
+
+	* kaffe/kaffevm/systems/Makefile.am,
+	libraries/javalib/Makefile.am.in,
+	test/regression/TestScript.in,
+	test/regression/compile_time/CompileScript.in,
+	test/regression/compiler/CompileScript.in,
+	test/regression/run_time/CompileScript.in
+	Use JAVA_COMPILER instead of JIKES
+	
+	* Makefile.in,
+	kaffe/kaffevm/systems/Makefile.in,
+	libraries/javalib/Makefile.am,
+	libraries/javalib/Makefile.in,
+	test/internal/Makefile.in: Regenerated
+	
+2005-12-03  Guilhem Lavaux  <guilhem at kaffe.org>
+
 	* Removed a few spurious backup files from
 	libraries/javalib/vmspecific
 
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.104 kaffe/Makefile.am:1.105
--- kaffe/Makefile.am:1.104	Sat Dec  3 12:54:18 2005
+++ kaffe/Makefile.am	Sat Dec  3 16:53:12 2005
@@ -162,7 +162,7 @@
 		"DEBUG_ENV=$(DEBUG_ENV)" BUILD_ENVIRONMENT-make
 
 BUILD_ENVIRONMENT-make: Makefile
-	echo BOOTCLASSPATH=$(top_builddir)/libraries/javalib/external/classpath/lib/glibj.zip\''$(PATHSEP)'\'$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(DNSJAVA_JAR)\''$(PATHSEP)'\'\; export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' > BUILD_ENVIRONMENT.new; \
+	echo BOOTCLASSPATH=$(top_builddir)/libraries/javalib/external/classpath/lib/glibj.zip\''$(PATHSEP)'\'\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(DNSJAVA_JAR)\''$(PATHSEP)'\'\; export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' > BUILD_ENVIRONMENT.new; \
 	echo CLASSPATH=.\''$(PATHSEP)'\'\$${GNU_CRYPTO_JAR}\''$(PATHSEP)'\'\$${JAVAX_SECURITY_JAR}\''$(PATHSEP)'\'$(BCEL_JAR)\''$(PATHSEP)'\'$(GNU_CRYPTO_JAR)\''$(PATHSEP)'\'$(JAVAX_SECURITY_JAR)\; export CLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >> BUILD_ENVIRONMENT.new; \
 	echo KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}$(top_builddir)/libraries/clib/native/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/nio/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/zip/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/management/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/security/.libs\; export KAFFELIBRARYPATH >> BUILD_ENVIRONMENT.new; \
 	echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA >> BUILD_ENVIRONMENT.new; \
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.233 kaffe/Makefile.in:1.234
--- kaffe/Makefile.in:1.233	Sat Dec  3 12:54:18 2005
+++ kaffe/Makefile.in	Sat Dec  3 16:53:12 2005
@@ -960,7 +960,7 @@
 		"DEBUG_ENV=$(DEBUG_ENV)" BUILD_ENVIRONMENT-make
 
 BUILD_ENVIRONMENT-make: Makefile
-	echo BOOTCLASSPATH=$(top_builddir)/libraries/javalib/external/classpath/lib/glibj.zip\''$(PATHSEP)'\'$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(DNSJAVA_JAR)\''$(PATHSEP)'\'\; export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' > BUILD_ENVIRONMENT.new; \
+	echo BOOTCLASSPATH=$(top_builddir)/libraries/javalib/external/classpath/lib/glibj.zip\''$(PATHSEP)'\'\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(DNSJAVA_JAR)\''$(PATHSEP)'\'\; export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' > BUILD_ENVIRONMENT.new; \
 	echo CLASSPATH=.\''$(PATHSEP)'\'\$${GNU_CRYPTO_JAR}\''$(PATHSEP)'\'\$${JAVAX_SECURITY_JAR}\''$(PATHSEP)'\'$(BCEL_JAR)\''$(PATHSEP)'\'$(GNU_CRYPTO_JAR)\''$(PATHSEP)'\'$(JAVAX_SECURITY_JAR)\; export CLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >> BUILD_ENVIRONMENT.new; \
 	echo KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}$(top_builddir)/libraries/clib/native/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/nio/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/zip/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/management/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/security/.libs\; export KAFFELIBRARYPATH >> BUILD_ENVIRONMENT.new; \
 	echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA >> BUILD_ENVIRONMENT.new; \
Index: kaffe/kaffe/kaffevm/systems/Makefile.am
diff -u kaffe/kaffe/kaffevm/systems/Makefile.am:1.9 kaffe/kaffe/kaffevm/systems/Makefile.am:1.10
--- kaffe/kaffe/kaffevm/systems/Makefile.am:1.9	Sat May 17 21:16:38 2003
+++ kaffe/kaffe/kaffevm/systems/Makefile.am	Sat Dec  3 16:53:13 2005
@@ -7,4 +7,4 @@
 # of this file. 
 
 SUBDIRS = $(THREAD_SYSTEM)
-DIST_SUBDIRS = unix-jthreads unix-pthreads oskit-pthreads beos-native
+DIST_SUBDIRS = unix-jthreads unix-pthreads oskit-pthreads drops-l4threads beos-native
Index: kaffe/kaffe/kaffevm/systems/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/Makefile.in:1.147 kaffe/kaffe/kaffevm/systems/Makefile.in:1.148
--- kaffe/kaffe/kaffevm/systems/Makefile.in:1.147	Sat Dec  3 12:54:37 2005
+++ kaffe/kaffe/kaffevm/systems/Makefile.in	Sat Dec  3 16:53:13 2005
@@ -342,7 +342,7 @@
 toolslibdir = @toolslibdir@
 with_engine = @with_engine@
 SUBDIRS = $(THREAD_SYSTEM)
-DIST_SUBDIRS = unix-jthreads unix-pthreads oskit-pthreads beos-native
+DIST_SUBDIRS = unix-jthreads unix-pthreads oskit-pthreads drops-l4threads beos-native
 all: all-recursive
 
 .SUFFIXES:
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.405 kaffe/libraries/javalib/Makefile.am:1.406
--- kaffe/libraries/javalib/Makefile.am:1.405	Sat Dec  3 15:49:58 2005
+++ kaffe/libraries/javalib/Makefile.am	Sat Dec  3 16:53:13 2005
@@ -47,6 +47,7 @@
 
 EXTRA_DIST= \
 	    Makefile.am.in \
+	    logging.properties \
 	vmspecific/META-INF/MANIFEST.MF \
 	vmspecific/META-INF/services/javax.sound.sampled.spi.AudioFileReader \
 	vmspecific/META-INF/services/javax.sound.sampled.spi.AudioFileWriter \
Index: kaffe/libraries/javalib/Makefile.am.in
diff -u kaffe/libraries/javalib/Makefile.am.in:1.54 kaffe/libraries/javalib/Makefile.am.in:1.55
--- kaffe/libraries/javalib/Makefile.am.in:1.54	Sat Dec  3 12:55:06 2005
+++ kaffe/libraries/javalib/Makefile.am.in	Sat Dec  3 16:53:14 2005
@@ -47,3 +47,4 @@
 
 EXTRA_DIST= \
 	    Makefile.am.in \
+	    logging.properties \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.501 kaffe/libraries/javalib/Makefile.in:1.502
--- kaffe/libraries/javalib/Makefile.in:1.501	Sat Dec  3 15:49:59 2005
+++ kaffe/libraries/javalib/Makefile.in	Sat Dec  3 16:53:16 2005
@@ -363,6 +363,7 @@
 
 EXTRA_DIST = \
 	    Makefile.am.in \
+	    logging.properties \
 	vmspecific/META-INF/MANIFEST.MF \
 	vmspecific/META-INF/services/javax.sound.sampled.spi.AudioFileReader \
 	vmspecific/META-INF/services/javax.sound.sampled.spi.AudioFileWriter \
Index: kaffe/test/internal/Makefile.am
diff -u kaffe/test/internal/Makefile.am:1.22 kaffe/test/internal/Makefile.am:1.23
--- kaffe/test/internal/Makefile.am:1.22	Sat Dec  3 12:55:12 2005
+++ kaffe/test/internal/Makefile.am	Sat Dec  3 16:53:17 2005
@@ -84,7 +84,7 @@
 	Exceptions.class \
 	VirtualMethod.class
 
-TESTS_ENVIRONMENT = env TEST_CLASSES="$(JAVA_CLASSES)" `BOOTCLASSPATH="."; export BOOTCLASSPATH; . $(top_builddir)/BUILD_ENVIRONMENT; sed 's/.*export \(.*\)/echo \1=$$\1/' < $(top_builddir)/BUILD_ENVIRONMENT | sh`
+TESTS_ENVIRONMENT = env TEST_CLASSES="$(JAVA_CLASSES)" `. $(top_builddir)/BUILD_ENVIRONMENT; BOOTCLASSPATH=.:\$${BOOTCLASSPATH}; export BOOTCLASSPATH; sed 's/.*export \(.*\)/echo \1=$$\1/' < $(top_builddir)/BUILD_ENVIRONMENT | sh`
 
 ##CPATH = $(top_builddir)/libraries/javalib/rt.jar
 CPATH = .:$(top_builddir)/libraries/javalib/external/classpath/lib/glibj.zip
@@ -99,7 +99,7 @@
 	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/ParameterizedMethods.java
 
 ParameterizedMathMethods.class: $(srcdir)/ParameterizedMathMethods.java
-	$(JAVA_COMPLIER) -g -classpath $(CPATH) -d . $(srcdir)/ParameterizedMathMethods.java
+	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/ParameterizedMathMethods.java
 
 ParameterizedLogicalMethods.class: $(srcdir)/ParameterizedLogicalMethods.java
 	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/ParameterizedLogicalMethods.java
Index: kaffe/test/internal/Makefile.in
diff -u kaffe/test/internal/Makefile.in:1.119 kaffe/test/internal/Makefile.in:1.120
--- kaffe/test/internal/Makefile.in:1.119	Sat Dec  3 12:55:12 2005
+++ kaffe/test/internal/Makefile.in	Sat Dec  3 16:53:17 2005
@@ -419,7 +419,7 @@
 	Exceptions.class \
 	VirtualMethod.class
 
-TESTS_ENVIRONMENT = env TEST_CLASSES="$(JAVA_CLASSES)" `BOOTCLASSPATH="."; export BOOTCLASSPATH; . $(top_builddir)/BUILD_ENVIRONMENT; sed 's/.*export \(.*\)/echo \1=$$\1/' < $(top_builddir)/BUILD_ENVIRONMENT | sh`
+TESTS_ENVIRONMENT = env TEST_CLASSES="$(JAVA_CLASSES)" `. $(top_builddir)/BUILD_ENVIRONMENT; BOOTCLASSPATH=.:\$${BOOTCLASSPATH}; export BOOTCLASSPATH; sed 's/.*export \(.*\)/echo \1=$$\1/' < $(top_builddir)/BUILD_ENVIRONMENT | sh`
 CPATH = .:$(top_builddir)/libraries/javalib/external/classpath/lib/glibj.zip
 TESTS = $(check_PROGRAMS)
 XFAIL_TESTS = 
@@ -799,7 +799,7 @@
 	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/ParameterizedMethods.java
 
 ParameterizedMathMethods.class: $(srcdir)/ParameterizedMathMethods.java
-	$(JAVA_COMPLIER) -g -classpath $(CPATH) -d . $(srcdir)/ParameterizedMathMethods.java
+	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/ParameterizedMathMethods.java
 
 ParameterizedLogicalMethods.class: $(srcdir)/ParameterizedLogicalMethods.java
 	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/ParameterizedLogicalMethods.java
Index: kaffe/test/regression/TestScript.in
diff -u kaffe/test/regression/TestScript.in:1.49 kaffe/test/regression/TestScript.in:1.50
--- kaffe/test/regression/TestScript.in:1.49	Wed Oct 19 20:16:40 2005
+++ kaffe/test/regression/TestScript.in	Sat Dec  3 16:53:18 2005
@@ -16,8 +16,8 @@
 : ${JAVA=$KAFFEHOME/bin/kaffe} ${SRCDIR=@srcdir@} ${PATHSEP='@PATHSEP@'}
 : ${JASMIN=@JASMIN@}
 # If you want to use jikes as default compiler for the regression tests uncomment the line below.
-test -z "@JIKES@" || : ${JIKES="@JIKES@ -nowarn -bootclasspath @top_builddir@/libraries/javalib/external/classpath/lib/glibj.zip"}
-: ${JAVAC=${JIKES-"$JAVA -ss 512k -noverify at.dms.kjc.Main"}" -classpath \".${PATHSEP}@GNU_CRYPTO_JAR@${PATHSEP}@JAVAX_SECURITY_JAR@${PATHSEP}${SRCDIR}${PATHSEP}compile_time${PATHSEP}${CLASSPATH}\""}
+test -z "@JAVA_COMPILER@" || : ${JAVA_COMPILER="@JAVA_COMPILER@ -nowarn -bootclasspath @top_builddir@/libraries/javalib/external/classpath/lib/glibj.zip"}
+: ${JAVAC=${JAVA_COMPILER-"$JAVA -ss 512k -noverify at.dms.kjc.Main"}" -classpath \".${PATHSEP}@GNU_CRYPTO_JAR@${PATHSEP}@JAVAX_SECURITY_JAR@${PATHSEP}${SRCDIR}${PATHSEP}compile_time${PATHSEP}${CLASSPATH}\""}
 : ${TIMEOUT=300}
 : ${HARDTIMEOUT=5}
 overallerror=0
Index: kaffe/test/regression/compile_time/CompileScript.in
diff -u kaffe/test/regression/compile_time/CompileScript.in:1.2 kaffe/test/regression/compile_time/CompileScript.in:1.3
--- kaffe/test/regression/compile_time/CompileScript.in:1.2	Sun Jan 25 17:41:23 2004
+++ kaffe/test/regression/compile_time/CompileScript.in	Sat Dec  3 16:53:18 2005
@@ -11,7 +11,7 @@
 # University of Utah, http://www.cs.utah.edu/flux/
 
 : ${JAVA=kaffe}
-test -z "@JIKES@" || : ${JIKES="@JIKES@ -nowarn"}
-: ${JAVAC=${JIKES-"env CLASSPATH=$CLASSPATH $JAVA -noverify at.dms.kjc.Main"}" -classpath \"$CLASSPATH\""}
+test -z "@JAVA_COMPILER@" || : ${JAVA_COMPILER="@JAVA_COMPILER@ -nowarn"}
+: ${JAVAC=${JAVA_COMPILER-"env CLASSPATH=$CLASSPATH $JAVA -noverify at.dms.kjc.Main"}" -classpath \"$CLASSPATH\""}
 
 exec $JAVAC -classpath $CLASSPATH -d . $*
===================================================================
Checking out kaffe/test/regression/compiler/CompileScript.in
RCS:  /home/cvs/kaffe/kaffe/test/regression/compiler/CompileScript.in,v
VERS: 1.2
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/test/regression/compiler/CompileScript.in	Sat Dec  3 17:03:53 2005
@@ -0,0 +1,17 @@
+#! /bin/sh
+#
+# Copyright (c) 2002, 2003 University of Utah and the Flux Group.
+# All rights reserved.
+#
+# This file is licensed under the terms of the GNU Public License.
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# Contributed by the Flux Research Group, Department of Computer Science,
+# University of Utah, http://www.cs.utah.edu/flux/
+
+: ${JAVA=kaffe}
+test -z "@JAVA_COMPILER@" || : ${JAVA_COMPILER="@JAVA_COMPILER@ -nowarn"}
+: ${JAVAC=${JAVA_COMPILER-"env CLASSPATH=$CLASSPATH $JAVA -noverify at.dms.kjc.Main"}" -classpath \"$CLASSPATH\""}
+
+exec $JAVAC -classpath $CLASSPATH -d . $*
Index: kaffe/test/regression/run_time/CompileScript.in
diff -u kaffe/test/regression/run_time/CompileScript.in:1.1 kaffe/test/regression/run_time/CompileScript.in:1.2
--- kaffe/test/regression/run_time/CompileScript.in:1.1	Sun Aug 31 22:09:27 2003
+++ kaffe/test/regression/run_time/CompileScript.in	Sat Dec  3 16:53:19 2005
@@ -11,7 +11,7 @@
 # University of Utah, http://www.cs.utah.edu/flux/
 
 : ${JAVA=kaffe}
-test -z "@JIKES@" || : ${JIKES="@JIKES@ -nowarn"}
-: ${JAVAC=${JIKES-"env CLASSPATH=$CLASSPATH $JAVA -noverify at.dms.kjc.Main"}" -classpath \"$CLASSPATH\""}
+test -z "@JAVA_COMPILER@" || : ${JAVA_COMPILER="@JAVA_COMPILER@ -nowarn"}
+: ${JAVAC=${JAVA_COMPILER-"env CLASSPATH=$CLASSPATH $JAVA -noverify at.dms.kjc.Main"}" -classpath \"$CLASSPATH\""}
 
 exec $JAVAC -classpath $CLASSPATH -d . $1

More information about the kaffe mailing list