Mercurial > hg > truffle

changeset 17396:83bbc0e5891a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed suite_helper.py and inlined common maven URL prefix
author Doug Simon <doug.simon@oracle.com>
date Thu, 09 Oct 2014 16:18:14 +0200
parents c8bd29658465
children 0c8442b0d4c4
files mx/suite.py mx/suite_helper.py mxtool/mx.py
diffstat 3 files changed, 9 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/mx/suite.py	Thu Oct 09 15:58:08 2014 +0200
+++ b/mx/suite.py	Thu Oct 09 16:18:14 2014 +0200
@@ -1,5 +1,3 @@
-from suite_helper import maven
-
 suite = {
   "mxversion" : "1.0",
   "name" : "graal",
@@ -8,14 +6,14 @@
       "path" : "lib/junit-4.11.jar",
       "urls" : [
         "http://lafo.ssw.uni-linz.ac.at/graal-external-deps/junit-4.11.jar",
-        maven("junit/junit/4.11/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",
-        maven("junit/junit/4.11/junit-4.11-sources.jar"),
+        "https://search.maven.org/remotecontent?filepath=junit/junit/4.11/junit-4.11-sources.jar",
       ],
       "sourceSha1" : "28e0ad201304e4a4abf999ca0570b7cffc352c3c",
       "dependencies" : ["HAMCREST"],
@@ -25,13 +23,13 @@
       "path" : "lib/hamcrest-core-1.3.jar",
       "urls" : [
         "http://lafo.ssw.uni-linz.ac.at/graal-external-deps/hamcrest-core-1.3.jar",
-        maven("org/hamcrest/hamcrest-core/1.3/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",
-        maven("org/hamcrest/hamcrest-core/1.3/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",
     },
@@ -136,14 +134,14 @@
       "path" : "lib/asm-5.0.3.jar",
       "urls" : [
         "http://lafo.ssw.uni-linz.ac.at/graal-external-deps/asm-5.0.3.jar",
-        maven("org/ow2/asm/asm/5.0.3/asm-5.0.3.jar"),
+        "https://search.maven.org/remotecontent?filepath=org/ow2/asm/asm/5.0.3/asm-5.0.3.jar",
       ],
       "sha1" : "dcc2193db20e19e1feca8b1240dbbc4e190824fa",
       "sourcePath" : "lib/asm-5.0.3-sources.jar",
       "sourceSha1" : "f0f24f6666c1a15c7e202e91610476bd4ce59368",
       "sourceUrls" : [
         "http://lafo.ssw.uni-linz.ac.at/graal-external-deps/asm-5.0.3-sources.jar",
-        maven("org/ow2/asm/asm/5.0.3/asm-5.0.3-sources.jar"),
+        "https://search.maven.org/remotecontent?filepath=org/ow2/asm/asm/5.0.3/asm-5.0.3-sources.jar",
       ],
     },
 
@@ -159,7 +157,7 @@
       "path" : "lib/vecmath-1.3.1.jar",
       "urls" : [
         "http://lafo.ssw.uni-linz.ac.at/graal-external-deps/vecmath-1.3.1.jar",
-        maven("java3d/vecmath/1.3.1/vecmath-1.3.1.jar"),
+        "https://search.maven.org/remotecontent?filepath=java3d/vecmath/1.3.1/vecmath-1.3.1.jar",
       ],
       "sha1" : "a0ae4f51da409fa0c20fa0ca59e6bbc9413ae71d",
     }
--- a/mx/suite_helper.py	Thu Oct 09 15:58:08 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-def maven(filepath):
-    return 'https://search.maven.org/remotecontent?filepath=%s' % filepath
--- a/mxtool/mx.py	Thu Oct 09 15:58:08 2014 +0200
+++ b/mxtool/mx.py	Thu Oct 09 16:18:14 2014 +0200
@@ -896,8 +896,8 @@
         # For now fail fast if extra modules were loaded.
         # This can later be relaxed to simply remove the extra modules
         # from the sys.modules name space if necessary.
-        extraModules = snapshot - sys.modules.viewkeys()
-        assert len(extraModules) == 0, 'loading ' + modulePath + ' caused extra modules to be loaded: ' + ', '.join([m.__file__ for m in extraModules])
+        extraModules = sys.modules.viewkeys() - snapshot
+        assert len(extraModules) == 0, 'loading ' + modulePath + ' caused extra modules to be loaded: ' + ', '.join([m for m in extraModules])
 
         # revert the Python path
         del sys.path[0]