PatchSet 6828
Date: 2005/08/14 18:36:30
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Fix for jni tests
2005-08-14 Dalibor Topic <[EMAIL PROTECTED]>
* test/jni/HelloWorldApp.class: Removed.
* test/jni/Makefile.am: Compile HelloWorldApp.class on demand.
(EXTRA_DIST) Removed HelloWorldApp.class.
Reported by: Andreas Tobler <[EMAIL PROTECTED]>
Members:
ChangeLog:1.4352->1.4353
test/jni/HelloWorldApp.class:1.1->1.2(DEAD)
test/jni/Makefile.am:1.10->1.11
test/jni/Makefile.in:1.42->1.43
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4352 kaffe/ChangeLog:1.4353
--- kaffe/ChangeLog:1.4352 Sun Aug 14 17:06:50 2005
+++ kaffe/ChangeLog Sun Aug 14 18:36:30 2005
@@ -1,5 +1,14 @@
2005-08-14 Dalibor Topic <[EMAIL PROTECTED]>
+ * test/jni/HelloWorldApp.class: Removed.
+
+ * test/jni/Makefile.am: Compile HelloWorldApp.class on demand.
+ (EXTRA_DIST) Removed HelloWorldApp.class.
+
+ Reported by: Andreas Tobler <[EMAIL PROTECTED]>
+
+2005-08-14 Dalibor Topic <[EMAIL PROTECTED]>
+
Resynced with GNU Classpath.
2005-08-13 Mark Wielaard <[EMAIL PROTECTED]>
===================================================================
Checking out kaffe/test/jni/HelloWorldApp.class
RCS: /home/cvs/kaffe/kaffe/test/jni/Attic/HelloWorldApp.class,v
VERS: 1.1
***************
Binary files - and /dev/null differ
Index: kaffe/test/jni/Makefile.am
diff -u kaffe/test/jni/Makefile.am:1.10 kaffe/test/jni/Makefile.am:1.11
--- kaffe/test/jni/Makefile.am:1.10 Mon Aug 8 15:39:22 2005
+++ kaffe/test/jni/Makefile.am Sun Aug 14 18:36:41 2005
@@ -30,6 +30,9 @@
LIBREPLACE = $(top_builddir)/replace/libreplace.la
LIBKAFFEVM = $(top_builddir)/kaffe/kaffevm/libkaffevm.la $(libjvmpi)
$(libxprof)
+HelloWorldApp.class: $(srcdir)/../regression/HelloWorldApp.java
+ $(JIKES) -g -classpath $(CPATH) -d .
$(srcdir)/../regression/HelloWorldApp.java
+
jniBase_SOURCES= jniBase.c
jniBase_LDADD= \
$(DLOPEN_JAVA_LIBS) \
@@ -46,7 +49,9 @@
$(LIBREPLACE) \
$(LTLIBINTL) \
@LIBLTDL@
-jniExecClass_DEPENDENCIES= $(LIBKAFFEVM)
+jniExecClass_DEPENDENCIES= \
+ $(LIBKAFFEVM) \
+ HelloWorldApp.class
jniReflect_SOURCES= jniReflect.c
jniReflect_LDADD= \
@@ -55,7 +60,9 @@
$(LIBREPLACE) \
$(LTLIBINTL) \
@LIBLTDL@
-jniReflect_DEPENDENCIES= $(LIBKAFFEVM)
+jniReflect_DEPENDENCIES= \
+ $(LIBKAFFEVM) \
+ HelloWorldApp.class
# Okay, the following is a bit convulted and hackish, and makes me feel dizzy.
# But as I found no way to do it better, here it goes:
@@ -111,8 +118,7 @@
jniWeakTest.o: JNIWeakTest.class
EXTRA_DIST = \
- JNIWeakTest.java \
- HelloWorldApp.class
+ JNIWeakTest.java
TESTS_ENVIRONMENT = env `BOOTCLASSPATH="."; export BOOTCLASSPATH;
KAFFELIBRARYPATH="." ; export KAFFELIBRARYPATH ; .
$(top_builddir)/BUILD_ENVIRONMENT; sed 's/.*export \(.*\)/echo \1=$$\1/' <
$(top_builddir)/BUILD_ENVIRONMENT | sh`
TESTS = $(check_PROGRAMS)
Index: kaffe/test/jni/Makefile.in
diff -u kaffe/test/jni/Makefile.in:1.42 kaffe/test/jni/Makefile.in:1.43
--- kaffe/test/jni/Makefile.in:1.42 Sat Aug 13 15:39:32 2005
+++ kaffe/test/jni/Makefile.in Sun Aug 14 18:36:41 2005
@@ -425,7 +425,10 @@
$(LTLIBINTL) \
@LIBLTDL@
-jniExecClass_DEPENDENCIES = $(LIBKAFFEVM)
+jniExecClass_DEPENDENCIES = \
+ $(LIBKAFFEVM) \
+ HelloWorldApp.class
+
jniReflect_SOURCES = jniReflect.c
jniReflect_LDADD = \
$(DLOPEN_JAVA_LIBS) \
@@ -434,7 +437,10 @@
$(LTLIBINTL) \
@LIBLTDL@
-jniReflect_DEPENDENCIES = $(LIBKAFFEVM)
+jniReflect_DEPENDENCIES = \
+ $(LIBKAFFEVM) \
+ HelloWorldApp.class
+
# Okay, the following is a bit convulted and hackish, and makes me feel dizzy.
# But as I found no way to do it better, here it goes:
@@ -479,8 +485,7 @@
jniWeakTest_DEPENDENCIES = $(LIBKAFFEVM) libjniweaklib.la
EXTRA_DIST = \
- JNIWeakTest.java \
- HelloWorldApp.class
+ JNIWeakTest.java
TESTS_ENVIRONMENT = env `BOOTCLASSPATH="."; export BOOTCLASSPATH;
KAFFELIBRARYPATH="." ; export KAFFELIBRARYPATH ; .
$(top_builddir)/BUILD_ENVIRONMENT; sed 's/.*export \(.*\)/echo \1=$$\1/' <
$(top_builddir)/BUILD_ENVIRONMENT | sh`
TESTS = $(check_PROGRAMS)
@@ -834,6 +839,9 @@
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-info-am
+
+HelloWorldApp.class: $(srcdir)/../regression/HelloWorldApp.java
+ $(JIKES) -g -classpath $(CPATH) -d .
$(srcdir)/../regression/HelloWorldApp.java
JNIWeakTest.class: $(srcdir)/JNIWeakTest.java
$(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/JNIWeakTest.java
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
