[GR-10901] Updated dependency locations.

PullRequest: graal/1852
oracle · Jul 18, 2018 · 833274d · 833274d
2 parents f5cea96 + 95bd3bb
commit 833274d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 18 deletions.
diff --git a/compiler/mx.compiler/mx_graal_tools.py b/compiler/mx.compiler/mx_graal_tools.py
@@ -106,19 +106,19 @@ def hsdis(args, copyToDir=None):
     libpattern = mx.add_lib_suffix('hsdis-' + mx.get_arch() + '-' + mx.get_os() + '-%s')
 
     sha1s = {
-        'att-hsdis-amd64-windows-%s.dll' : 'bcbd535a9568b5075ab41e96205e26a2bac64f72',
-        'att-hsdis-amd64-linux-%s.so' : '36a0b8e30fc370727920cc089f104bfb9cd508a0',
-        'att-hsdis-amd64-darwin-%s.dylib' : 'c1865e9a58ca773fdc1c5eea0a4dfda213420ffb',
-        'intel-hsdis-amd64-windows-%s.dll' : '6a388372cdd5fe905c1a26ced614334e405d1f30',
-        'intel-hsdis-amd64-linux-%s.so' : '0d031013db9a80d6c88330c42c983fbfa7053193',
-        'intel-hsdis-amd64-darwin-%s.dylib' : '67f6d23cbebd8998450a88b5bef362171f66f11a',
+        'att/hsdis-amd64-windows-%s.dll' : 'bcbd535a9568b5075ab41e96205e26a2bac64f72',
+        'att/hsdis-amd64-linux-%s.so' : '36a0b8e30fc370727920cc089f104bfb9cd508a0',
+        'att/hsdis-amd64-darwin-%s.dylib' : 'c1865e9a58ca773fdc1c5eea0a4dfda213420ffb',
+        'intel/hsdis-amd64-windows-%s.dll' : '6a388372cdd5fe905c1a26ced614334e405d1f30',
+        'intel/hsdis-amd64-linux-%s.so' : '0d031013db9a80d6c88330c42c983fbfa7053193',
+        'intel/hsdis-amd64-darwin-%s.dylib' : '67f6d23cbebd8998450a88b5bef362171f66f11a',
         'hsdis-sparcv9-solaris-%s.so': '970640a9af0bd63641f9063c11275b371a59ee60',
         'hsdis-sparcv9-linux-%s.so': '0c375986d727651dee1819308fbbc0de4927d5d9',
         'hsdis-aarch64-linux-%s.so': 'fcc9b70ac91c00db8a50b0d4345490a68e3743e1',
     }
 
     if flavor:
-        flavoredLib = flavor + "-" + libpattern
+        flavoredLib = flavor + "/" + libpattern
     else:
         flavoredLib = libpattern
     if flavoredLib not in sha1s:
@@ -130,7 +130,7 @@ def hsdis(args, copyToDir=None):
     path = join(_suite.get_output_root(), lib)
     if not exists(path):
         sha1path = path + '.sha1'
-        mx.download_file_with_sha1('hsdis', path, ['https://github.com/oracle/graal/releases/download/hsdis-20180108/' + lib], sha1, sha1path, True, True, sources=False)
+        mx.download_file_with_sha1('hsdis', path, ['https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hsdis/' + lib], sha1, sha1path, True, True, sources=False)
 
     overwrite = True
     if copyToDir is None:

diff --git a/compiler/mx.compiler/suite.py b/compiler/mx.compiler/suite.py
@@ -54,21 +54,23 @@
 
     "DACAPO" : {
       "urls" : [
-        "https://github.com/oracle/graal/releases/download/dacapo-9.12-bach-patched/dacapo-9.12-bach-patched.jar",
+        "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/dacapo-9.12-bach-patched.jar",
       ],
       "sha1" : "e39957904b7e79caf4fa54f30e8e4ee74d4e9e37",
     },
 
     "DACAPO_SCALA" : {
       "urls" : [
+        "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/dacapo-scala-0.1.0-20120216.jar",
         "http://repo.scalabench.org/snapshots/org/scalabench/benchmarks/scala-benchmark-suite/0.1.0-SNAPSHOT/scala-benchmark-suite-0.1.0-20120216.103539-3.jar",
       ],
       "sha1" : "59b64c974662b5cf9dbd3cf9045d293853dd7a51",
     },
 
     "DACAPO_D3S" : {
       "urls" : [
-        "https://github.com/oracle/graal/releases/download/dacapo-9.12-d3s/dacapo-9.12-d3s.jar",
+        "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/dacapo-9.12-d3s.jar",
+        "http://d3s.mff.cuni.cz/software/benchmarking/files/dacapo-9.12-d3s.jar",
       ],
       "sha1" : "b072de027141ac81ab5d48706949fda86de62468",
     },
