Mercurial > hg > graal-compiler
comparison mx/commands.py @ 5764:66ec0bc36a37
Merge.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 04 Jul 2012 22:01:03 +0200 |
parents | b30cced39597 30876d0bb92d |
children | 613a3ddb9a71 |
comparison
equal
deleted
inserted
replaced
5763:a3d71693e0ce | 5764:66ec0bc36a37 |
---|---|
706 mx.abort(codeOrMessage) | 706 mx.abort(codeOrMessage) |
707 return self | 707 return self |
708 | 708 |
709 parser = ArgumentParser(prog='mx gate'); | 709 parser = ArgumentParser(prog='mx gate'); |
710 parser.add_argument('-j', '--omit-java-clean', action='store_false', dest='cleanJava', help='omit cleaning Java native code') | 710 parser.add_argument('-j', '--omit-java-clean', action='store_false', dest='cleanJava', help='omit cleaning Java native code') |
711 parser.add_argument('-n', '--omit-native-build', action='store_false', dest='buildNative', help='omit cleaning and building native code') | 711 parser.add_argument('-n', '--omit-native-clean', action='store_false', dest='cleanNative', help='omit cleaning and building native code') |
712 parser.add_argument('-g', '--only-build-graalvm', action='store_false', dest='buildNonGraal', help='only build the Graal VM') | 712 parser.add_argument('-g', '--only-build-graalvm', action='store_false', dest='buildNonGraal', help='only build the Graal VM') |
713 parser.add_argument('--jacocout', help='specify the output directory for jacoco report') | 713 parser.add_argument('--jacocout', help='specify the output directory for jacoco report') |
714 | 714 |
715 args = parser.parse_args(args) | 715 args = parser.parse_args(args) |
716 | 716 |
722 total = Task('Gate') | 722 total = Task('Gate') |
723 try: | 723 try: |
724 | 724 |
725 t = Task('Clean') | 725 t = Task('Clean') |
726 cleanArgs = [] | 726 cleanArgs = [] |
727 if not args.buildNative: | 727 if not args.cleanNative: |
728 cleanArgs.append('--no-native') | 728 cleanArgs.append('--no-native') |
729 if not args.cleanJava: | 729 if not args.cleanJava: |
730 cleanArgs.append('--no-java') | 730 cleanArgs.append('--no-java') |
731 clean(cleanArgs) | 731 clean(cleanArgs) |
732 tasks.append(t.stop()) | 732 tasks.append(t.stop()) |
735 build(['--no-native']) | 735 build(['--no-native']) |
736 tasks.append(t.stop()) | 736 tasks.append(t.stop()) |
737 for vmbuild in ['fastdebug', 'product']: | 737 for vmbuild in ['fastdebug', 'product']: |
738 _vmbuild = vmbuild | 738 _vmbuild = vmbuild |
739 | 739 |
740 if args.buildNative: | 740 t = Task('BuildHotSpotGraal:' + vmbuild) |
741 t = Task('BuildHotSpotGraal:' + vmbuild) | 741 buildvms(['--vms', 'graal', '--builds', vmbuild]) |
742 buildvms(['--vms', 'graal', '--builds', vmbuild]) | 742 tasks.append(t.stop()) |
743 tasks.append(t.stop()) | |
744 | 743 |
745 t = Task('BootstrapWithSystemAssertions:' + vmbuild) | 744 t = Task('BootstrapWithSystemAssertions:' + vmbuild) |
746 vm(['-esa', '-version']) | 745 vm(['-esa', '-version']) |
747 tasks.append(t.stop()) | 746 tasks.append(t.stop()) |
748 | 747 |
790 t = Task('CleanAndBuildGraalVisualizer') | 789 t = Task('CleanAndBuildGraalVisualizer') |
791 mx.run(['ant', '-f', join(_graal_home, 'visualizer', 'build.xml'), '-q', 'clean', 'build']) | 790 mx.run(['ant', '-f', join(_graal_home, 'visualizer', 'build.xml'), '-q', 'clean', 'build']) |
792 tasks.append(t.stop()) | 791 tasks.append(t.stop()) |
793 | 792 |
794 # Prevent Graal modifications from breaking the standard builds | 793 # Prevent Graal modifications from breaking the standard builds |
795 if args.buildNative and args.buildNonGraal: | 794 if args.buildNonGraal: |
796 t = Task('BuildHotSpotVarieties') | 795 t = Task('BuildHotSpotVarieties') |
797 buildvms(['--vms', 'client,server', '--builds', 'fastdebug,product']) | 796 buildvms(['--vms', 'client,server', '--builds', 'fastdebug,product']) |
798 tasks.append(t.stop()) | 797 tasks.append(t.stop()) |
799 | 798 |
800 for vmbuild in ['product', 'fastdebug']: | 799 for vmbuild in ['product', 'fastdebug']: |