Mercurial > hg > truffle

changeset 17239:d1cc47f5b1dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Stefan Anzinger <stefan.anzinger@oracle.com>
date Fri, 26 Sep 2014 15:14:02 -0700
parents 45c8f71196ec (current diff) 9d728eb7fdec (diff)
children 136ba6d379f2
files
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mxtool/mx.py	Fri Sep 26 10:41:19 2014 -0700
+++ b/mxtool/mx.py	Fri Sep 26 15:14:02 2014 -0700
@@ -2136,13 +2136,13 @@
             self._init_classpaths()
 
         for e in self._bootclasspath.split(os.pathsep):
-            if basename(e) == self.jar:
+            if basename(e) == jar:
                 return True
         for d in self._extdirs.split(os.pathsep):
-            if len(d) and self.jar in os.listdir(d):
+            if len(d) and jar in os.listdir(d):
                 return True
         for d in self._endorseddirs.split(os.pathsep):
-            if len(d) and self.jar in os.listdir(d):
+            if len(d) and jar in os.listdir(d):
                 return True
         return False
 
@@ -2382,7 +2382,7 @@
             else:
                 self.logCompilation('JDT')
 
-                jdtVmArgs = ['-Xmx1g', '-jar', self.jdtJar]
+                jdtVmArgs = ['-Xmx1g', '-jar', _tpU2W(self.jdtJar)]
 
                 jdtArgs = ['-' + compliance,
                          '-cp', cp, '-g', '-enableJavadoc',
@@ -2415,7 +2415,7 @@
                         jdtArgs += ['-properties', jdtPropertiesTmp]
                     else:
                         jdtArgs += ['-properties', jdtProperties]
-                jdtArgs.append('@' + argfile.name)
+                jdtArgs.append('@' + _tpU2W(argfile.name))
 
                 run_java(jdtVmArgs + jdtArgs)