@@ -84,17 +86,17 @@
     },
 
     "HCFDIS" : {
-      "urls" : ["https://github.com/oracle/graal/releases/download/hcfdis-3/hcfdis-3.jar"],
+      "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hcfdis/hcfdis-3.jar"],
       "sha1" : "a71247c6ddb90aad4abf7c77e501acc60674ef57",
     },
 
     "C1VISUALIZER_DIST" : {
-      "urls" : ["https://github.com/oracle/graal/releases/download/c1visualizer-1.7/c1visualizer-1.7.zip"],
+      "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/c1visualizer/c1visualizer-1.7.zip"],
       "sha1" : "305a772ccbdc0e42dfa233b0ce6762d0dd1de6de",
     },
 
     "IDEALGRAPHVISUALIZER_DIST" : {
-      "urls" : ["https://github.com/oracle/graal/releases/download/idealgraphvisualizer-543/idealgraphvisualizer-543.zip"],
+      "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/idealgraphvisualizer/idealgraphvisualizer-543.zip"],
       "sha1" : "39a1810b8443a64e5bcc431c78e56515109898b9",
     },
 
@@ -110,7 +112,7 @@
 
     "BATIK" : {
       "sha1" : "122b87ca88e41a415cf8b523fd3d03b4325134a3",
-      "urls" : ["https://github.com/oracle/graal/releases/download/batik-all-1.7/batik-all-1.7.jar"],
+      "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/batik-all-1.7.jar"],
     },
 
     "ASM5" : {
@@ -133,7 +135,7 @@
     },
 
     "UBENCH_AGENT_DIST" : {
-      "urls" : ["https://github.com/oracle/graal/releases/download/java-ubench-agent-2e5becaf97a/java-ubench-agent-2e5becaf97afcf64fd8aef3ac84fc05a3157bff5.zip"],
+      "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/java-ubench-agent-2e5becaf97afcf64fd8aef3ac84fc05a3157bff5.zip"],
       "sha1" : "19087a34b80be8845e9a3e7f927ceb592de83762",
     },
 

diff --git a/tools/mx.tools/suite.py b/tools/mx.tools/suite.py
@@ -107,7 +107,7 @@
         },
         "TruffleJSON" : {
           "urls" : [
-            "https://github.com/oracle/graal/releases/download/trufflejson-20180130/trufflejson-20180130.jar",
+            "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/trufflejson-20180130.jar",
           ],
           "sha1" : "8819cea8bfe22c9c63f55465e296b3855ea41786",
         },

diff --git a/truffle/mx.truffle/suite.py b/truffle/mx.truffle/suite.py
@@ -43,7 +43,8 @@
 
     "LIBFFI" : {
       "urls" : [
-        "https://github.com/oracle/graal/releases/download/libffi-3.2.1/libffi-3.2.1.tar.gz",
+        "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/libffi-3.2.1.tar.gz",
+        "ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz",
       ],
       "sha1" : "280c265b789e041c02e5c97815793dfc283fb1e6",
     },
@@ -59,7 +60,8 @@
 
     "ANTLR4_COMPLETE": {
       "urls": [
-        "https://github.com/oracle/graal/releases/download/antlr-complete-4.7/antlr-4.7-complete.jar"
+        "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/antlr-4.7-complete.jar",
+        "http://www.antlr.org/download/antlr-4.7-complete.jar"
       ],
       "sha1": "5b3a8824334069979a0862ce67ede796c3a4d1b1",
     },