From 9331da933f60072d650f86eedb00a244e1f7b430 Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Tue, 23 Sep 2014 19:39:17 -0700
Subject: [PATCH] projects -> suite rename
---
mx.fastr/imports | 2 +-
mx.fastr/projects.old | 185 -----------------------------
mx.fastr/{projects.py => suite.py} | 2 +-
3 files changed, 2 insertions(+), 187 deletions(-)
delete mode 100644 mx.fastr/projects.old
rename mx.fastr/{projects.py => suite.py} (99%)
diff --git a/mx.fastr/imports b/mx.fastr/imports
index 85a6c0348f..86a77fca92 100644
--- a/mx.fastr/imports
+++ b/mx.fastr/imports
@@ -1 +1 @@
-graal,fe5d4383b505caa15267b15d02f7b9e2b05bbd64,http://hg.openjdk.java.net/graal/graal
+graal,55a924683e72e6f18eb54fcad53bbdce5769335d,http://hg.openjdk.java.net/graal/graal
diff --git a/mx.fastr/projects.old b/mx.fastr/projects.old
deleted file mode 100644
index e27d0f61d9..0000000000
--- a/mx.fastr/projects.old
+++ /dev/null
@@ -1,185 +0,0 @@
-suite=fastr
-mxversion=2.6.2
-
-library@JDK_TOOLS@path=${JAVA_HOME}/lib/tools.jar
-library@JDK_TOOLS@sha1=NOCHECK
-
-#library@CHECKSTYLE@path=lib/checkstyle-5.5-all.jar
-#library@CHECKSTYLE@urls=jar:http://sourceforge.net/projects/checkstyle/files/checkstyle/5.5/checkstyle-5.5-bin.zip/download!/checkstyle-5.5/checkstyle-5.5-all.jar
-#library@CHECKSTYLE@sha1=6f4bb2b3dafb9426a67fa9c47f96ffed3b44749a
-
-library@ANTLR@path=lib/antlr-runtime-3.5.jar
-library@ANTLR@urls=http://central.maven.org/maven2/org/antlr/antlr-runtime/3.5/antlr-runtime-3.5.jar
-library@ANTLR@sha1=0baa82bff19059401e90e1b90020beb9c96305d7
-
-library@NETLIB@path=lib/netlib-java-0.9.3.jar
-library@NETLIB@urls=http://central.maven.org/maven2/com/googlecode/netlib-java/netlib-java/0.9.3/netlib-java-0.9.3.jar
-library@NETLIB@sha1=1d41b60e5180f6bcb7db15e7353dde7147cd3928
-
-library@ANTLR-C@path=lib/antlr-complete-3.5.1.jar
-library@ANTLR-C@urls=http://central.maven.org/maven2/org/antlr/antlr-complete/3.5.1/antlr-complete-3.5.1.jar
-library@ANTLR-C@sha1=ebb4b995fd67a9b291ea5b19379509160f56e154
-
-library@JLINE@path=lib/jline-2.11.jar
-library@JLINE@urls=http://lafo.ssw.uni-linz.ac.at/graal-external-deps/jline-2.11.jar,http://repo1.maven.org/maven2/jline/jline/2.11/jline-2.11.jar
-library@JLINE@sha1=9504d5e2da5d78237239c5226e8200ec21182040
-
-library@JNR_POSIX@path=lib/jnr-posix-3.0.1.jar
-library@JNR_POSIX@urls=http://lafo.ssw.uni-linz.ac.at/graal-external-deps/jnr-posix-3.0.1.jar,http://repo1.maven.org/maven2/com/github/jnr/jnr-posix/3.0.1/jnr-posix-3.0.1.jar
-library@JNR_POSIX@sha1=5ac18caed12108123c959c8acedef76ca4f28cb3
-
-library@JNR_CONSTANTS@path=lib/jnr-constants-0.8.5.jar
-library@JNR_CONSTANTS@urls=http://lafo.ssw.uni-linz.ac.at/graal-external-deps/jnr-constants-0.8.5.jar,http://repo1.maven.org/maven2/com/github/jnr/jnr-constants/0.8.5/jnr-constants-0.8.5.jar
-library@JNR_CONSTANTS@sha1=f84cca9e21f1f763a9eaf33de3d6a66a20ed7af0
-
-library@JNR_FFI@path=lib/jnr-ffi-1.0.10.jar
-library@JNR_FFI@urls=http://lafo.ssw.uni-linz.ac.at/graal-external-deps/jnr-ffi-1.0.10.jar,http://repo1.maven.org/maven2/com/github/jnr/jnr-ffi/1.0.10/jnr-ffi-1.0.10.jar
-library@JNR_FFI@sha1=646428e83a0e2ab4743091781ea98e3164c6d707
-
-library@JFFI@path=lib/jffi-1.2.7.jar
-library@JFFI@urls=http://lafo.ssw.uni-linz.ac.at/graal-external-deps/jffi-1.2.7.jar,http://repo1.maven.org/maven2/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar
-library@JFFI@sha1=acda5c46140404e08b3526f39db1504874b34b4c
-
-library@JFFI_NATIVE@path=lib/jffi-1.2.7-native.jar
-library@JFFI_NATIVE@urls=http://lafo.ssw.uni-linz.ac.at/graal-external-deps/jffi-1.2.7-native.jar,http://search.maven.org/remotecontent?filepath=com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar
-library@JFFI_NATIVE@sha1=4e8c876383acb37da4347902a0a775aefd51de09
-
-library@JNR_X86ASM@path=lib/jnr-x86asm-1.0.2.jar
-library@JNR_X86ASM@urls=http://lafo.ssw.uni-linz.ac.at/graal-external-deps/jnr-x86asm-1.0.2.jar,http://repo1.maven.org/maven2/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar
-library@JNR_X86ASM@sha1=006936bbd6c5b235665d87bd450f5e13b52d4b48
-
-library@ASM@path=lib/asm-5.0.3.jar
-library@ASM@urls=http://lafo.ssw.uni-linz.ac.at/graal-external-deps/asm-5.0.3.jar,http://central.maven.org/maven2/org/ow2/asm/asm/5.0.3/asm-5.0.3.jar
-library@ASM@sha1=dcc2193db20e19e1feca8b1240dbbc4e190824fa
-library@ASM@sourcePath=lib/asm-5.0.3-sources.jar
-library@ASM@sourceSha1=f0f24f6666c1a15c7e202e91610476bd4ce59368
-library@ASM@sourceUrls=http://lafo.ssw.uni-linz.ac.at/graal-external-deps/asm-5.0.3-sources.jar,http://central.maven.org/maven2/org/ow2/asm/asm/5.0.3/asm-5.0.3-sources.jar
-
-library@ASM_ANALYSIS@path=lib/asm-analysis-4.0.jar
-library@ASM_ANALYSIS@urls=http://lafo.ssw.uni-linz.ac.at/graal-external-deps/asm-analysis-4.0.jar,http://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar
-library@ASM_ANALYSIS@sha1=1c45d52b6f6c638db13cf3ac12adeb56b254cdd7
-
-library@ASM_COMMONS@path=lib/asm-commons-4.0.jar
-library@ASM_COMMONS@urls=http://lafo.ssw.uni-linz.ac.at/graal-external-deps/asm-commons-4.0.jar,http://repo1.maven.org/maven2/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar
-library@ASM_COMMONS@sha1=a839ec6737d2b5ba7d1878e1a596b8f58aa545d9
-
-library@ASM_TREE@path=lib/asm-tree-4.0.jar
-library@ASM_TREE@urls=http://lafo.ssw.uni-linz.ac.at/graal-external-deps/asm-tree-4.0.jar,http://repo1.maven.org/maven2/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar
-library@ASM_TREE@sha1=67bd266cd17adcee486b76952ece4cc85fe248b8
-
-library@ASM_UTIL@path=lib/asm-util-4.0.jar
-library@ASM_UTIL@urls=http://lafo.ssw.uni-linz.ac.at/graal-external-deps/asm-util-4.0.jar,http://repo1.maven.org/maven2/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar
-library@ASM_UTIL@sha1=d7a65f54cda284f9706a750c23d64830bb740c39
-
-library@JNR_INVOKE@path=lib/jnr-invoke-0.1.jar
-library@JNR_INVOKE@urls=http://repo1.maven.org/maven2/com/github/jnr/jnr-invoke/0.1/jnr-invoke-0.1.jar
-library@JNR_INVOKE@sha1=d0f846c3d3cb98dfd5e2bbd3cca236337fb0afa1
-
-library@JNR_UDIS86@path=lib/jnr-udis86-0.1.jar
-library@JNR_UDIS86@urls=http://repo1.maven.org/maven2/com/github/jnr/jnr-udis86/0.1/jnr-udis86-0.1.jar
-library@JNR_UDIS86@sha1=88accfa82203ea74a4a82237061c28ac8b4224af
-
-distribution@FASTR@path=fastr.jar
-distribution@FASTR@sourcesPath=fastr-sources.jar
-distribution@FASTR@dependencies=com.oracle.truffle.r.nodes
-distribution@FASTR@exclude=JDK_TOOLS,FINDBUGS,NETLIB,ASM_UTIL,ASM_TREE,ASM_COMMONS,ASM_ANALYSIS,ASM,JNR_X86ASM,JFFI_NATIVE,JFFI,JNR_FFI,JNR_CONSTANTS,JNR_POSIX,JNR_INVOKE,JNR_UDIS86,JLINE,ANTLR-C,ANTLR
-distribution@FASTR@distDependencies=TRUFFLE,GRAAL
-
-# com.oracle.truffle.r.parser.processor
-project@com.oracle.truffle.r.parser.processor@sourceDirs=src
-project@com.oracle.truffle.r.parser.processor@dependencies=JDK_TOOLS,ANTLR,ANTLR-C
-project@com.oracle.truffle.r.parser.processor@checkstyle=com.oracle.truffle.r.runtime
-project@com.oracle.truffle.r.parser.processor@javaCompliance=1.8
-project@com.oracle.truffle.r.parser.processor@workingSets=Truffle,FastR
-
-# com.oracle.truffle.r.parser
-project@com.oracle.truffle.r.parser@sourceDirs=src
-project@com.oracle.truffle.r.parser@dependencies=com.oracle.truffle.r.parser.processor,com.oracle.truffle.r.runtime
-project@com.oracle.truffle.r.parser@checkstyle=com.oracle.truffle.r.runtime
-project@com.oracle.truffle.r.parser@javaCompliance=1.8
-project@com.oracle.truffle.r.parser@annotationProcessors=com.oracle.truffle.r.parser.processor
-project@com.oracle.truffle.r.parser@workingSets=Truffle,FastR
-
-# com.oracle.truffle.r.nodes.builtin.processor
-project@com.oracle.truffle.r.nodes.builtin.processor@sourceDirs=src
-project@com.oracle.truffle.r.nodes.builtin.processor@dependencies=JDK_TOOLS
-project@com.oracle.truffle.r.nodes.builtin.processor@checkstyle=com.oracle.truffle.r.runtime
-project@com.oracle.truffle.r.nodes.builtin.processor@javaCompliance=1.8
-project@com.oracle.truffle.r.nodes.builtin.processor@workingSets=Truffle,FastR
-
-# com.oracle.truffle.r.nodes
-project@com.oracle.truffle.r.nodes@sourceDirs=src
-project@com.oracle.truffle.r.nodes@dependencies=com.oracle.truffle.api.dsl,com.oracle.truffle.r.parser
-project@com.oracle.truffle.r.nodes@checkstyle=com.oracle.truffle.r.runtime
-project@com.oracle.truffle.r.nodes@javaCompliance=1.8
-project@com.oracle.truffle.r.nodes@annotationProcessors=com.oracle.truffle.dsl.processor
-project@com.oracle.truffle.r.nodes@workingSets=Truffle,FastR
-
-# com.oracle.truffle.r.nodes.builtin
-project@com.oracle.truffle.r.nodes.builtin@sourceDirs=src
-project@com.oracle.truffle.r.nodes.builtin@dependencies=com.oracle.graal.debug,com.oracle.truffle.r.nodes
-project@com.oracle.truffle.r.nodes.builtin@checkstyle=com.oracle.truffle.r.runtime
-project@com.oracle.truffle.r.nodes.builtin@javaCompliance=1.8
-project@com.oracle.truffle.r.nodes.builtin@annotationProcessors=com.oracle.truffle.dsl.processor,com.oracle.truffle.r.nodes.builtin.processor
-project@com.oracle.truffle.r.nodes.builtin@workingSets=Truffle,FastR
-
-# com.oracle.truffle.r.test.ignore.processor
-project@com.oracle.truffle.r.test.ignore.processor@sourceDirs=src
-project@com.oracle.truffle.r.test.ignore.processor@dependencies=JUNIT,JDK_TOOLS
-project@com.oracle.truffle.r.test.ignore.processor@checkstyle=com.oracle.truffle.r.runtime
-project@com.oracle.truffle.r.test.ignore.processor@javaCompliance=1.8
-project@com.oracle.truffle.r.test.ignore.processor@workingSets=Truffle,FastR
-
-# com.oracle.truffle.r.test
-project@com.oracle.truffle.r.test@sourceDirs=src
-project@com.oracle.truffle.r.test@dependencies=JUNIT,com.oracle.truffle.r.engine
-project@com.oracle.truffle.r.test@checkstyle=com.oracle.truffle.r.runtime
-project@com.oracle.truffle.r.test@javaCompliance=1.8
-project@com.oracle.truffle.r.test@annotationProcessors=com.oracle.truffle.r.test.ignore.processor
-project@com.oracle.truffle.r.test@workingSets=Truffle,FastR,Test
-
-# com.oracle.truffle.r.test.native
-project@com.oracle.truffle.r.test.native@sourceDirs=
-project@com.oracle.truffle.r.test.native@native=true
-project@com.oracle.truffle.r.test.native@workingSets=FastR
-
-# com.oracle.truffle.r.engine
-project@com.oracle.truffle.r.engine@sourceDirs=src
-project@com.oracle.truffle.r.engine@dependencies=com.oracle.truffle.r.nodes.builtin,com.oracle.truffle.r.runtime.ffi
-project@com.oracle.truffle.r.engine@checkstyle=com.oracle.truffle.r.runtime
-project@com.oracle.truffle.r.engine@javaCompliance=1.8
-project@com.oracle.truffle.r.engine@workingSets=Truffle,FastR
-
-# com.oracle.truffle.r.shell
-project@com.oracle.truffle.r.shell@sourceDirs=src
-project@com.oracle.truffle.r.shell@dependencies=com.oracle.truffle.r.engine,JLINE
-project@com.oracle.truffle.r.shell@checkstyle=com.oracle.truffle.r.runtime
-project@com.oracle.truffle.r.shell@javaCompliance=1.8
-project@com.oracle.truffle.r.shell@workingSets=Truffle,FastR
-
-# com.oracle.truffle.r.runtime
-project@com.oracle.truffle.r.runtime@sourceDirs=src
-project@com.oracle.truffle.r.runtime@dependencies=com.oracle.truffle.api,com.oracle.truffle.r.options,FINDBUGS
-project@com.oracle.truffle.r.runtime@checkstyle=com.oracle.truffle.r.runtime
-project@com.oracle.truffle.r.runtime@javaCompliance=1.8
-project@com.oracle.truffle.r.runtime@workingSets=Truffle,FastR
-
-# com.oracle.truffle.r.runtime.ffi
-project@com.oracle.truffle.r.runtime.ffi@sourceDirs=src
-project@com.oracle.truffle.r.runtime.ffi@dependencies=com.oracle.truffle.r.runtime,com.oracle.nfi,com.oracle.graal.compiler.common,ASM_ANALYSIS,JNR_POSIX,ASM_UTIL,JFFI,JNR_FFI,NETLIB,JNR_CONSTANTS,JFFI_NATIVE,JNR_INVOKE,JNR_UDIS86,ASM,ASM_TREE,ASM_COMMONS,JNR_X86ASM
-project@com.oracle.truffle.r.runtime.ffi@checkstyle=com.oracle.truffle.r.runtime
-project@com.oracle.truffle.r.runtime.ffi@javaCompliance=1.8
-project@com.oracle.truffle.r.runtime.ffi@workingSets=Truffle,FastR
-
-# com.oracle.truffle.r.native
-project@com.oracle.truffle.r.native@sourceDirs=
-project@com.oracle.truffle.r.native@native=true
-project@com.oracle.truffle.r.native@workingSets=FastR
-
-# com.oracle.truffle.r.options
-project@com.oracle.truffle.r.options@sourceDirs=src
-project@com.oracle.truffle.r.options@dependencies=com.oracle.graal.options
-project@com.oracle.truffle.r.options@checkstyle=com.oracle.truffle.r.runtime
-project@com.oracle.truffle.r.options@javaCompliance=1.8
-project@com.oracle.truffle.r.options@workingSets=FastR
-
diff --git a/mx.fastr/projects.py b/mx.fastr/suite.py
similarity index 99%
rename from mx.fastr/projects.py
rename to mx.fastr/suite.py
index aac0eb0a15..5426ec925b 100644
--- a/mx.fastr/projects.py
+++ b/mx.fastr/suite.py
@@ -21,7 +21,7 @@
# questions.
#
suite = {
- "mxversion" : "2.6.2",
+ "mxversion" : "2.6.5",
"name" : "fastr",
"libraries" : {
"JDK_TOOLS" : {
--
GitLab