Mercurial > hg > truffle
comparison mxtool/mx.py @ 11205:13d0d29aa15c
Merge.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 05 Aug 2013 22:37:13 +0200 |
parents | 8ab76b7c6ff6 8ce168d68d49 |
children | d89a5dbaaaf6 |
comparison
equal
deleted
inserted
replaced
11204:f4601ec50637 | 11205:13d0d29aa15c |
---|---|
1547 argfileName = join(p.dir, 'javafilelist.txt') | 1547 argfileName = join(p.dir, 'javafilelist.txt') |
1548 argfile = open(argfileName, 'wb') | 1548 argfile = open(argfileName, 'wb') |
1549 argfile.write('\n'.join(javafilelist)) | 1549 argfile.write('\n'.join(javafilelist)) |
1550 argfile.close() | 1550 argfile.close() |
1551 | 1551 |
1552 javacArgs = [] | 1552 processorArgs = [] |
1553 if java().debug_port is not None: | |
1554 javacArgs += ['-J-Xdebug', '-J-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=' + str(java().debug_port)] | |
1555 | 1553 |
1556 ap = p.annotation_processors() | 1554 ap = p.annotation_processors() |
1557 if len(ap) > 0: | 1555 if len(ap) > 0: |
1558 processorPath = classpath(ap, resolve=True) | 1556 processorPath = classpath(ap, resolve=True) |
1559 genDir = p.source_gen_dir(); | 1557 genDir = p.source_gen_dir(); |
1560 if exists(genDir): | 1558 if exists(genDir): |
1561 shutil.rmtree(genDir) | 1559 shutil.rmtree(genDir) |
1562 os.mkdir(genDir) | 1560 os.mkdir(genDir) |
1563 javacArgs += ['-processorpath', join(processorPath), '-s', genDir] | 1561 processorArgs += ['-processorpath', join(processorPath), '-s', genDir] |
1564 else: | 1562 else: |
1565 javacArgs += ['-proc:none'] | 1563 processorArgs += ['-proc:none'] |
1566 | 1564 |
1567 toBeDeleted = [argfileName] | 1565 toBeDeleted = [argfileName] |
1568 try: | 1566 try: |
1569 compliance = str(p.javaCompliance) if p.javaCompliance is not None else args.compliance | 1567 compliance = str(p.javaCompliance) if p.javaCompliance is not None else args.compliance |
1570 if jdtJar is None: | 1568 if jdtJar is None: |
1571 log('Compiling Java sources for {0} with javac...'.format(p.name)) | 1569 log('Compiling Java sources for {0} with javac...'.format(p.name)) |
1572 javacCmd = [java().javac, '-g', '-J-Xmx1g', '-source', compliance, '-classpath', cp, '-d', outputDir] + javacArgs + ['@' + argfile.name] | 1570 |
1571 | |
1572 javacCmd = [java().javac, '-g', '-J-Xmx1g', '-source', compliance, '-classpath', cp, '-d', outputDir] | |
1573 if java().debug_port is not None: | |
1574 javacCmd += ['-J-Xdebug', '-J-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=' + str(java().debug_port)] | |
1575 javacCmd += processorArgs | |
1576 javacCmd += ['@' + argfile.name] | |
1577 | |
1573 if not args.warnAPI: | 1578 if not args.warnAPI: |
1574 javacCmd.append('-XDignore.symbol.file') | 1579 javacCmd.append('-XDignore.symbol.file') |
1575 run(javacCmd) | 1580 run(javacCmd) |
1576 else: | 1581 else: |
1577 log('Compiling Java sources for {0} with JDT...'.format(p.name)) | 1582 log('Compiling Java sources for {0} with JDT...'.format(p.name)) |
1578 jdtArgs = [java().java, '-Xmx1g', '-jar', jdtJar, | 1583 |
1584 jdtArgs = [java().java, '-Xmx1g'] | |
1585 if java().debug_port is not None: | |
1586 jdtArgs += ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=' + str(java().debug_port)] | |
1587 | |
1588 jdtArgs += [ '-jar', jdtJar, | |
1579 '-' + compliance, | 1589 '-' + compliance, |
1580 '-cp', cp, '-g', '-enableJavadoc', | 1590 '-cp', cp, '-g', '-enableJavadoc', |
1581 '-d', outputDir] + javacArgs | 1591 '-d', outputDir] |
1592 jdtArgs += processorArgs | |
1593 | |
1594 | |
1582 jdtProperties = join(p.dir, '.settings', 'org.eclipse.jdt.core.prefs') | 1595 jdtProperties = join(p.dir, '.settings', 'org.eclipse.jdt.core.prefs') |
1583 rootJdtProperties = join(p.suite.dir, 'mx', 'eclipse-settings', 'org.eclipse.jdt.core.prefs') | 1596 rootJdtProperties = join(p.suite.dir, 'mx', 'eclipse-settings', 'org.eclipse.jdt.core.prefs') |
1584 if not exists(jdtProperties) or os.path.getmtime(jdtProperties) < os.path.getmtime(rootJdtProperties): | 1597 if not exists(jdtProperties) or os.path.getmtime(jdtProperties) < os.path.getmtime(rootJdtProperties): |
1585 # Try to fix a missing properties file by running eclipseinit | 1598 # Try to fix a missing properties file by running eclipseinit |
1586 eclipseinit([], buildProcessorJars=False) | 1599 eclipseinit([], buildProcessorJars=False) |
1597 toBeDeleted.append(jdtPropertiesTmp) | 1610 toBeDeleted.append(jdtPropertiesTmp) |
1598 jdtArgs += ['-properties', jdtPropertiesTmp] | 1611 jdtArgs += ['-properties', jdtPropertiesTmp] |
1599 else: | 1612 else: |
1600 jdtArgs += ['-properties', jdtProperties] | 1613 jdtArgs += ['-properties', jdtProperties] |
1601 jdtArgs.append('@' + argfile.name) | 1614 jdtArgs.append('@' + argfile.name) |
1615 | |
1602 run(jdtArgs) | 1616 run(jdtArgs) |
1603 finally: | 1617 finally: |
1604 for n in toBeDeleted: | 1618 for n in toBeDeleted: |
1605 os.remove(n) | 1619 os.remove(n) |
1606 | 1620 |