From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20319 invoked by alias); 16 Apr 2008 20:42:25 -0000 Received: (qmail 20289 invoked by uid 367); 16 Apr 2008 20:42:25 -0000 Date: Wed, 16 Apr 2008 20:42:00 -0000 Message-ID: <20080416204225.20274.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Add Prefix.sourceFile(String) method. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 9a8618e3357adf851b5e4d3b1042723c6c932235 X-Git-Newrev: 0732bb7177854c12cfc978bb720cca7ea1838924 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/msg00116.txt.bz2 The branch, master has been updated via 0732bb7177854c12cfc978bb720cca7ea1838924 (commit) via e32f2fe81183512efc5ef3c5ba921af119fe2a11 (commit) from 9a8618e3357adf851b5e4d3b1042723c6c932235 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 0732bb7177854c12cfc978bb720cca7ea1838924 Merge: e32f2fe81183512efc5ef3c5ba921af119fe2a11 9a8618e3357adf851b5e4d3b1042723c6c932235 Author: Andrew Cagney Date: Wed Apr 16 16:41:26 2008 -0400 Add Prefix.sourceFile(String) method. commit e32f2fe81183512efc5ef3c5ba921af119fe2a11 Author: Andrew Cagney Date: Wed Apr 16 14:50:04 2008 -0400 Add Prefix.sourceFile(String). frysk-sys/frysk/config/ChangeLog 2008-04-16 Andrew Cagney * jni/PrefixFactory.cxx-in (Java_frysk_config_PrefixFactory_sourceDir): New. * cni/PrefixFactory.cxx-in (PrefixFactory::sourceDir): New. * TestPrefix.java (testSourceFile()): New. * PrefixFactory.java (sourceDir()): New. (buildPrefix, installPrefix): Use. * Prefix.java (sourceFile(String)): New. ----------------------------------------------------------------------- Summary of changes: frysk-sys/frysk/config/ChangeLog | 7 +++++++ frysk-sys/frysk/config/Prefix.java | 14 +++++++++++++- frysk-sys/frysk/config/PrefixFactory.java | 7 +++++-- frysk-sys/frysk/config/TestPrefix.java | 6 ++++++ frysk-sys/frysk/config/cni/PrefixFactory.cxx-in | 6 ++++++ frysk-sys/frysk/config/jni/PrefixFactory.cxx-in | 6 ++++++ 6 files changed, 43 insertions(+), 3 deletions(-) First 500 lines of diff: diff --git a/frysk-sys/frysk/config/ChangeLog b/frysk-sys/frysk/config/ChangeLog index 6d64da8..f266bef 100644 --- a/frysk-sys/frysk/config/ChangeLog +++ b/frysk-sys/frysk/config/ChangeLog @@ -1,5 +1,12 @@ 2008-04-16 Andrew Cagney + * jni/PrefixFactory.cxx-in (Java_frysk_config_PrefixFactory_sourceDir): New. + * cni/PrefixFactory.cxx-in (PrefixFactory::sourceDir): New. + * TestPrefix.java (testSourceFile()): New. + * PrefixFactory.java (sourceDir()): New. + (buildPrefix, installPrefix): Use. + * Prefix.java (sourceFile(String)): New. + * Config.java (getAbsRootSrcDir()): Delete. * cni/Config.cxx-in: Update. diff --git a/frysk-sys/frysk/config/Prefix.java b/frysk-sys/frysk/config/Prefix.java index e87c15d..dc7b03b 100644 --- a/frysk-sys/frysk/config/Prefix.java +++ b/frysk-sys/frysk/config/Prefix.java @@ -171,6 +171,16 @@ public class Prefix { } private final File pkgLib64Dir; + /** + * A file within frysk's source tree. + * + * This is used by testing when constructing and comparing paths + * to source files. + */ + public static final File sourceFile(String file) { + return getFile(current.sourceDir, file); + } + private final File sourceDir; /** * Construct a Prefix. @@ -179,7 +189,8 @@ public class Prefix { */ Prefix(String gladeDir, File helpDir, String imagesDir, File binDir, File pkgDataDir, File pkgLibDir, - File pkgLib32Dir, File pkgLib64Dir) { + File pkgLib32Dir, File pkgLib64Dir, + File sourceDir) { this.gladeDir = gladeDir; this.helpDir = helpDir; this.imagesDir = imagesDir; @@ -188,5 +199,6 @@ public class Prefix { this.pkgLibDir = pkgLibDir; this.pkgLib32Dir = pkgLib32Dir; this.pkgLib64Dir = pkgLib64Dir; + this.sourceDir = sourceDir; } } diff --git a/frysk-sys/frysk/config/PrefixFactory.java b/frysk-sys/frysk/config/PrefixFactory.java index c6fa6a3..9adccf2 100644 --- a/frysk-sys/frysk/config/PrefixFactory.java +++ b/frysk-sys/frysk/config/PrefixFactory.java @@ -57,6 +57,7 @@ public class PrefixFactory { private static native String pkgDataDir(); private static native String pkgLibDir(); private static native String pkgLib32Dir(); + private static native String sourceDir(); /** * Create an install Prefix; need to specify the location of the @@ -65,7 +66,8 @@ public class PrefixFactory { private static Prefix installPrefix(File lib, File lib32, File lib64) { return new Prefix(gladeDir(), new File(helpDir()), imagesDir(), new File(binDir()), new File(pkgDataDir()), - lib, lib32, lib64); + lib, lib32, lib64, + new File(sourceDir())); } /** @@ -118,7 +120,8 @@ public class PrefixFactory { absSrcDir.concat("/frysk/gui/imagesdir"), new File(absBuildDir, "/frysk/bindir/"), new File(absBuildDir, "/frysk/pkgdatadir/"), - lib, lib32, lib64); + lib, lib32, lib64, + new File(absSrcDir).getParentFile()); } /** diff --git a/frysk-sys/frysk/config/TestPrefix.java b/frysk-sys/frysk/config/TestPrefix.java index 9e22ab0..fa7f5d6 100644 --- a/frysk-sys/frysk/config/TestPrefix.java +++ b/frysk-sys/frysk/config/TestPrefix.java @@ -39,6 +39,7 @@ package frysk.config; +import java.io.File; import frysk.junit.TestCase; /** @@ -198,4 +199,9 @@ public class TestPrefix extends TestCase { } } + public void testSourceFile() { + File me = Prefix.sourceFile("frysk-sys/frysk/config/TestPrefix.java"); + assertTrue("this source file exists", me.exists()); + } + } diff --git a/frysk-sys/frysk/config/cni/PrefixFactory.cxx-in b/frysk-sys/frysk/config/cni/PrefixFactory.cxx-in index 03c4964..4aab9e5 100644 --- a/frysk-sys/frysk/config/cni/PrefixFactory.cxx-in +++ b/frysk-sys/frysk/config/cni/PrefixFactory.cxx-in @@ -79,3 +79,9 @@ jstring frysk::config::PrefixFactory::pkgLib32Dir() { return JvNewStringUTF("@pkglib32dir@"); } + +jstring +frysk::config::PrefixFactory::sourceDir() { + // An educated guess. + return JvNewStringUTF("/usr/src/debug/frysk-@VERSION@"); +} diff --git a/frysk-sys/frysk/config/jni/PrefixFactory.cxx-in b/frysk-sys/frysk/config/jni/PrefixFactory.cxx-in index 81a0c2d..1c113ef 100644 --- a/frysk-sys/frysk/config/jni/PrefixFactory.cxx-in +++ b/frysk-sys/frysk/config/jni/PrefixFactory.cxx-in @@ -75,3 +75,9 @@ JNIEXPORT jstring JNICALL Java_frysk_config_PrefixFactory_pkgLib32Dir(JNIEnv *env, jclass) { return env->NewStringUTF("@pkglib32dir@"); } + +jstring +Java_frysk_config_PrefixFactory_sourceDir(JNIEnv *env, jclass) { + // An educated guess. + return env->NewStringUTF("@prefix@/src/debug/frysk-@VERSION@"); +} hooks/post-receive -- frysk system monitor/debugger