This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: Patch: FYI: nightly comparisons of GUI branch

Hi,

On Wed, 2004-07-28 at 20:41, Mark Wielaard wrote:
> It might be a good idea to only list the diff of the non-gui classes on
> the first page and only the gui classes on the second.
> 
> As far as I know everything outside [gnu/]java/awt, [gnu/]java.awt and
> [native/]jni/gtk-peer on the gui branch is only synced once a month by
> Graydon. So only the gui diffs really matter for gui-compare. And I
> found it a bit confusing to see the huge list of diffs that were by
> design on the branch.
> 
> If you agree I can make a patch for that.

On irc you said you liked the idea so here is a patch that adds a -gui
flag to the script that does the above.

Could you try it out and see if you like it?

Thanks,

Mark

Index: bin/gen-classpath-compare
===================================================================
RCS file: /cvs/gcc/wwwdocs/bin/gen-classpath-compare,v
retrieving revision 1.12
diff -u -r1.12 gen-classpath-compare
--- bin/gen-classpath-compare	16 May 2004 22:10:07 -0000	1.12
+++ bin/gen-classpath-compare	30 Jul 2004 13:05:40 -0000
@@ -9,6 +9,15 @@
    cvsrm=:
 fi
 
+if test "$1" = "-gui"; then
+   gui=yes
+   GUI="GUI Classes only"
+   shift
+else
+   gui=no
+   GUI="None GUI Classes"
+fi
+
 LIBGCJ=$1
 CLASSPATH=$2
 shift
@@ -23,7 +32,7 @@
 EXPECTEDDIR="$OUTPUT/expected"
 
 if test -z "$LIBGCJ" || test -z "$CLASSPATH" || test -z "$OUTPUT"; then
-   echo "usage: gen-classpath-compare [-cvs] libgcj-path classpath-path [output-path]" 1>&2
+   echo "usage: gen-classpath-compare [-cvs] [-gui] libgcj-path classpath-path [output-path]" 1>&2
    exit 1
 fi
 
@@ -35,15 +44,11 @@
 
 rm -f $OUTPUT/compare/*.diff
 
-cat > $outfile << 'END'
-<html>
-<head>
-<title>libgcj -vs- Classpath</title>
-<link rel="stylesheet" type="text/css" href="http://gcc.gnu.org/gcc.css";></link>
-</head>
-<body>
-<h1>libgcj -vs- Classpath</h1>
+echo "<html> <head> <title>libgcj -vs- Classpath ($GUI)</title>" > $outfile
+echo '<link rel="stylesheet" type="text/css" href="http://gcc.gnu.org/gcc.css";></link>' >> $outfile
+echo "</head> <body> <h1>libgcj -vs- Classpath ($GUI)</h1>" >> $outfile
 
+cat >> $outfile << 'END'
 <p>This page compares the "current" cvs libgcj against the "current"
 cvs Classpath.  It was generated using the <code>gen-classpath-compare</code>
 script (available in gcc cvs repository in <code>wwwdocs/bin/</code>) on
@@ -51,6 +56,12 @@
 
 date "+%Y-%m-%d." >> $outfile
 
+if test "$gui" = "yes"; then
+  echo "<p>Only lists gui files (AWT Swing and gtk-peer)</p>" >> $outfile
+else
+  echo "<p>Only lists non-gui files (NO AWT Swing and gtk-peer)</p>" >> $outfile
+fi
+
 cat >> $outfile << 'END'
 This table intentionally omits certain classes which are not of
 interest.  If the third column shows a "Diff" link, then that means
@@ -83,13 +94,24 @@
 "
 
 # Note: for now, we omit much of gnu.*, as it differs too much.
+WantedFiles="java|javax|gnu/java|gnu/javax|gnu/regexp|javax"
+DoNotCompare="gnu/java/io/decode|gnu/java/io/encode|gnu/javax/swing/plaf/gtk"
+GuiFiles="java/awt|javax/swing|gnu/java/awt|gnu/javax/swing|jni/gtk-peer"
+if test "$gui" = "no"; then
+  WantedRegexp="^($WantedFiles)/"
+  ExcludedRegExp="^($DoNotCompare|$GuiFiles)/"
+else
+  WantedRegexp="^($GuiFiles)/"
+  ExcludedRegExp="^($DoNotCompare)/"
+fi
+
 (cd $LIBGCJ; find . -name '*.java' -print;
 cd $CLASSPATH; find . -name '*.java' -print;
 cd $CLASSPATH/external/jaxp/source; find . -name '*.java' -print
 cd $CLASSPATH/native; find jni/gtk-peer -name '*.c' -print) |
 sort -u | sed -e 's,^\./,,' |
-grep -E '^(java|javax|gnu/java|gnu/javax|gnu/regexp|javax|jni/gtk-peer)/' |
-grep -E -v '^(gnu/java/io/decode|gnu/java/io/encode|gnu/javax/swing/plaf/gtk)' |
+grep -E "$WantedRegexp" |
+grep -E -v "$ExcludedRegExp" |
 (cd $LIBGCJ
 while read f; do
    class=`echo $f | sed -e 's,/,.,g' -e 's,\.java$,,'`

Attachment: signature.asc
Description: This is a digitally signed message part

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]