Mercurial > hg > graal-jvmci-8

comparison mxtool/mx.py @ 7509:442668d41bc2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed warnings
author Doug Simon <doug.simon@oracle.com>
date Mon, 21 Jan 2013 12:23:55 +0100
parents 57edf6b07d36
children bbaa734b3627
comparison
equal deleted inserted replaced
7508:60c536556fc1 7509:442668d41bc2
170 170
171 def isLibrary(self): 171 def isLibrary(self):
172 return isinstance(self, Library) 172 return isinstance(self, Library)
173 173
174 class Project(Dependency): 174 class Project(Dependency):
175 def __init__(self, suite, name, srcDirs, deps, javaCompliance, dir): 175 def __init__(self, suite, name, srcDirs, deps, javaCompliance, d):
176 Dependency.__init__(self, suite, name) 176 Dependency.__init__(self, suite, name)
177 self.srcDirs = srcDirs 177 self.srcDirs = srcDirs
178 self.deps = deps 178 self.deps = deps
179 self.checkstyleProj = name 179 self.checkstyleProj = name
180 self.javaCompliance = JavaCompliance(javaCompliance) if javaCompliance is not None else None 180 self.javaCompliance = JavaCompliance(javaCompliance) if javaCompliance is not None else None
181 self.native = False 181 self.native = False
182 self.dir = dir 182 self.dir = d
183 183
184 # Create directories for projects that don't yet exist 184 # Create directories for projects that don't yet exist
185 if not exists(dir): 185 if not exists(d):
186 os.mkdir(dir) 186 os.mkdir(d)
187 for s in self.source_dirs(): 187 for s in self.source_dirs():
188 if not exists(s): 188 if not exists(s):
189 os.mkdir(s) 189 os.mkdir(s)
190 190
191 def all_deps(self, deps, includeLibs, includeSelf=True, includeAnnotationProcessors=False): 191 def all_deps(self, deps, includeLibs, includeSelf=True, includeAnnotationProcessors=False):
410 path = self.get_path(resolve) 410 path = self.get_path(resolve)
411 if exists(path) or not resolve: 411 if exists(path) or not resolve:
412 cp.append(path) 412 cp.append(path)
413 413
414 class Suite: 414 class Suite:
415 def __init__(self, dir, primary): 415 def __init__(self, d, primary):
416 self.dir = dir 416 self.dir = d
417 self.projects = [] 417 self.projects = []
418 self.libs = [] 418 self.libs = []
419 self.includes = [] 419 self.includes = []
420 self.commands = None 420 self.commands = None
421 self.primary = primary 421 self.primary = primary
422 mxDir = join(dir, 'mx') 422 mxDir = join(d, 'mx')
423 self._load_env(mxDir) 423 self._load_env(mxDir)
424 self._load_commands(mxDir) 424 self._load_commands(mxDir)
425 self._load_includes(mxDir) 425 self._load_includes(mxDir)
426 426
427 def _load_projects(self, mxDir): 427 def _load_projects(self, mxDir):
469 ap = pop_list(attrs, 'annotationProcessors') 469 ap = pop_list(attrs, 'annotationProcessors')
470 #deps += ap 470 #deps += ap
471 javaCompliance = attrs.pop('javaCompliance', None) 471 javaCompliance = attrs.pop('javaCompliance', None)
472 subDir = attrs.pop('subDir', None); 472 subDir = attrs.pop('subDir', None);
473 if subDir is None: 473 if subDir is None:
474 dir = join(self.dir, name) 474 d = join(self.dir, name)
475 else: 475 else:
476 dir = join(self.dir, subDir, name) 476 d = join(self.dir, subDir, name)
477 p = Project(self, name, srcDirs, deps, javaCompliance, dir) 477 p = Project(self, name, srcDirs, deps, javaCompliance, d)
478 p.checkstyleProj = attrs.pop('checkstyle', name) 478 p.checkstyleProj = attrs.pop('checkstyle', name)
479 p.native = attrs.pop('native', '') == 'true' 479 p.native = attrs.pop('native', '') == 'true'
480 if not p.native and p.javaCompliance is None: 480 if not p.native and p.javaCompliance is None:
481 abort('javaCompliance property required for non-native project ' + name) 481 abort('javaCompliance property required for non-native project ' + name)
482 if len(ap) > 0: 482 if len(ap) > 0:
630 elif sys.platform.startswith('win32') or sys.platform.startswith('cygwin'): 630 elif sys.platform.startswith('win32') or sys.platform.startswith('cygwin'):
631 return 'windows' 631 return 'windows'
632 else: 632 else:
633 abort('Unknown operating system ' + sys.platform) 633 abort('Unknown operating system ' + sys.platform)
634 634
635 def _loadSuite(dir, primary=False): 635 def _loadSuite(d, primary=False):
636 mxDir = join(dir, 'mx') 636 mxDir = join(d, 'mx')
637 if not exists(mxDir) or not isdir(mxDir): 637 if not exists(mxDir) or not isdir(mxDir):
638 return None 638 return None
639 if not _suites.has_key(dir): 639 if not _suites.has_key(d):
640 suite = Suite(dir, primary) 640 suite = Suite(d, primary)
641 _suites[dir] = suite 641 _suites[d] = suite
642 return suite 642 return suite
643 643
644 def suites(): 644 def suites():
645 """ 645 """
646 Get the list of all loaded suites. 646 Get the list of all loaded suites.