public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
* [SCM]  master: Provide the raw-relative source-path; needed by breakpoint tests.
@ 2008-04-16 22:07 cagney
  0 siblings, 0 replies; only message in thread
From: cagney @ 2008-04-16 22:07 UTC (permalink / raw)
  To: frysk-cvs

The branch, master has been updated
       via  85a1a3630fbe5c7ce5f5f2dfd9d1b01f6d32f2cb (commit)
      from  c58b27108ca9776298924a66c79104008456dab7 (commit)

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

- Log -----------------------------------------------------------------
commit 85a1a3630fbe5c7ce5f5f2dfd9d1b01f6d32f2cb
Author: Andrew Cagney <cagney@redhat.com>
Date:   Wed Apr 16 18:03:45 2008 -0400

    Provide the raw-relative source-path; needed by breakpoint tests.
    
    frysk-common/ChangeLog
    2008-04-16  Andrew Cagney  <cagney@redhat.com>
    
    	* TestRunner.java-in: Change @abs_srcdir@ to @root_srcdir@; needed
    	by source code tests.
    
    frysk-gui/frysk/gui/ChangeLog
    2008-04-16  Andrew Cagney  <cagney@redhat.com>
    
    	* FryskGui.java-in: Use @root_srcdir@; for tests that need the
    	relative path.
    
    frysk-sys/frysk/config/ChangeLog
    2008-04-16  Andrew Cagney  <cagney@redhat.com>
    
    	* PrefixFactory.java: Replace absSrcDir, with rootSrcDir.

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

Summary of changes:
 frysk-common/ChangeLog                    |    3 +++
 frysk-common/TestRunner.java-in           |   14 ++++++--------
 frysk-gui/frysk/gui/ChangeLog             |    5 +++++
 frysk-gui/frysk/gui/FryskGui.java-in      |    4 ++--
 frysk-sys/frysk/config/ChangeLog          |    2 ++
 frysk-sys/frysk/config/PrefixFactory.java |   25 ++++++++++++++-----------
 6 files changed, 32 insertions(+), 21 deletions(-)

First 500 lines of diff:
diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog
index e55a11c..a83c126 100644
--- a/frysk-common/ChangeLog
+++ b/frysk-common/ChangeLog
@@ -1,5 +1,8 @@
 2008-04-16  Andrew Cagney  <cagney@redhat.com>
 
+	* TestRunner.java-in: Change @abs_srcdir@ to @root_srcdir@; needed
+	by source code tests.
+
 	* Makefile.gen.sh (generate_jni_header): Write output to a tmp
 	file first.
 
diff --git a/frysk-common/TestRunner.java-in b/frysk-common/TestRunner.java-in
index cde02bf..b3f9eeb 100755
--- a/frysk-common/TestRunner.java-in
+++ b/frysk-common/TestRunner.java-in
@@ -48,16 +48,14 @@ import frysk.config.PrefixFactory;
  * Run the JUnit tests from within the build tree.
  */
 
