Hi all,
this patch makes the java2d benchmark and the aicasgraphicsbenchmark run
on installed systems.
We copy the two image files in one common place and are happy ;)
Ok for trunk?
Tested on darwin-ppc and linux-ppc.
Yes, darwin-ppc, I have my ecj running on it:)
Andreas
2007-01-05 Andreas Tobler <[EMAIL PROTECTED]>
* examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java
(AicasGraphicsBenchmark): Load images from ../icons.
* examples/gnu/classpath/examples/java2d/J2dBenchmark.java (init):
Likewise.
* examples/Makefile.am (EXAMPLE_ICONS): Add rule to copy *.gif files
to icons.
* examples/gnu/classpath/examples/awt/aicas.png: Move to ../icons.
Delete here.
* examples/gnu/classpath/examples/awt/palme.gif: Likewise.
* examples/gnu/classpath/examples/java2d/aicas.png: Likewise.
* examples/gnu/classpath/examples/java2d/palme.gif: Likewise.
* examples/gnu/classpath/examples/icons/aicas.png: Moved.
* examples/gnu/classpath/examples/icons/palme.gif: Likewise.
Index: examples/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/examples/Makefile.am,v
retrieving revision 1.19
diff -u -r1.19 Makefile.am
--- examples/Makefile.am 17 Dec 2006 16:30:46 -0000 1.19
+++ examples/Makefile.am 5 Jan 2007 22:12:39 -0000
@@ -35,6 +35,7 @@
# the png icons we use in some of the examples.
EXAMPLE_ICONS = $(srcdir)/gnu/classpath/examples/icons/*.png
+EXAMPLE_ICONS += $(srcdir)/gnu/classpath/examples/icons/*.gif
# the html pages we use in the swing demo example.
EXAMPLE_HTML = $(srcdir)/gnu/classpath/examples/swing/*.html
Index: examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java,v
retrieving revision 1.1
diff -u -r1.1 AicasGraphicsBenchmark.java
--- examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java 14 Jun
2006 14:56:16 -0000 1.1
+++ examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java 5 Jan
2007 22:12:40 -0000
@@ -100,8 +100,8 @@
public AicasGraphicsBenchmark()
{
- pngTestImage = loadImage("aicas.png");
- gifTestImage = loadImage("palme.gif");
+ pngTestImage = loadImage("../icons/aicas.png");
+ gifTestImage = loadImage("../icons/palme.gif");
setLayout(new BorderLayout());
testLabel = new Label();
Index: examples/gnu/classpath/examples/java2d/J2dBenchmark.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/examples/gnu/classpath/examples/java2d/J2dBenchmark.java,v
retrieving revision 1.3
diff -u -r1.3 J2dBenchmark.java
--- examples/gnu/classpath/examples/java2d/J2dBenchmark.java 23 Jun 2006
21:31:15 -0000 1.3
+++ examples/gnu/classpath/examples/java2d/J2dBenchmark.java 5 Jan 2007
22:12:41 -0000
@@ -174,8 +174,8 @@
public String init()
{
boolean loadError = false;
- pngTestImage = loadImage("aicas.png");
- gifTestImage = loadImage("palme.gif");
+ pngTestImage = loadImage("../icons/aicas.png");
+ gifTestImage = loadImage("../icons/palme.gif");
if (texture != null)
{
