Mercurial > hg > graal-jvmci-8

changeset 22674:5ef7110c63bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
moved unzipped c1visualizer distribution and downloaded hsdis to mxbuild/ directory
author Doug Simon <doug.simon@oracle.com>
date Sun, 11 Oct 2015 14:18:22 +0200
parents 3e573d7d32a7
children 359605451591
files mx.jvmci/mx_jvmci.py
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/mx.jvmci/mx_jvmci.py	Fri Oct 09 14:43:07 2015 +0200
+++ b/mx.jvmci/mx_jvmci.py	Sun Oct 11 14:18:22 2015 +0200
@@ -1305,22 +1305,22 @@
 
 def c1visualizer(args):
     """run the Cl Compiler Visualizer"""
-    libpath = join(_suite.dir, 'lib')
+    extractPath = join(_suite.get_output_root())
     if mx.get_os() == 'windows':
-        executable = join(libpath, 'c1visualizer', 'bin', 'c1visualizer.exe')
+        executable = join(extractPath, 'c1visualizer', 'bin', 'c1visualizer.exe')
     else:
-        executable = join(libpath, 'c1visualizer', 'bin', 'c1visualizer')
+        executable = join(extractPath, 'c1visualizer', 'bin', 'c1visualizer')
 
-    # Check whether the current C1Visualizer installation is the up-to-date
+    # Check whether the current C1Visualizer installation is up-to-date
     if exists(executable) and not exists(mx.library('C1VISUALIZER_DIST').get_path(resolve=False)):
         mx.log('Updating C1Visualizer')
-        shutil.rmtree(join(libpath, 'c1visualizer'))
+        shutil.rmtree(join(extractPath, 'c1visualizer'))
 
     archive = mx.library('C1VISUALIZER_DIST').get_path(resolve=True)
 
     if not exists(executable):
         zf = zipfile.ZipFile(archive, 'r')
-        zf.extractall(libpath)
+        zf.extractall(extractPath)
 
     if not exists(executable):
         mx.abort('C1Visualizer binary does not exist: ' + executable)
@@ -1572,7 +1572,7 @@
     else:
         osSuffix = ''
     lib = mx.add_lib_suffix('hsdis-' + osSuffix + mx.get_arch())
-    path = join(_suite.dir, 'lib', lib)
+    path = join(_suite.get_output_root(), lib)
 
     sha1s = {
         'att/hsdis-amd64.dll' : 'bcbd535a9568b5075ab41e96205e26a2bac64f72',