|
From: <ans...@us...> - 2006-12-15 16:55:42
|
Revision: 2932
http://jnode.svn.sourceforge.net/jnode/?rev=2932&view=rev
Author: ansari82
Date: 2006-12-15 08:55:41 -0800 (Fri, 15 Dec 2006)
Log Message:
-----------
Added to benchmarks in core/lib (JScience and SciMark 2), which get
loaded as part of the tests grub entry. Also amended necessary xml
files.
Notes
-----
Strangle, this has made the build much more stable. Could others check
and verify this?
Modified Paths:
--------------
branches/jikesRVM/all/build.xml
branches/jikesRVM/all/conf/tests-plugin-list.xml
branches/jikesRVM/build.sh
Added Paths:
-----------
branches/jikesRVM/core/descriptors/benchmarks.xml
branches/jikesRVM/core/lib/jscience.jar
branches/jikesRVM/core/lib/scimark2.jar
Modified: branches/jikesRVM/all/build.xml
===================================================================
--- branches/jikesRVM/all/build.xml 2006-12-15 01:51:58 UTC (rev 2931)
+++ branches/jikesRVM/all/build.xml 2006-12-15 16:55:41 UTC (rev 2932)
@@ -22,6 +22,8 @@
<property name="jnode-builder.jar" value="${build.dir}/descriptors/jnode-builder.jar"/>
<property name="jnode-core.jar" value="${root.dir}/core/build/classes"/>
+ <property name="jscience.jar" value="${root.dir}/core/lib"/>
+ <property name="scimark2.jar" value="${root.dir}/core/lib"/>
<property name="jnode-distr.jar" value="${root.dir}/distr/build/classes"/>
<property name="jnode-fs.jar" value="${root.dir}/fs/build/classes"/>
<property name="jnode-gui.jar" value="${root.dir}/gui/build/classes"/>
@@ -208,6 +210,8 @@
<libalias name="edtftpj.jar" alias="${edtftpj.jar}"/>
<libalias name="jcifs.jar" alias="${jcifs.jar}"/>
<libalias name="ejc.jar" alias="${ejc.jar}"/>
+ <libalias name="jscience.jar" alias="${jscience.jar}"/>
+ <libalias name="scimark2.jar" alias="${scimark2.jar}"/>
<descriptors dir="${descriptors.dir}/">
<include name="*.xml"/>
Modified: branches/jikesRVM/all/conf/tests-plugin-list.xml
===================================================================
--- branches/jikesRVM/all/conf/tests-plugin-list.xml 2006-12-15 01:51:58 UTC (rev 2931)
+++ branches/jikesRVM/all/conf/tests-plugin-list.xml 2006-12-15 16:55:41 UTC (rev 2932)
@@ -12,6 +12,7 @@
<plugin id="gnu.mauve.core"/>
<plugin id="gnu.mauve.java.util"/>
<plugin id="gnu.mauve.java.lang"/>
+ <plugin id="benchmark"/>
<plugin id="org.objectweb.asm"/>
<plugin id="net.sf.cglib"/>
@@ -28,4 +29,4 @@
<plugin id="jfunc"/>
<plugin id="org.jnode.testrunner"/>
-</plugin-list>
\ No newline at end of file
+</plugin-list>
Modified: branches/jikesRVM/build.sh
===================================================================
--- branches/jikesRVM/build.sh 2006-12-15 01:51:58 UTC (rev 2931)
+++ branches/jikesRVM/build.sh 2006-12-15 16:55:41 UTC (rev 2932)
@@ -1,6 +1,6 @@
#!/bin/sh
dir=`dirname $0`
-java -Xmx712M -Xms128M -jar $dir/core/lib/ant-launcher.jar -lib $JAVA_HOME/lib -lib $dir/core/lib -f $dir/all/build.xml $*
+java -Xmx1024M -Xms512M -jar $dir/core/lib/ant-launcher.jar -lib $JAVA_HOME/lib -lib $dir/core/lib -f $dir/all/build.xml $*
Added: branches/jikesRVM/core/descriptors/benchmarks.xml
===================================================================
--- branches/jikesRVM/core/descriptors/benchmarks.xml (rev 0)
+++ branches/jikesRVM/core/descriptors/benchmarks.xml 2006-12-15 16:55:41 UTC (rev 2932)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plugin SYSTEM "jnode.dtd">
+
+<plugin id="benchmark"
+ name="Benchmark classes"
+ version="0.0"
+ license-name="Different"
+ provider-name="Different">
+
+ <extension point="org.jnode.shell.aliases">
+ <alias name="BenchJScience" class="org.jscience.JScience"/>
+ <alias name="BenchScimark" class="jnt.scimark2.commandline"/>
+ </extension>
+
+
+ <runtime>
+ <library name="jscience.jar">
+ <export name="*"/>
+ </library>
+
+ <library name="scimark2.jar">
+ <export name="*"/>
+ </library>
+
+ <!-- -->
+
+ </runtime>
+
+</plugin>
\ No newline at end of file
Added: branches/jikesRVM/core/lib/jscience.jar
===================================================================
(Binary files differ)
Property changes on: branches/jikesRVM/core/lib/jscience.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/jikesRVM/core/lib/scimark2.jar
===================================================================
(Binary files differ)
Property changes on: branches/jikesRVM/core/lib/scimark2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|