-public class TestRunner
-{
-    public static void main (String[] args)
-    {
+public class TestRunner {
+    public static void main (String[] args) {
 	String ABS_BUILDDIR = "@abs_builddir@";
-	String ABS_SRCDIR = "@abs_srcdir@";
+	String ROOT_SRCDIR = "@root_srcdir@";
 
-	Prefix configAll = PrefixFactory.createBuildPrefix(ABS_SRCDIR, ABS_BUILDDIR);
-	Prefix config32 = PrefixFactory.createBuildPrefix32(ABS_SRCDIR, ABS_BUILDDIR);
-	Prefix config64 = PrefixFactory.createBuildPrefix64(ABS_SRCDIR, ABS_BUILDDIR);
+	Prefix configAll = PrefixFactory.createBuildPrefix(ROOT_SRCDIR, ABS_BUILDDIR);
+	Prefix config32 = PrefixFactory.createBuildPrefix32(ROOT_SRCDIR, ABS_BUILDDIR);
+	Prefix config64 = PrefixFactory.createBuildPrefix64(ROOT_SRCDIR, ABS_BUILDDIR);
 
 	Runner testRunner = new Runner("TestRunner", args,
 				       configAll, config32, config64);
diff --git a/frysk-gui/frysk/gui/ChangeLog b/frysk-gui/frysk/gui/ChangeLog
index 696c4c4..bf2338e 100644
--- a/frysk-gui/frysk/gui/ChangeLog
+++ b/frysk-gui/frysk/gui/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-16  Andrew Cagney  <cagney@redhat.com>
+
+	* FryskGui.java-in: Use @root_srcdir@; for tests that need the
+	relative path.
+
 2008-04-14  Andrew Cagney  <cagney@redhat.com>
 
 	* test/GuiTestCase.java: Move getFryskTestDir() to here.
diff --git a/frysk-gui/frysk/gui/FryskGui.java-in b/frysk-gui/frysk/gui/FryskGui.java-in
index 5eca8b5..61ccea8 100644
--- a/frysk-gui/frysk/gui/FryskGui.java-in
+++ b/frysk-gui/frysk/gui/FryskGui.java-in
@@ -50,9 +50,9 @@ import frysk.config.PrefixFactory;
  */
 public class FryskGui {
     public static void main (String[] args) {
-	final String ABS_SRCDIR = "@abs_srcdir@";
+	final String ROOT_SRCDIR = "@root_srcdir@";
 	final String ABS_BUILDDIR = "@abs_builddir@";
-	Prefix.set(PrefixFactory.createBuildPrefix(ABS_SRCDIR, ABS_BUILDDIR));
+	Prefix.set(PrefixFactory.createBuildPrefix(ROOT_SRCDIR, ABS_BUILDDIR));
 	Gui.gui(args);
     }
 }
diff --git a/frysk-sys/frysk/config/ChangeLog b/frysk-sys/frysk/config/ChangeLog
index f266bef..c23ae37 100644
--- a/frysk-sys/frysk/config/ChangeLog
+++ b/frysk-sys/frysk/config/ChangeLog
@@ -1,5 +1,7 @@
 2008-04-16  Andrew Cagney  <cagney@redhat.com>
 
+	* PrefixFactory.java: Replace absSrcDir, with rootSrcDir.
+	
 	* jni/PrefixFactory.cxx-in (Java_frysk_config_PrefixFactory_sourceDir): New.
 	* cni/PrefixFactory.cxx-in (PrefixFactory::sourceDir): New.
 	* TestPrefix.java (testSourceFile()): New.
diff --git a/frysk-sys/frysk/config/PrefixFactory.java b/frysk-sys/frysk/config/PrefixFactory.java
index 9adccf2..c3e5e85 100644
--- a/frysk-sys/frysk/config/PrefixFactory.java
+++ b/frysk-sys/frysk/config/PrefixFactory.java
@@ -113,27 +113,30 @@ public class PrefixFactory {
     /**
      * Create a build-tree prefix.
      */
-    private static Prefix buildPrefix(String absSrcDir, String absBuildDir,
+    private static Prefix buildPrefix(String rootSrcDir, String absBuildDir,
 				      File lib, File lib32, File lib64) {
-	return new Prefix(absSrcDir.concat("/frysk/gui/gladedir/"),
-			  new File(absSrcDir, "/frysk/gui/helpdir"),
-			  absSrcDir.concat("/frysk/gui/imagesdir"),
+	File rootSrc = new File(rootSrcDir);
+	String absSrcDir = rootSrc.getAbsolutePath();
+	// XXX: Glade needs the "/" at the end.
+	return new Prefix(absSrcDir.concat("/frysk-gui/frysk/gui/gladedir/"),
+			  new File(absSrcDir, "/frysk-gui/frysk/gui/helpdir"),
+			  absSrcDir.concat("/frysk-gui/frysk/gui/imagesdir"),
 			  new File(absBuildDir, "/frysk/bindir/"),
 			  new File(absBuildDir, "/frysk/pkgdatadir/"),
 			  lib, lib32, lib64,
-			  new File(absSrcDir).getParentFile());
+			  rootSrc);
     }
 
     /**
      * Create the "native" build-tree configuration; all possible
      * paths, including 32-on-64 when applicable, are enabled.
      */
-    public static Prefix createBuildPrefix(String absSrcDir,
+    public static Prefix createBuildPrefix(String rootSrcDir,
 					   String absBuildDir) {
 	File libDir = new File(absBuildDir, "/frysk/pkglibdir/");
 	File lib32Dir = new File(absBuildDir, "/frysk/pkglibdir/arch32/");
 	File lib64Dir = null; // 64-on-32 not supported.
-	return buildPrefix(absSrcDir, absBuildDir, libDir,
+	return buildPrefix(rootSrcDir, absBuildDir, libDir,
 			   Host.wordSize() == 32 ? libDir : lib32Dir,
 			   Host.wordSize() == 32 ? lib64Dir : libDir);
     }
@@ -142,11 +145,11 @@ public class PrefixFactory {
      * Create a 32-bit specific build-tree configuration; return NULL
      * if this is not supported by this build.
      */
-    public static Prefix createBuildPrefix32(String absSrcDir,
+    public static Prefix createBuildPrefix32(String rootSrcDir,
 					     String absBuildDir) {
 	File libDir = new File(absBuildDir, "/frysk/pkglibdir/");
 	File lib32Dir = new File(absBuildDir, "/frysk/pkglibdir/arch32/");
-	return buildPrefix(absSrcDir, absBuildDir,
+	return buildPrefix(rootSrcDir, absBuildDir,
 			   // Test against 32-bit libraries.
 			   Host.wordSize() == 32 ? libDir : lib32Dir,
 			   // Disable 32-on-64 testing.
@@ -158,13 +161,13 @@ public class PrefixFactory {
      * Create a 64-bit specific build-tree configuration; return NULL
      * if this is not supported by this build.
      */
-    public static Prefix createBuildPrefix64(String absSrcDir,
+    public static Prefix createBuildPrefix64(String rootSrcDir,
 					     String absBuildDir) {
 	if (Host.wordSize() == 32)
 	    // 64-on-32 not supported.
 	    return null;
 	File libDir = new File(absBuildDir, "/frysk/pkglibdir/");
 	// Disable 32-on-64 testing.
-	return buildPrefix(absSrcDir, absBuildDir, libDir, null, libDir);
+	return buildPrefix(rootSrcDir, absBuildDir, libDir, null, libDir);
     }
 }


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


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

only message in thread, other threads:[~2008-04-16 22:07 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-04-16 22:07 [SCM] master: Provide the raw-relative source-path; needed by breakpoint tests 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).