Mercurial > hg > truffle
comparison mx/commands.py @ 7552:a200d10867f1
Merge.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Thu, 24 Jan 2013 17:03:46 +0100 |
parents | a8b0476270cf 29b0768b7ba6 |
children | 3aab15f42934 |
comparison
equal
deleted
inserted
replaced
7551:68a59067974a | 7552:a200d10867f1 |
---|---|
776 if not args.cleanJava: | 776 if not args.cleanJava: |
777 cleanArgs.append('--no-java') | 777 cleanArgs.append('--no-java') |
778 clean(cleanArgs) | 778 clean(cleanArgs) |
779 tasks.append(t.stop()) | 779 tasks.append(t.stop()) |
780 | 780 |
781 eclipse_exe = os.environ.get('ECLIPSE_EXE') | |
782 if eclipse_exe is not None: | |
783 t = Task('CodeFormatCheck') | |
784 if mx.eclipseformat(['-e', eclipse_exe]) != 0: | |
785 t.abort('Formatter modified files - run "mx eclipseformat", check in changes and repush') | |
786 tasks.append(t.stop()) | |
787 | |
781 t = Task('BuildJava') | 788 t = Task('BuildJava') |
782 build(['--no-native']) | 789 build(['--no-native']) |
783 tasks.append(t.stop()) | 790 tasks.append(t.stop()) |
784 | 791 |
785 if exists('jacoco.exec'): | 792 if exists('jacoco.exec'): |