public inbox for mauve-patches@sourceware.org
 help / color / mirror / Atom feed
* [builder] FYI: Add JikesRVM (disabled)
@ 2008-01-30 20:06 Andrew John Hughes
  0 siblings, 0 replies; only message in thread
From: Andrew John Hughes @ 2008-01-30 20:06 UTC (permalink / raw)
  To: mauve-patches


[-- Attachment #1.1: Type: text/plain, Size: 612 bytes --]

This is the first of three patches to sync the current
state of builder with CVS.  It adds in the script for
JikesRVM.  Building is currently disabled as it always
fails and with our script this means everything fails :(

ChangeLog:

2008-01-30  Andrew John Hughes <gnu_andrew@member.fsf.org>

	* Build: Add JikesRVM (disabled).
	* Jamvm: Also install fake JDK structure
	for JikesRVM.
	* JikesRVM: Added.
	* Update: Add JikesRVM.

-- 
Andrew :-)

Escape the Java Trap with GNU Classpath!
http://www.gnu.org/philosophy/java-trap.html
public class gcj extends Freedom implements Java { ... }

[-- Attachment #1.2: jikesrvm-01.diff --]
[-- Type: text/x-diff, Size: 2604 bytes --]

Index: Build
===================================================================
RCS file: /cvs/mauve/builder/scripts/Build,v
retrieving revision 1.5
diff -u -3 -p -u -r1.5 Build
--- Build	18 Apr 2007 11:53:22 -0000	1.5
+++ Build	30 Jan 2008 20:01:51 -0000
@@ -38,4 +38,8 @@ Ecj
 
 #Kawa
 
+# Disabled for now since it always fails, making Check not run
+# (See Everything)
+# JikesRVM
+
 exit 0
Index: Jamvm
===================================================================
RCS file: /cvs/mauve/builder/scripts/Jamvm,v
retrieving revision 1.4
diff -u -3 -p -u -r1.4 Jamvm
--- Jamvm	18 Apr 2007 11:53:22 -0000	1.4
+++ Jamvm	30 Jan 2008 20:01:51 -0000
@@ -5,7 +5,7 @@
 Status "building jamvm"
 
 cd $TOP/jamvm
-rm -rf build install
+rm -rf build install $TOP/fake_jdk.jamvm
 
 # Note that jamvm's autogen.sh runs configure if NOCONFIGURE isn't defined.
 (cd jamvm
@@ -20,4 +20,10 @@ Report "jamvm build" $? build/Log.Std ||
 mkdir -p $TOP/jamvm/install/lib/security
 cp $TOP/cacerts $TOP/jamvm/install/lib/security
 
+# Add Jamvm JDK
+mkdir -p $TOP/fake_jdk.jamvm/{bin,lib,jre/lib}
+ln -s $TOP/jamvm/install/bin/jamvm $TOP/fake_jdk.jamvm/bin/java 
+ln -s $TOP/classpath/install/share/classpath/tools.zip $TOP/fake_jdk.jamvm/lib/tools.jar
+ln -s $TOP/classpath/install/share/classpath/glibj.zip $TOP/fake_jdk.jamvm/jre/lib/rt.jar
+
 exit 0
Index: JikesRVM
===================================================================
RCS file: JikesRVM
diff -N JikesRVM
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ JikesRVM	30 Jan 2008 20:01:51 -0000
@@ -0,0 +1,18 @@
+#! /bin/sh
+
+. $(dirname "$0")/Settings
+
+Status "building JikesRVM"
+
+cd $TOP/jikesrvm
+mkdir build
+cd jikesrvm
+(
+exec > $TOP/jikesrvm/build/Log.Std 2>&1
+ant real-clean &&
+JAVA_HOME=$TOP/fake_jdk.jamvm ANT_OPTS="-Xmx384M" ant \
+-Dconfig.name=prototype -Dhost.name=ia32-linux
+)
+Report "jikesrvm build" $? $TOP/jikesrvm/build/Log.Std || exit 1
+
+exit 0
Index: Update
===================================================================
RCS file: /cvs/mauve/builder/scripts/Update,v
retrieving revision 1.4
diff -u -3 -p -u -r1.4 Update
--- Update	26 Nov 2006 16:15:12 -0000	1.4
+++ Update	30 Jan 2008 20:01:51 -0000
@@ -87,3 +87,8 @@ cvs -d:pserver:anonymous@dev.eclipse.org
 Status "cvs update japitools"
 cd $TOP/japitools
 cvs -d:pserver:anoncvs@cvs.savannah.nongnu.org:/cvsroot/japitools co japitools
+
+# JikesRVM
+Status "svn update jikesrvm"
+cd $TOP/jikesrvm
+svn co https://jikesrvm.svn.sourceforge.net/svnroot/jikesrvm/rvmroot/trunk jikesrvm

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-01-30 20:06 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-01-30 20:06 [builder] FYI: Add JikesRVM (disabled) Andrew John Hughes

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).