rpms/frysk/F-8 frysk-0.0.1.2008.01.18.rh1-line-npe.patch, NONE, 1.1 frysk-0.0.1.2008.01.18.rh1-no-sysroot.patch, NONE, 1.1
Andrew Cagney (cagney)
fedora-extras-commits at redhat.com
Tue Jan 22 03:04:10 UTC 2008
Author: cagney
Update of /cvs/pkgs/rpms/frysk/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2623
Added Files:
frysk-0.0.1.2008.01.18.rh1-line-npe.patch
frysk-0.0.1.2008.01.18.rh1-no-sysroot.patch
Log Message:
Missing patch files; copied from devel.
frysk-0.0.1.2008.01.18.rh1-line-npe.patch:
--- NEW FILE frysk-0.0.1.2008.01.18.rh1-line-npe.patch ---
--- frysk-0.0.1.2008.01.18.rh1/frysk-gui/frysk/gui/srcwin/SourceWindow.java.line-npe 2008-01-18 11:44:37.000000000 -0500
+++ frysk-0.0.1.2008.01.18.rh1/frysk-gui/frysk/gui/srcwin/SourceWindow.java 2008-01-18 11:56:55.000000000 -0500
@@ -2254,7 +2254,7 @@
DOMSource source = null;
LineXXX line = sf.getLineXXX();
- if (line != SourceLocation.UNKNOWN) {
+ if (sf.getLine() != SourceLocation.UNKNOWN) {
if (line.getDOMFunction() == null)
noDOMFunction = true;
source = line.getDOMSource();
@@ -2267,9 +2267,9 @@
}
}
- if (line == SourceLocation.UNKNOWN)
+ if (sf.getLine() == SourceLocation.UNKNOWN)
setSourceLabel("Unknown File for: ", task_name, proc_id, task_id, noDOMFunction, source);
- else if (source == null && line != SourceLocation.UNKNOWN)
+ else if (source == null && sf.getLine() != SourceLocation.UNKNOWN)
setSourceLabel(sf.getLine().getFile().getPath() + " for: ",
task_name, proc_id, task_id, noDOMFunction, source);
else
@@ -2306,7 +2306,7 @@
updateSourceLabel(selected);
- if (line != SourceLocation.UNKNOWN) {
+ if (selected.getLine() != SourceLocation.UNKNOWN) {
source = line.getDOMSource();
if (source == null)
try {
@@ -2318,7 +2318,7 @@
}
}
- if (line == SourceLocation.UNKNOWN) {
+ if (selected.getLine() == SourceLocation.UNKNOWN) {
SourceBuffer b = null;
if (mode == 2)
--- frysk-0.0.1.2008.01.18.rh1/frysk-core/frysk/rt/LineXXX.java.line-npe 2008-01-18 11:47:02.000000000 -0500
+++ frysk-0.0.1.2008.01.18.rh1/frysk-core/frysk/rt/LineXXX.java 2008-01-18 11:53:01.000000000 -0500
@@ -1,6 +1,6 @@
// This file is part of the program FRYSK.
//
-// Copyright 2007, Red Hat Inc.
+// Copyright 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
@@ -40,7 +40,7 @@
package frysk.rt;
import java.io.IOException;
-
+import java.io.File;
import frysk.dom.DOMFactory;
import frysk.dom.DOMFrysk;
import frysk.dom.DOMFunction;
@@ -49,17 +49,36 @@
import frysk.proc.Proc;
import frysk.scopes.SourceLocation;
-public class LineXXX extends SourceLocation{
-
-
+public class LineXXX {
+ private final SourceLocation sourceLocation;
private final Proc proc;
-
private DOMSource source;
-
private DOMFunction function;
+ private final File file;
+ private final int line;
+ private final int column;
+
+ public File getFile () {
+ return file;
+ }
+
+ public int getLine () {
+ return line;
+ }
+
+ public int getColumn () {
+ return column;
+ }
+
+ public SourceLocation getSourceLocation() {
+ return sourceLocation;
+ }
public LineXXX(SourceLocation sourceLocation, Proc proc) {
- super(sourceLocation.getFile(), sourceLocation.getLine(), sourceLocation.getColumn());
+ this.sourceLocation = sourceLocation;
+ this.file = sourceLocation.getFile();
+ this.line = sourceLocation.getLine();
+ this.column = sourceLocation.getColumn();
this.proc = proc;
}
@@ -88,7 +107,7 @@
// source has not been parsed, go put it in the DOM and
// parse it
try {
- this.source = image.addSource(this.proc, this,
+ this.source = image.addSource(this.proc, this.sourceLocation,
DOMFactory.getDOM(this.proc));
} catch (IOException ioe) {
System.err.println(ioe.getMessage());
--- frysk-0.0.1.2008.01.18.rh1/frysk-core/frysk/debuginfo/DebugInfoFrame.java.line-npe 2008-01-18 11:42:06.000000000 -0500
+++ frysk-0.0.1.2008.01.18.rh1/frysk-core/frysk/debuginfo/DebugInfoFrame.java 2008-01-18 11:43:16.000000000 -0500
@@ -1,6 +1,6 @@
// This file is part of the program FRYSK.
//
-// Copyright 2007, Red Hat Inc.
+// Copyright 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
@@ -208,12 +208,13 @@
* @return
*/
public LineXXX getLineXXX(){
- if(this.lineXXX == null){
+ if (this.getLine() == SourceLocation.UNKNOWN)
+ return null;
+ if (this.lineXXX == null)
this.lineXXX = new LineXXX(this.getLine(), this.getTask().getProc());
- }
return lineXXX;
}
- LineXXX lineXXX;
+ private LineXXX lineXXX;
public void toPrint(PrintWriter writer, boolean printParameters,
boolean fullpath){
frysk-0.0.1.2008.01.18.rh1-no-sysroot.patch:
--- NEW FILE frysk-0.0.1.2008.01.18.rh1-no-sysroot.patch ---
--- frysk-0.0.1.2008.01.18.rh1/frysk-core/Makefile.am.no-sysroot 2008-01-18 06:41:07.000000000 -0500
+++ frysk-0.0.1.2008.01.18.rh1/frysk-core/Makefile.am 2008-01-18 06:42:04.000000000 -0500
@@ -110,28 +110,28 @@
frysk/pkglibdir/funit-symbols-stripped: frysk/pkglibdir/funit-symbols
strip -o $@ frysk/pkglibdir/funit-symbols
-nobase_pkgdata_DATA = frysk/pkgdatadir/test-sysroot/$(abspath frysk/pkglibdir/funit-addresses)
-frysk/pkgdatadir/test-sysroot/$(abspath frysk/pkglibdir/funit-addresses): frysk/pkglibdir/funit-addresses
- mkdir -p $(abspath frysk/pkgdatadir/test-sysroot)/$(abspath frysk/pkglibdir)
- cp -r $< $@
-
-nobase_pkgdata_DATA += frysk/pkgdatadir/test-sysroot/$(abspath $(srcdir)/frysk/pkglibdir/funit-addresses.c)
-frysk/pkgdatadir/test-sysroot/$(abspath $(srcdir)/frysk/pkglibdir/funit-addresses.c): \
-frysk/pkgdatadir/test-sysroot/$(abspath frysk/pkglibdir/funit-addresses)
- mkdir -p $(abspath frysk/pkgdatadir/test-sysroot)/$(abspath $(srcdir)/frysk/pkglibdir)
- cp $(abspath $(srcdir)/frysk/pkglibdir/funit-addresses.c) $@
-
-nobase_pkgdata_DATA += frysk/pkgdatadir/test-sysroot/usr/lib/debug/$(abspath frysk/pkglibdir/funit-addresses.debug)
-frysk/pkgdatadir/test-sysroot/usr/lib/debug/$(abspath frysk/pkglibdir/funit-addresses.debug): frysk/pkgdatadir/test-sysroot/$(abspath frysk/pkglibdir/funit-addresses)
- mkdir -p $(abspath frysk/pkgdatadir/test-sysroot/usr/lib/debug/)/$(abspath frysk/pkglibdir)
- eu-strip --remove-comment -f $@ $<
-
-install-data-hook:
- mv $(datarootdir)/frysk/frysk/pkgdatadir/test-sysroot $(datarootdir)/frysk
- rmdir $(datarootdir)/frysk/frysk/pkgdatadir
- rmdir $(datarootdir)/frysk/frysk
-# we don't want this installed, but noinst_SCRIPTS has no effect
- rm $(libdir)/frysk/gen-type-funit-tests
+# nobase_pkgdata_DATA = frysk/pkgdatadir/test-sysroot/$(abspath frysk/pkglibdir/funit-addresses)
+# frysk/pkgdatadir/test-sysroot/$(abspath frysk/pkglibdir/funit-addresses): frysk/pkglibdir/funit-addresses
+# mkdir -p $(abspath frysk/pkgdatadir/test-sysroot)/$(abspath frysk/pkglibdir)
+# cp -r $< $@
+
+# nobase_pkgdata_DATA += frysk/pkgdatadir/test-sysroot/$(abspath $(srcdir)/frysk/pkglibdir/funit-addresses.c)
+# frysk/pkgdatadir/test-sysroot/$(abspath $(srcdir)/frysk/pkglibdir/funit-addresses.c): \
+# frysk/pkgdatadir/test-sysroot/$(abspath frysk/pkglibdir/funit-addresses)
+# mkdir -p $(abspath frysk/pkgdatadir/test-sysroot)/$(abspath $(srcdir)/frysk/pkglibdir)
+# cp $(abspath $(srcdir)/frysk/pkglibdir/funit-addresses.c) $@
+
+# nobase_pkgdata_DATA += frysk/pkgdatadir/test-sysroot/usr/lib/debug/$(abspath frysk/pkglibdir/funit-addresses.debug)
+# frysk/pkgdatadir/test-sysroot/usr/lib/debug/$(abspath frysk/pkglibdir/funit-addresses.debug): frysk/pkgdatadir/test-sysroot/$(abspath frysk/pkglibdir/funit-addresses)
+# mkdir -p $(abspath frysk/pkgdatadir/test-sysroot/usr/lib/debug/)/$(abspath frysk/pkglibdir)
+# eu-strip --remove-comment -f $@ $<
+
+# install-data-hook:
+# mv $(datarootdir)/frysk/frysk/pkgdatadir/test-sysroot $(datarootdir)/frysk
+# rmdir $(datarootdir)/frysk/frysk/pkgdatadir
+# rmdir $(datarootdir)/frysk/frysk
+# # we don't want this installed, but noinst_SCRIPTS has no effect
+# rm $(libdir)/frysk/gen-type-funit-tests
if DO_ARCH32_TEST
pkglib32_PROGRAMS += frysk/pkglibdir/arch32/funit-symbols-nodebug
More information about the fedora-extras-commits
mailing list