This patch should be applied to the
"ajuba-tclblend-contract-2000-08-01-branch".
Here is a patch for the tcljava/Makefile.in that adds the Jacl shell to the
tclblend.jar and a new target "test_jvmblend.exec" which runs the TclBlend
test suite using a JVM loading TclBlend.
Since I don't have an UNIX machine to test this, I am sending this patch
separately.
-- Jiang Wu
[EMAIL PROTECTED]
Index: Makefile.in
===================================================================
RCS file: /cvsroot/tcljava/Makefile.in,v
retrieving revision 1.14
diff -u -r1.14 Makefile.in
--- Makefile.in 2000/06/03 12:50:51 1.14
+++ Makefile.in 2000/08/05 23:41:41
@@ -223,6 +223,7 @@
tcl.lang.Notifier \
tcl.lang.TclList \
tcl.lang.TimerHandler \
+ tcl.lang.Shell \
tcl.lang.Util
@@ -256,7 +257,8 @@
cd $(TCLBLEND_SRC_DIR) ;\
CLASSPATH=$(TCLBLEND_CLASSPATH) \
$(JAVAC) $(JAVAC_FLAGS) \
- $(JAVAC_D_FLAG) $(TCLBLEND_BUILD_DIR) tcl/lang/*.java
+ $(JAVAC_D_FLAG) $(TCLBLEND_BUILD_DIR) tcl/lang/*.java \
+ $(JACL_SRC_DIR)/tcl/lang/Shell.java
# Only use this if you are developing tclblend code and you need to
recompile
# a lot. It will not clean up before building and tclblend.jar will not be
@@ -269,7 +271,8 @@
cd $(TCLBLEND_SRC_DIR) ;\
CLASSPATH=$(TCLBLEND_CLASSPATH) \
$(JAVAC) $(JAVAC_FLAGS) \
- $(JAVAC_D_FLAG) $(TCLBLEND_BUILD_DIR) tcl/lang/*.java
+ $(JAVAC_D_FLAG) $(TCLBLEND_BUILD_DIR) tcl/lang/*.java \
+ $(JACL_SRC_DIR)/tcl/lang/Shell.java
# tclblend.jar needs to depend on tclblend.build so that the
# classfiles get rebuilt each time the jar is built
@@ -789,6 +792,29 @@
JAVA=$(JAVA) \
BUILD_DIR=$(BUILD_DIR) \
$(TCL_BIN_TCLSH)
+
+test_jvmblend.exec: test_tclblend.check
+ @( echo \
+ set auto_path [concat [pwd] [set auto_path]]\; \
+ cd $(TOP_DIR)/tests\; \
+ puts \"pwd is [pwd]\"\; \
+ puts \"CLASSPATH is [set env\(CLASSPATH\)]\"\; \
+ puts \"auto_path is [set auto_path]\"\; \
+ source all\; \
+ puts \"Tests done.\"\; \
+ exit; ) | \
+ LD_PRELOAD=$(TCLBLEND_LD_PRELOAD) \
+ LD_BIND_NOW=$(TCLBLEND_LD_BIND_NOW) \
+
LD_LIBRARY_PATH=$(BUILD_DIR):$(TCL_BIN_DIR):$(JAVA_LIB_RUNTIME_PATH):$(LD_LI
BRARY_PATH) \
+
SHLIB_PATH=$(BUILD_DIR):$(TCL_BIN_DIR):$(JAVA_LIB_RUNTIME_PATH):$(SHLIB_PATH
) \
+ KAFFELIBRARYPATH=$(BUILD_DIR):$(TCL_BIN_DIR):$(JAVA_LIB_RUNTIME_PATH) \
+ TCL_LIBRARY=$(TCL_LIBRARY_DIR) \
+ TCL_LIBRARY=$(TCL_LIBRARY_DIR) \
+ CLASSPATH=$(TEST_CLASSPATH) \
+ JAVA=$(JAVA) \
+ BUILD_DIR=$(BUILD_DIR) \
+ $(JAVA) $(JAVA_FLAGS) \
+ -DBUILD_DIR=$(BUILD_DIR) -DJAVA=$(JAVA) tcl.lang.Shell
#----------------------------------------------------------------
# shell : used to drop the user into a jacl or tclblend shell
----------------------------------------------------------------
The TclJava mailing list is sponsored by Scriptics Corporation.
To subscribe: send mail to [EMAIL PROTECTED]
with the word SUBSCRIBE as the subject.
To unsubscribe: send mail to [EMAIL PROTECTED]
with the word UNSUBSCRIBE as the subject.
To send to the list, send email to '[EMAIL PROTECTED]'.
An archive is available at http://www.mail-archive.com/tcljava@scriptics.com
