# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1436565189 -7200
# Node ID f9ddf6b6dd6b772c5275e254a9b19aa18d1b41bf
# Parent  2ea24a36675cf5264577361bddbc2ee2517dd08d
minor fixes related to mx2 transition

diff -r 2ea24a36675c -r f9ddf6b6dd6b mx.jvmci/mx_jvmci.py
--- a/mx.jvmci/mx_jvmci.py	Wed Jul 08 23:34:56 2015 +0200
+++ b/mx.jvmci/mx_jvmci.py	Fri Jul 10 23:53:09 2015 +0200
@@ -1345,7 +1345,7 @@
     try:
         with Task('Check jvmci.make in sync with suite.py', tasks) as t:
             if t:
-                jvmciMake = join('make', 'jvmci.make')
+                jvmciMake = join(_suite.dir, 'make', 'jvmci.make')
                 if mx_jvmci_makefile.build_makefile(['-o', jvmciMake]) != 0:
                     t.abort('Rerun "mx makefile -o ' + jvmciMake + ' and check-in the modified ' + jvmciMake)
 
@@ -1575,8 +1575,8 @@
 
     def makejmhdep(artifactId, groupId, deps):
         path = artifactId + '.jar'
+        allDeps = []
         if args.permissive:
-            allDeps = []
             for name in deps:
                 dist = mx.distribution(name, fatalIfMissing=False)
                 if dist:
@@ -1587,7 +1587,7 @@
                             mx.log('Skipping dependency ' + groupId + '.' + artifactId + ' as ' + name + ' cannot be resolved')
                             return
                     allDeps.append(name)
-        d = mx.Distribution(_suite, name=artifactId, path=path, sourcesPath=path, deps=allDeps, mainClass=None, excludedDependencies=[], distDependencies=[], javaCompliance=None)
+        d = mx.Distribution(_suite, name=artifactId, subDir=_suite.dir, path=path, sourcesPath=path, deps=allDeps, mainClass=None, excludedDependencies=[], distDependencies=[], javaCompliance=None)
         d.make_archive()
         cmd = ['mvn', 'install:install-file', '-DgroupId=' + groupId, '-DartifactId=' + artifactId,
                '-Dversion=1.0-SNAPSHOT', '-Dpackaging=jar', '-Dfile=' + d.path]
diff -r 2ea24a36675c -r f9ddf6b6dd6b mx.jvmci/mx_jvmci_makefile.py
--- a/mx.jvmci/mx_jvmci_makefile.py	Wed Jul 08 23:34:56 2015 +0200
+++ b/mx.jvmci/mx_jvmci_makefile.py	Fri Jul 10 23:53:09 2015 +0200
@@ -53,7 +53,7 @@
     opts = parser.parse_args(args)
 
     if opts.selectedDists == None or len(opts.selectedDists) == 0:
-        opts.selectedDists = [d.name for d in mx_jvmci._jdkDeployedDists if d.partOfHotSpot]
+        opts.selectedDists = [d.name for d in mx_jvmci.jdkDeployedDists if d.partOfHotSpot]
     mf = Makefile()
     commandline = " ".join(["mx.sh", "makefile"] + args)
     if do_build_makefile(mf, opts.selectedDists, commandline):
@@ -76,7 +76,7 @@
     return [d for d in deps if typeFilter(d)]
 
 def get_jdk_deployed_dists():
-    return [d.name for d in mx_jvmci._jdkDeployedDists]
+    return [d.name for d in mx_jvmci.jdkDeployedDists]
 
 def update_list(li, elements):
     for e in elements:
@@ -115,7 +115,7 @@
             for src in [projectDir + '/' + d for d in p.srcDirs]:
                 sources.append("$(shell find {} -type f 2> /dev/null)".format(src))
                 metaInf = src + "/META-INF"
-                if os.path.exists(metaInf):
+                if os.path.exists(os.path.join(dist.suite.dir, metaInf)):
                     resources.append(metaInf)
 
 
@@ -280,7 +280,7 @@
 .PHONY: export clean
 
 """)
-    s = mx.suite("graal")
+    s = mx_jvmci._suite
     dists = []
     ap = []
     projects = []