2009/6/27 Vegard Nossum <vegard.nos...@gmail.com>:
> From 51124c6533895ef28f39c2c61aca91c8432fb498 Mon Sep 17 00:00:00 2001
> From: Vegard Nossum <vegard.nos...@gmail.com>
> Date: Sat, 27 Jun 2009 14:32:19 +0200
> Subject: [PATCH] build: put runtime classes in the right directory
>
> Signed-off-by: Vegard Nossum <vegard.nos...@gmail.com>
> ---
> Makefile | 12 ++++++++----
> regression/run-suite.sh | 2 +-
> 2 files changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index e1fbf49..b74bc87 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -203,10 +203,6 @@ test: $(JAMVM_ARCH_H) monoburg
> make -C test/arch-$(ARCH)/ ARCH=$(ARCH) ARCH_POSTFIX=$(ARCH_POSTFIX)
> $(TEST)
> .PHONY: test
>
> -%.class: %.java
> - $(E) " JAVAC " $@
> - $(Q) $(JAVAC) -cp $(GLIBJ):regression $(JAVAC_OPTS) -d regression $<
> -
> REGRESSION_TEST_SUITE_CLASSES = \
> regression/jato/internal/VM.class \
> regression/jvm/TestCase.class \
> @@ -233,11 +229,19 @@ REGRESSION_TEST_SUITE_CLASSES = \
> regression/jvm/ObjectStackTest.class \
> regression/jvm/PrintTest.class
>
> +$(REGRESSION_TEST_SUITE_CLASSES): %.class: %.java
> + $(E) " JAVAC " $@
> + $(Q) $(JAVAC) -cp $(GLIBJ):regression $(JAVAC_OPTS) -d regression $<
> +
> RUNTIME_CLASSES = \
> runtime/classpath/gnu/classpath/VMStackWalker.class \
> runtime/classpath/gnu/classpath/VMSystemProperties.class \
> runtime/classpath/java/lang/VMSystem.class
>
> +$(RUNTIME_CLASSES): %.class: %.java
> + $(E) " JAVAC " $@
> + $(Q) $(JAVAC) -cp $(GLIBJ) $(JAVAC_OPTS) -d runtime/classpath $<
> +
> lib: $(CLASSPATH_CONFIG)
> make -C lib/ JAVAC=$(JAVAC) GLIBJ=$(GLIBJ)
> .PHONY: lib
> diff --git a/regression/run-suite.sh b/regression/run-suite.sh
> index ee06b9a..bc89fc4 100755
> --- a/regression/run-suite.sh
> +++ b/regression/run-suite.sh
> @@ -10,7 +10,7 @@ function run_java {
> CLASSPATH_INSTALL_DIR=`../tools/classpath-config`
> GLIBJ="$CLASSPATH_INSTALL_DIR/share/classpath/glibj.zip"
>
> - $GDB ../jato $JAVA_OPTS -cp $PWD:$GLIBJ $JAVA_CLASS
> + $GDB ../jato $JAVA_OPTS -cp $PWD:$GLIBJ:../runtime/classpath $JAVA_CLASS
This hunk is wrong. We need to put the runtime/ entry at the beginning
to make sure it's searched before $GLIBJ (if we want to override a VM*
class).
V
------------------------------------------------------------------------------
_______________________________________________
Jatovm-devel mailing list
Jatovm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jatovm-devel
