comparison mx/commands.py @ 4632:5b0a2334437d

Merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 17 Feb 2012 15:31:40 +0100
parents b1b78a46b907 05a33fabcfe6
children d4e039a3e083
comparison
equal deleted inserted replaced
4631:b1b78a46b907 4632:5b0a2334437d
622 mx.log(time.strftime('gate: %d %b %Y %H:%M:%S: ABORT: ') + self.title + ' [' + str(self.duration) + ']') 622 mx.log(time.strftime('gate: %d %b %Y %H:%M:%S: ABORT: ') + self.title + ' [' + str(self.duration) + ']')
623 mx.abort(codeOrMessage) 623 mx.abort(codeOrMessage)
624 return self 624 return self
625 625
626 parser = ArgumentParser(prog='mx gate'); 626 parser = ArgumentParser(prog='mx gate');
627 parser.add_argument('--omit-native-build', action='store_false', dest='buildNative', help='omit cleaning and building native code') 627 parser.add_argument('-n', '--omit-native-build', action='store_false', dest='buildNative', help='omit cleaning and building native code')
628 parser.add_argument('-g', '--only-build-graalvm', action='store_false', dest='buildNonGraal', help='only build the Graal VM')
628 629
629 args = parser.parse_args(args) 630 args = parser.parse_args(args)
630 631
631 tasks = [] 632 tasks = []
632 total = Task('Gate') 633 total = Task('Gate')
654 t = Task('CleanAndBuildGraalVisualizer') 655 t = Task('CleanAndBuildGraalVisualizer')
655 mx.run(['ant', '-f', join(_graal_home, 'visualizer', 'build.xml'), '-q', 'clean', 'build']) 656 mx.run(['ant', '-f', join(_graal_home, 'visualizer', 'build.xml'), '-q', 'clean', 'build'])
656 tasks.append(t.stop()) 657 tasks.append(t.stop())
657 658
658 # Prevent Graal modifications from breaking the standard builds 659 # Prevent Graal modifications from breaking the standard builds
659 if args.buildNative: 660 if args.buildNative and args.buildNonGraal:
660 t = Task('BuildHotSpotVarieties') 661 t = Task('BuildHotSpotVarieties')
661 buildvms(['--vms', 'client,server', '--builds', 'fastdebug,product']) 662 buildvms(['--vms', 'client,server', '--builds', 'fastdebug,product'])
662 tasks.append(t.stop()) 663 tasks.append(t.stop())
663 664
664 for vmbuild in ['fastdebug', 'product']: 665 for vmbuild in ['fastdebug', 'product']: