Index: Japi
===================================================================
RCS file: /cvs/mauve/builder/scripts/Japi,v
retrieving revision 1.2
diff -u -3 -p -u -r1.2 Japi
--- Japi	19 Jun 2006 19:53:33 -0000	1.2
+++ Japi	30 Jan 2008 20:25:32 -0000
@@ -4,7 +4,7 @@
 
 . $(dirname "$0")/Settings
 
-CPDIR=$TOP/classpath/jikes-install
+CPDIR=$TOP/classpath/install
 CPJAR=$CPDIR/share/classpath/glibj.zip
 
 cd $TOP/japitools/japitools
@@ -15,7 +15,7 @@ Status "building japi"
 (
 exec > Log.Std 2>&1
 find . -name '*.class' -print | xargs rm -f
-make BOOT_CLASSPATH=$CPJAR jar
+make BOOT_CLASSPATH=$CPJAR:/usr/share/ant/lib/ant.jar jar
 )
 
 Report "japi build" $? Log.Std
Index: RunJapi
===================================================================
RCS file: /cvs/mauve/builder/scripts/RunJapi,v
retrieving revision 1.2
diff -u -3 -p -u -r1.2 RunJapi
--- RunJapi	19 Jun 2006 19:53:33 -0000	1.2
+++ RunJapi	30 Jan 2008 20:25:32 -0000
@@ -22,7 +22,7 @@ CSS=$TOP/japitools/japitools/design/japi
 # Set up the JVM to run, and the class library to scan.
 # For now we just scan Classpath... FIXME: this should be a
 # parameter of some kind.
-CPDIR=$TOP/classpath/jikes-install
+CPDIR=$TOP/classpath/install
 JAVA=gij
 # JAVA=$CPDIR/bin/jamvm
 export JAVA
@@ -49,7 +49,7 @@ BuildOne()
 
 BuildOne classpath $CPJAR
 BuildOne libgcj $LIBGCJ
-BuildOne classpath-generics $GENERICJAR
+#BuildOne classpath-generics $GENERICJAR
 
 
 cd $JDKINFODIR
@@ -58,24 +58,38 @@ $JAPITOOLS/bin/japicompat -v -h -o jdk14
    -i jdk15.japi.gz \
    jdk14.japi.gz classpath.japi.gz
 $JAPITOOLS/bin/japicompat -v -h -o jdk15-classpath.html \
+   -i openjdk-b12.japi.gz \
    jdk15.japi.gz classpath.japi.gz
-$JAPITOOLS/bin/japicompat -v -h -o jdk14-generics.html \
-   -i jdk15.japi.gz \
-   jdk14.japi.gz classpath-generics.japi.gz
-$JAPITOOLS/bin/japicompat -v -h -o jdk15-generics.html \
-   jdk15.japi.gz classpath-generics.japi.gz
+$JAPITOOLS/bin/japicompat -v -h -o openjdk-classpath.html \
+   openjdk-b12.japi.gz classpath.japi.gz
+$JAPITOOLS/bin/japicompat -v -h -o classpath-openjdk.html \
+   classpath.japi.gz openjdk-b12.japi.gz
+#$JAPITOOLS/bin/japicompat -v -h -o jdk14-generics.html \
+#   -i jdk15.japi.gz \
+#   jdk14.japi.gz classpath-generics.japi.gz
+#$JAPITOOLS/bin/japicompat -v -h -o jdk15-generics.html \
+#   jdk15.japi.gz classpath-generics.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 \
+   -i openjdk-b12.japi.gz \
    jdk15.japi.gz libgcj.japi.gz
+$JAPITOOLS/bin/japicompat -v -h -o openjdk-libgcj.html \
+   openjdk-b12.japi.gz libgcj.japi.gz
+$JAPITOOLS/bin/japicompat -v -h -o libgcj-openjdk.html \
+   libgcj.japi.gz openjdk-b12.japi.gz
 
 # Now publish the result
 cp jdk14-classpath.html $WEB/
 cp jdk15-classpath.html $WEB/
-cp jdk14-generics.html $WEB/
-cp jdk15-generics.html $WEB/
+cp openjdk-classpath.html $WEB/
+cp classpath-openjdk.html $WEB/
+#cp jdk14-generics.html $WEB/
+#cp jdk15-generics.html $WEB/
 cp jdk14-libgcj.html $WEB/
 cp jdk15-libgcj.html $WEB/
+cp openjdk-libgcj.html $WEB/
+cp libgcj-openjdk.html $WEB/
 cp $ONExONE $WEB/
 cp $CSS $WEB/