public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
* [SCM]  master: Improve JniRunner and jni header rules.
@ 2008-04-17 13:28 cagney
  0 siblings, 0 replies; only message in thread
From: cagney @ 2008-04-17 13:28 UTC (permalink / raw)
  To: frysk-cvs

The branch, master has been updated
       via  c0103bc000bfecafba3ead998c171382956032d3 (commit)
      from  258e9940b611bcdf6b5c2eb0312ecb9f717e86a6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit c0103bc000bfecafba3ead998c171382956032d3
Author: Andrew Cagney <cagney@redhat.com>
Date:   Thu Apr 17 09:26:54 2008 -0400

    Improve JniRunner and jni header rules.
    
    frysk-common/ChangeLog
    2008-04-17  Andrew Cagney  <cagney@redhat.com>
    
    	* Makefile.gen.sh (generate_jni_header): Remove stray "s.
    
    frysk-sys/ChangeLog
    2008-04-17  Andrew Cagney  <cagney@redhat.com>
    
    	* Makefile.am (JniRunner): Require frysk-sys.jar and
    	frysk-sys-jni.so; hack LD_LIBRARY_PATH to hopefully find
    	libsdtc++.

-----------------------------------------------------------------------

Summary of changes:
 frysk-common/ChangeLog       |    4 ++++
 frysk-common/Makefile.gen.sh |    2 +-
 frysk-sys/ChangeLog          |    6 ++++++
 frysk-sys/Makefile.am        |   14 ++++++++------
 4 files changed, 19 insertions(+), 7 deletions(-)

First 500 lines of diff:
diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog
index a83c126..20e0178 100644
--- a/frysk-common/ChangeLog
+++ b/frysk-common/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-17  Andrew Cagney  <cagney@redhat.com>
+
+	* Makefile.gen.sh (generate_jni_header): Remove stray "s.
+
 2008-04-16  Andrew Cagney  <cagney@redhat.com>
 
 	* TestRunner.java-in: Change @abs_srcdir@ to @root_srcdir@; needed
diff --git a/frysk-common/Makefile.gen.sh b/frysk-common/Makefile.gen.sh
index 2a21b02..0206b89 100755
--- a/frysk-common/Makefile.gen.sh
+++ b/frysk-common/Makefile.gen.sh
@@ -670,7 +670,7 @@ generate_jni_header ()
 	cat <<EOF
 CLEANFILES += ${h}.h
 ${h}.h: $file | ${GEN_DIRNAME}.jar
-	@echo \"$c => ${h}.h\"
+	@echo "$c => ${h}.h"
 	rm -f \$@.tmp
 	\$(GCJH) \$(GCJHFLAGS) \\
 		-jni \\
diff --git a/frysk-sys/ChangeLog b/frysk-sys/ChangeLog
index 95d824e..f9e3ae9 100644
--- a/frysk-sys/ChangeLog
+++ b/frysk-sys/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-17  Andrew Cagney  <cagney@redhat.com>
+
+	* Makefile.am (JniRunner): Require frysk-sys.jar and
+	frysk-sys-jni.so; hack LD_LIBRARY_PATH to hopefully find
+	libsdtc++.
+
 2008-04-15  Andrew Cagney  <cagney@redhat.com>
 
 	* Makefile.am (JniRunner): Escape $@.
diff --git a/frysk-sys/Makefile.am b/frysk-sys/Makefile.am
index 22c00a2..0ce8d3e 100644
--- a/frysk-sys/Makefile.am
+++ b/frysk-sys/Makefile.am
@@ -1,6 +1,6 @@
 # This file is part of the program FRYSK.
 #
-# Copyright 2005, 2007, Red Hat Inc.
+# Copyright 2005, 2007, 2008, Red Hat Inc.
 #
 # FRYSK is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -77,13 +77,15 @@ lib/unwind/Unwind%.java: lib/unwind/Unwind.java
 
 noinst_DATA += JniRunner.jar JniRunner
 CLEANFILES += JniRunner
-JniRunner:
+JniRunner: | frysk-sys.jar libfrysk-sys-jni.so
 	rm -f $@.tmp
 	echo "#!/bin/sh"					>> $@.tmp
-	echo "LD_PRELOAD=$(libdir)/libstdc++.so.6 \\"		>> $@.tmp
-	echo "LD_LIBRARY_PATH=. \\"				>> $@.tmp
-	echo "CLASSPATH=$(CLASSPATH):frysk-sys.jar:JniRunner.jar \\" >> $@.tmp
-	echo "java JniRunner \"\$$@\""				>> $@.tmp
+	echo "export LD_PRELOAD=libstdc++.so.6"			>> $@.tmp
+	echo "# hack to hopefully find the right libstdc++.so"	>> $@.tmp
+	echo "export LD_LIBRARY_PATH=.:/usr/lib64:/usr/lib"	>> $@.tmp
+	echo "export CLASSPATH=\\"				>> $@.tmp
+	echo "$(CLASSPATH):frysk-sys.jar:JniRunner.jar"		>> $@.tmp
+	echo "$(JAVA) JniRunner \"\$$@\""			>> $@.tmp
 	chmod a+x $@.tmp
 	mv $@.tmp $@
 


hooks/post-receive
--
frysk system monitor/debugger


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-04-17 13:28 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-04-17 13:28 [SCM] master: Improve JniRunner and jni header rules cagney

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).