This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Re: Patch: install libgcj.jar as libgcj-VERSION.jar
- From: Anthony Green <green at redhat dot com>
- To: rittle at labs dot mot dot com
- Cc: java-patches at gcc dot gnu dot org
- Date: 12 Apr 2002 08:27:58 -0700
- Subject: Re: Patch: install libgcj.jar as libgcj-VERSION.jar
- References: <200204112101.g3BL11I37195@latour.rsch.comm.mot.com>
On Thu, 2002-04-11 at 14:01, Loren James Rittle wrote:
> Secondly, FYI, this patch was put on the 3.1 branch but not the
> mainline.
Ok - I'm finally checking this into the trunk, with the following
testsuite fix...
2002-04-12 Anthony Green <green@redhat.com>
* lib/libjava.exp: Use libgcj-VERSION.jar, not libgcj.jar.
Index: testsuite/lib/libjava.exp
===================================================================
RCS file: /cvs/gcc/gcc/libjava/testsuite/lib/libjava.exp,v
retrieving revision 1.34
diff -u -p -c -r1.34 libjava.exp
*** testsuite/lib/libjava.exp 27 Mar 2002 16:27:06 -0000 1.34
--- testsuite/lib/libjava.exp 12 Apr 2002 14:23:14 -0000
*************** proc libjava_init { args } {
*** 112,117 ****
--- 112,118 ----
global TOOL_EXECUTABLE
global original_ld_library_path
global env objdir
+ global env gcc_version
if { $libjava_initialized == 1 } { return; }
*************** proc libjava_init { args } {
*** 127,132 ****
--- 128,138 ----
}
}
+ # Determine the version so we can find the libgcj jar file.
+ set text [eval exec "$GCJ_UNDER_TEST --version 2>@ stdout"]
+ regexp -- "gcj \[^ \]+ (\[^ \]+) .*" $text ignore gcc_version
+ verbose "jar file is libgcj-$gcc_version.jar"
+
# The -B is so we find libgcj.spec.
set text [eval exec "$GCJ_UNDER_TEST -B$objdir/../ -v 2>@ stdout"]
regexp -- "Thread model: (\[^\n\]+)\n" $text ignore model
*************** proc libjava_arguments {{mode compile}}
*** 222,227 ****
--- 228,234 ----
global runtests
global env
global tool_root_dir
+ global gcc_version
if [info exists LIBJAVA] {
set libjava $LIBJAVA;
*************** proc libjava_arguments {{mode compile}}
*** 292,300 ****
verbose "LD_LIBRARY_PATH = $env(LD_LIBRARY_PATH)"
# Set the CLASSPATH environment variable
! verbose "CLASSPATH is .:$srcdir/$subdir:$objdir:$objdir/../libgcj.jar"
global env
! set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$objdir/../libgcj.jar"
if {$mode == "link"} {
global wrapper_file wrap_compile_flags;
--- 299,307 ----
verbose "LD_LIBRARY_PATH = $env(LD_LIBRARY_PATH)"
# Set the CLASSPATH environment variable
! verbose "CLASSPATH is .:$srcdir/$subdir:$objdir:$objdir/../libgcj-$gcc_version.jar"
global env
! set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$objdir/../libgcj-$gcc_version.jar"
if {$mode == "link"} {
global wrapper_file wrap_compile_flags;