[SCM] master: Fix eclipse build errors and warnings.

cagney@sourceware.org cagney@sourceware.org
Wed Dec 19 17:04:00 GMT 2007


The branch, master has been updated
       via  d252351b1f01500d9a9c2af70e7ff245d32b9b24 (commit)
      from  181826ffb987ad378756c816b41d23a29fcb571b (commit)

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

- Log -----------------------------------------------------------------
commit d252351b1f01500d9a9c2af70e7ff245d32b9b24
Author: Andrew Cagney <cagney@redhat.com>
Date:   Wed Dec 19 12:03:45 2007 -0500

    Fix eclipse build errors and warnings.
    
    frysk-core/frysk/bindir/ChangeLog
    2007-12-19  cagney  <cagney@redhat.com>
    
    	* fhpd.java: Explicitly import frysk.sys.FileDescriptor.
    
    frysk-top/ChangeLog
    2007-12-19  Andrew Cagney  <cagney@redhat.com>
    
    	* classpath.in: Exclude duplicated ChangeLog only include .java
    	sub-directories.  Add ftk.jar.

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

Summary of changes:
 frysk-core/frysk/bindir/ChangeLog |    4 ++++
 frysk-core/frysk/bindir/fhpd.java |    3 ++-
 frysk-top/ChangeLog               |    3 +++
 frysk-top/classpath.in            |   17 +++++++++--------
 4 files changed, 18 insertions(+), 9 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/bindir/ChangeLog b/frysk-core/frysk/bindir/ChangeLog
index eb12a1d..2193b21 100644
--- a/frysk-core/frysk/bindir/ChangeLog
+++ b/frysk-core/frysk/bindir/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-19  cagney  <cagney@redhat.com>
+
+	* fhpd.java: Explicitly import frysk.sys.FileDescriptor.
+
 2007-12-12  Petr Machata  <pmachata@redhat.com>
 
 	* ftrace.java: Support -i for tracing inside dynamic linker.
diff --git a/frysk-core/frysk/bindir/fhpd.java b/frysk-core/frysk/bindir/fhpd.java
index 4012dd0..277e604 100644
--- a/frysk-core/frysk/bindir/fhpd.java
+++ b/frysk-core/frysk/bindir/fhpd.java
@@ -54,6 +54,7 @@ import frysk.util.CommandlineParser;
 import frysk.util.PtyTerminal;
 import gnu.classpath.tools.getopt.Option;
 import gnu.classpath.tools.getopt.OptionException;
+import frysk.sys.FileDescriptor;
 
 public class fhpd 
 {
@@ -146,7 +147,7 @@ public class fhpd
       reader = new ConsoleReader(new FileInputStream(java.io.FileDescriptor.in),
 				 new PrintWriter(System.out),
 				 null,
-				 new PtyTerminal(frysk.sys.FileDescriptor.in));
+				 new PtyTerminal(FileDescriptor.in));
     }
     catch (IOException ioe) {
       System.out.println("ERROR: Could not create a command line");
diff --git a/frysk-top/ChangeLog b/frysk-top/ChangeLog
index e0f43aa..216d1eb 100644
--- a/frysk-top/ChangeLog
+++ b/frysk-top/ChangeLog
@@ -1,5 +1,8 @@
 2007-12-19  Andrew Cagney  <cagney@redhat.com>
 
+	* classpath.in: Exclude duplicated ChangeLog only include .java
+	sub-directories.  Add ftk.jar.
+
 	* project.in: Add "javabuilder" to <buildSpec>.
 
 2007-12-14  Andrew Cagney  <cagney@redhat.com>
diff --git a/frysk-top/classpath.in b/frysk-top/classpath.in
index 1539220..2a0a16f 100644
--- a/frysk-top/classpath.in
+++ b/frysk-top/classpath.in
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-        <classpathentry kind="src" path="frysk-gui"
-			exclude="configure.in"/>
-        <classpathentry kind="src" path="frysk-gtk"
-			exclude="configure.in"/>
-        <classpathentry kind="src" path="frysk-core"
-			exclude="configure.in"/>
-        <classpathentry kind="src" path="frysk-sys"
-			exclude="configure.in"/>
+        <classpathentry excluding="**/ChangeLog" including="frysk/"
+			kind="src" path="frysk-gui"/>
+        <classpathentry excluding="**/ChangeLog" including="frysk/|org/"
+			kind="src" path="frysk-gtk"/>
+        <classpathentry excluding="**/ChangeLog" including="frysk/"
+			kind="src" path="frysk-core"/>
+        <classpathentry excluding="**/ChangeLog" including="frysk/|lib/|inua/"
+			kind="src" path="frysk-sys"/>
 
         <classpathentry kind="lib" path="@abs_builddir@/frysk-gui/frysk-gui.jar"
 			sourcepath="@abs_builddir@/frysk-gui"/>
         <classpathentry kind="lib" path="@abs_builddir@/frysk-gtk/frysk-gtk.jar"
 			sourcepath="@abs_builddir@/frysk-gtk"/>
+        <classpathentry kind="lib" path="@abs_builddir@/frysk-gtk/ftk.jar"/>
         <classpathentry kind="lib" path="@abs_builddir@/frysk-core/frysk-core.jar"
 			sourcepath="@abs_builddir@/frysk-core"/>
         <classpathentry kind="lib" path="@abs_builddir@/frysk-sys/frysk-sys.jar"


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



More information about the Frysk-cvs mailing list