Mercurial > hg > truffle

comparison mxtool/mx.py @ 13923:1472b8d3f142

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
abort if bad --jdt argument given to 'mx build; command
author Doug Simon <doug.simon@oracle.com>
date Tue, 11 Feb 2014 16:31:53 +0100
parents bc32c9f5719b
children 91699ee4e4fa
comparison
equal deleted inserted replaced
13922:0995dcbd6dd8 13923:1472b8d3f142
1565 1565
1566 args = parser.parse_args(args) 1566 args = parser.parse_args(args)
1567 1567
1568 jdtJar = None 1568 jdtJar = None
1569 if args.jdt is not None: 1569 if args.jdt is not None:
1570 if args.jdt.endswith('.jar'): 1570 if not args.jdt.endswith('.jar'):
1571 jdtJar = args.jdt 1571 abort('Path for Eclipse batch compiler does not look like a jar file: ' + args.jdt)
1572 if not exists(jdtJar) and os.path.abspath(jdtJar) == os.path.abspath(defaultEcjPath) and get_env('JDT', None) is None: 1572 jdtJar = args.jdt
1573 # Silently ignore JDT if default location is used but not ecj.jar exists there 1573 if not exists(jdtJar):
1574 if os.path.abspath(jdtJar) == os.path.abspath(defaultEcjPath) and get_env('JDT', None) is None:
1575 # Silently ignore JDT if default location is used but does not exist
1574 jdtJar = None 1576 jdtJar = None
1577 else:
1578 abort('Eclipse batch compiler jar does not exist: ' + args.jdt)
1575 1579
1576 built = set() 1580 built = set()
1577 1581
1578 if args.only is not None: 1582 if args.only is not None:
1579 # N.B. This build will not include dependencies including annotation processor dependencies 1583 # N.B. This build will not include dependencies including annotation processor dependencies