Mercurial > hg > graal-compiler
changeset 22084:0defcb691fe2
mx: removed redundant definitions for JUNIT, HAMCREST and CHECKSTYLE libraries
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Thu, 25 Jun 2015 10:26:48 +0200 |
parents | 38d4936aacec |
children | 1a769bce9a01 |
files | mx.graal/suite.py mxtool/mx.mx/suite.py mxtool/mx_findbugs.py |
diffstat | 3 files changed, 7 insertions(+), 48 deletions(-) [+] |
line wrap: on
line diff
--- a/mx.graal/suite.py Wed Jun 24 20:52:38 2015 +0200 +++ b/mx.graal/suite.py Thu Jun 25 10:26:48 2015 +0200 @@ -14,47 +14,6 @@ "sha1" : "9504d5e2da5d78237239c5226e8200ec21182040", }, - "JUNIT" : { - "path" : "lib/junit-4.11.jar", - "urls" : [ - "http://lafo.ssw.uni-linz.ac.at/graal-external-deps/junit-4.11.jar", - "https://search.maven.org/remotecontent?filepath=junit/junit/4.11/junit-4.11.jar", - ], - "sha1" : "4e031bb61df09069aeb2bffb4019e7a5034a4ee0", - "eclipse.container" : "org.eclipse.jdt.junit.JUNIT_CONTAINER/4", - "sourcePath" : "lib/junit-4.11-sources.jar", - "sourceUrls" : [ - "http://lafo.ssw.uni-linz.ac.at/graal-external-deps/junit-4.11-sources.jar", - "https://search.maven.org/remotecontent?filepath=junit/junit/4.11/junit-4.11-sources.jar", - ], - "sourceSha1" : "28e0ad201304e4a4abf999ca0570b7cffc352c3c", - "dependencies" : ["HAMCREST"], - }, - - "CHECKSTYLE" : { - "path" : "lib/checkstyle-6.0-all.jar", - "urls" : [ - "http://lafo.ssw.uni-linz.ac.at/graal-external-deps/checkstyle-6.0-all.jar", - "jar:http://sourceforge.net/projects/checkstyle/files/checkstyle/6.0/checkstyle-6.0-bin.zip/download!/checkstyle-6.0/checkstyle-6.0-all.jar", - ], - "sha1" : "2bedc7feded58b5fd65595323bfaf7b9bb6a3c7a", - }, - - "HAMCREST" : { - "path" : "lib/hamcrest-core-1.3.jar", - "urls" : [ - "http://lafo.ssw.uni-linz.ac.at/graal-external-deps/hamcrest-core-1.3.jar", - "https://search.maven.org/remotecontent?filepath=org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar", - ], - "sha1" : "42a25dc3219429f0e5d060061f71acb49bf010a0", - "sourcePath" : "lib/hamcrest-core-1.3-sources.jar", - "sourceUrls" : [ - "http://lafo.ssw.uni-linz.ac.at/graal-external-deps/hamcrest-core-1.3-sources.jar", - "https://search.maven.org/remotecontent?filepath=org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar", - ], - "sourceSha1" : "1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b", - }, - "HCFDIS" : { "path" : "lib/hcfdis-2.jar", "urls" : ["http://lafo.ssw.uni-linz.ac.at/hcfdis-2.jar"],
--- a/mxtool/mx.mx/suite.py Wed Jun 24 20:52:38 2015 +0200 +++ b/mxtool/mx.mx/suite.py Thu Jun 25 10:26:48 2015 +0200 @@ -5,7 +5,7 @@ # ------------- Libraries ------------- - "MX_FINDBUGS_DIST" : { + "FINDBUGS_DIST" : { "path" : "lib/findbugs-dist-3.0.0.zip", "urls" : [ "http://lafo.ssw.uni-linz.ac.at/graal-external-deps/findbugs-3.0.0.zip", @@ -14,7 +14,7 @@ "sha1" : "6e56d67f238dbcd60acb88a81655749aa6419c5b", }, - "MX_JUNIT" : { + "JUNIT" : { "path" : "lib/junit-4.11.jar", "urls" : [ "http://lafo.ssw.uni-linz.ac.at/graal-external-deps/junit-4.11.jar", @@ -28,10 +28,10 @@ "https://search.maven.org/remotecontent?filepath=junit/junit/4.11/junit-4.11-sources.jar", ], "sourceSha1" : "28e0ad201304e4a4abf999ca0570b7cffc352c3c", - "dependencies" : ["MX_HAMCREST"], + "dependencies" : ["HAMCREST"], }, - "MX_CHECKSTYLE" : { + "CHECKSTYLE" : { "path" : "lib/checkstyle-6.0-all.jar", "urls" : [ "http://lafo.ssw.uni-linz.ac.at/graal-external-deps/checkstyle-6.0-all.jar", @@ -40,7 +40,7 @@ "sha1" : "2bedc7feded58b5fd65595323bfaf7b9bb6a3c7a", }, - "MX_HAMCREST" : { + "HAMCREST" : { "path" : "lib/hamcrest-core-1.3.jar", "urls" : [ "http://lafo.ssw.uni-linz.ac.at/graal-external-deps/hamcrest-core-1.3.jar", @@ -62,7 +62,7 @@ "subDir" : "java", "sourceDirs" : ["src"], "dependencies" : [ - "MX_JUNIT", + "JUNIT", ], "javaCompliance" : "1.8", },
--- a/mxtool/mx_findbugs.py Wed Jun 24 20:52:38 2015 +0200 +++ b/mxtool/mx_findbugs.py Thu Jun 25 10:26:48 2015 +0200 @@ -51,7 +51,7 @@ if not exists(findbugsLib): tmp = tempfile.mkdtemp(prefix='findbugs-download-tmp', dir=mx._mx_suite.dir) try: - findbugsDist = mx.library('MX_FINDBUGS_DIST').get_path(resolve=True) + findbugsDist = mx.library('FINDBUGS_DIST').get_path(resolve=True) with zipfile.ZipFile(findbugsDist) as zf: candidates = [e for e in zf.namelist() if e.endswith('/lib/findbugs.jar')] assert len(candidates) == 1, candidates