From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1105 invoked by alias); 16 Apr 2008 17:57:17 -0000 Received: (qmail 963 invoked by uid 367); 16 Apr 2008 17:57:17 -0000 Date: Wed, 16 Apr 2008 17:57:00 -0000 Message-ID: <20080416175717.948.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Delete Config.getAbsRootSrcDir(). X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 09aea1d0cc8533a671774fba910304ee4001b767 X-Git-Newrev: 1e7034c7369e8eba1a69d61ffc3ea32afc23550c Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q2/txt/msg00113.txt.bz2 The branch, master has been updated via 1e7034c7369e8eba1a69d61ffc3ea32afc23550c (commit) from 09aea1d0cc8533a671774fba910304ee4001b767 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 1e7034c7369e8eba1a69d61ffc3ea32afc23550c Author: Andrew Cagney Date: Wed Apr 16 13:55:38 2008 -0400 Delete Config.getAbsRootSrcDir(). frysk-core/frysk/bindir/ChangeLog 2008-04-16 Andrew Cagney * TestFstack.java (getCanonicalRootSrcDir()): Replace getCanonicalAbsRootSrcDir. frysk-core/frysk/hpd/ChangeLog 2008-04-16 Andrew Cagney * TestFhpdStepping.java: Use Config.getPkgLibSrcDir(). frysk-sys/frysk/config/ChangeLog 2008-04-16 Andrew Cagney * Config.java (getAbsRootSrcDir()): Delete. * cni/Config.cxx-in: Update. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/bindir/ChangeLog | 5 +++++ frysk-core/frysk/bindir/TestFstack.java | 8 ++++---- frysk-core/frysk/hpd/ChangeLog | 4 ++++ frysk-core/frysk/hpd/TestFhpdStepping.java | 2 +- frysk-sys/frysk/config/ChangeLog | 3 +++ frysk-sys/frysk/config/Config.java | 10 ---------- frysk-sys/frysk/config/cni/Config.cxx-in | 6 ------ 7 files changed, 17 insertions(+), 21 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/bindir/ChangeLog b/frysk-core/frysk/bindir/ChangeLog index 984c1e8..f0001b5 100644 --- a/frysk-core/frysk/bindir/ChangeLog +++ b/frysk-core/frysk/bindir/ChangeLog @@ -1,3 +1,8 @@ +2008-04-16 Andrew Cagney + + * TestFstack.java (getCanonicalRootSrcDir()): Replace + getCanonicalAbsRootSrcDir. + 2008-04-10 Mark Wielaard * ferror.java (options): Use correct Options constructor. diff --git a/frysk-core/frysk/bindir/TestFstack.java b/frysk-core/frysk/bindir/TestFstack.java index 398a065..ba02684 100644 --- a/frysk-core/frysk/bindir/TestFstack.java +++ b/frysk-core/frysk/bindir/TestFstack.java @@ -72,11 +72,11 @@ public class TestFstack extends TestLib { return new TearDownExpect(argv); } - private String getCanonicalAbsRootSrcDir () { + private String getCanonicalRootSrcDir () { try { - return new File(Config.getAbsRootSrcDir()).getCanonicalPath(); + return new File(Config.getRootSrcDir()).getCanonicalPath(); } catch (IOException e) { - return Config.getAbsRootSrcDir(); + return Config.getRootSrcDir(); } } @@ -98,7 +98,7 @@ public class TestFstack extends TestLib { TearDownExpect e = fstack("funit-stack-outlined", new String[] { "-rich", "-print", "full-path" }); - e.expect (getCanonicalAbsRootSrcDir() + e.expect (getCanonicalRootSrcDir() + ".*" + "funit-stack-outlined" + ".c#"); diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog index aaa86d9..b2e9439 100644 --- a/frysk-core/frysk/hpd/ChangeLog +++ b/frysk-core/frysk/hpd/ChangeLog @@ -1,3 +1,7 @@ +2008-04-16 Andrew Cagney + + * TestFhpdStepping.java: Use Config.getPkgLibSrcDir(). + 2008-04-15 Teresa Thomas * WatchCommand.java: New. diff --git a/frysk-core/frysk/hpd/TestFhpdStepping.java b/frysk-core/frysk/hpd/TestFhpdStepping.java index 063116b..d72da08 100644 --- a/frysk-core/frysk/hpd/TestFhpdStepping.java +++ b/frysk-core/frysk/hpd/TestFhpdStepping.java @@ -55,7 +55,7 @@ public class TestFhpdStepping extends TestLib { e = new HpdTestbed(); - String source = Config.getAbsRootSrcDir() + "frysk-core/frysk/pkglibdir/funit-stepping-asm.S"; + String source = Config.getPkgLibSrcDir() + "funit-stepping-asm.S"; this.scanner = new TestfileTokenScanner(new File(source)); int startLine = this.scanner.findTokenLine("_instructionStep_"); diff --git a/frysk-sys/frysk/config/ChangeLog b/frysk-sys/frysk/config/ChangeLog index 60d246e..6d64da8 100644 --- a/frysk-sys/frysk/config/ChangeLog +++ b/frysk-sys/frysk/config/ChangeLog @@ -1,5 +1,8 @@ 2008-04-16 Andrew Cagney + * Config.java (getAbsRootSrcDir()): Delete. + * cni/Config.cxx-in: Update. + * jni/Config.cxx: Delete. 2008-04-15 Andrew Cagney diff --git a/frysk-sys/frysk/config/Config.java b/frysk-sys/frysk/config/Config.java index ab1cf44..a8d75a7 100644 --- a/frysk-sys/frysk/config/Config.java +++ b/frysk-sys/frysk/config/Config.java @@ -153,14 +153,4 @@ public class Config { public static final String getPkgLibSrcDir (){ return getRootSrcDir() + "frysk-core/frysk/pkglibdir/"; } - - /** - * The absolute source root directory against which the build was - * created; this is an install time option since, with debug-info - * installed, these source files exist. - * - * Note that this is the root directory, and excludes any suffix - * such as frysk-imports et.al. - */ - public static final native String getAbsRootSrcDir (); } diff --git a/frysk-sys/frysk/config/cni/Config.cxx-in b/frysk-sys/frysk/config/cni/Config.cxx-in index c3d8787..810a350 100644 --- a/frysk-sys/frysk/config/cni/Config.cxx-in +++ b/frysk-sys/frysk/config/cni/Config.cxx-in @@ -55,9 +55,3 @@ frysk::config::Config::getRootSrcDir () { return JvNewStringUTF ("@root_srcdir@"); } - -jstring -frysk::config::Config::getAbsRootSrcDir () -{ - return JvNewStringUTF ("@abs_root_srcdir@"); -} hooks/post-receive -- frysk system monitor/debugger