Index: RunJapi
===================================================================
RCS file: /cvs/mauve/builder/scripts/RunJapi,v
retrieving revision 1.6
diff -u -r1.6 RunJapi
--- RunJapi	10 Mar 2008 21:06:12 -0000	1.6
+++ RunJapi	20 Apr 2008 19:35:30 -0000
@@ -58,28 +58,36 @@
 $JAPITOOLS/bin/japicompat -v -h -o jdk15-classpath.html \
    jdk15.japi.gz classpath.japi.gz
 $JAPITOOLS/bin/japicompat -v -h -o openjdk-classpath.html \
-   openjdk-b12.japi.gz classpath.japi.gz
+   openjdk.japi.gz classpath.japi.gz
+$JAPITOOLS/bin/japicompat -v -h -o openjdk6-classpath.html \
+   openjdk6.japi.gz classpath.japi.gz
 $JAPITOOLS/bin/japicompat -v -h -o classpath-jdk14.html \
    -i jdk15.japi.gz \
    classpath.japi.gz jdk14.japi.gz
 $JAPITOOLS/bin/japicompat -v -h -o classpath-jdk15.html \
    classpath.japi.gz jdk15.japi.gz
 $JAPITOOLS/bin/japicompat -v -h -o classpath-openjdk.html \
-   classpath.japi.gz openjdk-b12.japi.gz
+   classpath.japi.gz openjdk.japi.gz
+$JAPITOOLS/bin/japicompat -v -h -o classpath-openjdk6.html \
+   classpath.japi.gz openjdk6.japi.gz
 $JAPITOOLS/bin/japicompat -v -h -o jdk14-libgcj.html \
    -i jdk15.japi.gz \
    jdk14.japi.gz libgcj.japi.gz
 $JAPITOOLS/bin/japicompat -v -h -o jdk15-libgcj.html \
    jdk15.japi.gz libgcj.japi.gz
 $JAPITOOLS/bin/japicompat -v -h -o openjdk-libgcj.html \
-   openjdk-b12.japi.gz libgcj.japi.gz
+   openjdk.japi.gz libgcj.japi.gz
+$JAPITOOLS/bin/japicompat -v -h -o openjdk6-libgcj.html \
+   openjdk6.japi.gz libgcj.japi.gz
 $JAPITOOLS/bin/japicompat -v -h -o libgcj-jdk14.html \
    -i jdk15.japi.gz \
    libgcj.japi.gz jdk14.japi.gz
 $JAPITOOLS/bin/japicompat -v -h -o libgcj-jdk15.html \
    libgcj.japi.gz jdk15.japi.gz
 $JAPITOOLS/bin/japicompat -v -h -o libgcj-openjdk.html \
-   libgcj.japi.gz openjdk-b12.japi.gz
+   libgcj.japi.gz openjdk.japi.gz
+$JAPITOOLS/bin/japicompat -v -h -o libgcj-openjdk6.html \
+   libgcj.japi.gz openjdk6.japi.gz
 $JAPITOOLS/bin/japicompat -v -h -o classpath-jikesrvm.html \
    classpath.japi.gz jikesrvm.japi.gz
 
@@ -87,16 +95,19 @@
 cp jdk14-classpath.html $WEB/
 cp jdk15-classpath.html $WEB/
 cp openjdk-classpath.html $WEB/
+cp openjdk6-classpath.html $WEB/
 cp classpath-jdk14.html $WEB/
 cp classpath-jdk15.html $WEB/
 cp classpath-openjdk.html $WEB/
+cp classpath-openjdk6.html $WEB/
 cp jdk14-libgcj.html $WEB/
 cp jdk15-libgcj.html $WEB/
 cp openjdk-libgcj.html $WEB/
+cp openjdk6-libgcj.html $WEB/
 cp libgcj-jdk14.html $WEB/
 cp libgcj-jdk15.html $WEB/
 cp libgcj-openjdk.html $WEB/
+cp libgcj-openjdk6.html $WEB/
 cp $ONExONE $WEB/
 cp $CSS $WEB/
-cp jikesrvm-classpath.html $WEB/
 cp classpath-jikesrvm.html $WEB/