Skip to content

Commit

Permalink
Merge PR #263: Update to mx with support for compilation from tar ball
Browse files Browse the repository at this point in the history
  • Loading branch information
smarr authored Jul 29, 2018
2 parents 4f4f693 + 94c380a commit fd0057c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,9 @@ matrix:
export JAVA_HOME=`/usr/libexec/java_home`
allow_failures:
- env: TASK=replay1-tests
- env: TASK=replay2-tests
- env: TASK=unit-tests JDK=10
- jdk: oraclejdk9
- os: osx

install: |
if [ "$TASK" = "checkstyle" ]
Expand Down
6 changes: 3 additions & 3 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@
</target>

<target name="check-truffle-available">
<available file="${lib.dir}/truffle/.git" property="truffle.present"/>
<available file="${truffle.dir}" property="truffle.present"/>
</target>
<target name="truffle" depends="check-truffle-available"
<target name="truffle-submodule" depends="check-truffle-available"
unless="truffle.present">
<exec executable="./.gitloadmodules" failonerror="true">
</exec>
</target>

<target name="truffle-libs" unless="skip.truffle" depends="truffle,build-graal">
<target name="truffle-libs" unless="skip.truffle" depends="truffle-submodule,build-graal">
<exec executable="${mx.cmd}" dir="${truffle.dir}" failonerror="true">
<arg value="build"/>
<arg value="--no-native"/>
Expand Down
2 changes: 1 addition & 1 deletion libs/mx
Submodule mx updated 50 files
+1 −1 .pylintrc
+1 −1 .travis.yml
+100 −6 README.md
+18 −5 ci.hocon
+6 −6 docs/JMH.md
+65 −0 docs/dynamic-imports.md
+130 −0 docs/layout-distributions.md
+1 −0 eclipse-settings/org.eclipse.jdt.core.prefs
+3 −1 java/ClasspathDump.java
+3 −1 java/ListModules.java
+0 −38 java/Signal.java
+0 −35 java/SignalHandler.java
+0 −239 java/Unsafe.java
+21 −4 java/com.oracle.mxtool.checkcopy/src/com/oracle/mxtool/checkcopy/CheckCopyright.java
+60 −61 java/com.oracle.mxtool.compilerserver/.checkstyle_checks.xml
+3 −1 java/com.oracle.mxtool.compilerserver/src/com/oracle/mxtool/compilerserver/CompilerDaemon.java
+3 −1 java/com.oracle.mxtool.compilerserver/src/com/oracle/mxtool/compilerserver/ECJDaemon.java
+4 −2 java/com.oracle.mxtool.compilerserver/src/com/oracle/mxtool/compilerserver/JavacDaemon.java
+28 −6 java/com.oracle.mxtool.jacoco/src/com/oracle/mxtool/jacoco/JacocoReport.java
+5 −3 java/com.oracle.mxtool.jmh_1_21/src/com/oracle/mxtool/jmh_1_21/TestJMH_1_21.java
+60 −61 java/com.oracle.mxtool.junit/.checkstyle_checks.xml
+3 −1 java/com.oracle.mxtool.junit/src/com/oracle/mxtool/junit/AnsiTerminalDecorator.java
+3 −1 java/com.oracle.mxtool.junit/src/com/oracle/mxtool/junit/EagerStackTraceDecorator.java
+30 −7 java/com.oracle.mxtool.junit/src/com/oracle/mxtool/junit/FindClassesByAnnotatedMethods.java
+3 −1 java/com.oracle.mxtool.junit/src/com/oracle/mxtool/junit/GCAfterTestDecorator.java
+3 −1 java/com.oracle.mxtool.junit/src/com/oracle/mxtool/junit/JLModule.java
+3 −1 java/com.oracle.mxtool.junit/src/com/oracle/mxtool/junit/MxJUnitRequest.java
+4 −2 java/com.oracle.mxtool.junit/src/com/oracle/mxtool/junit/MxJUnitWrapper.java
+3 −1 java/com.oracle.mxtool.junit/src/com/oracle/mxtool/junit/MxRunListener.java
+3 −1 java/com.oracle.mxtool.junit/src/com/oracle/mxtool/junit/MxRunListenerDecorator.java
+8 −5 java/com.oracle.mxtool.junit/src/com/oracle/mxtool/junit/TestResultLoggerDecorator.java
+3 −1 java/com.oracle.mxtool.junit/src/com/oracle/mxtool/junit/TextRunListener.java
+3 −1 java/com.oracle.mxtool.junit/src/com/oracle/mxtool/junit/TimingDecorator.java
+3 −1 java/com.oracle.mxtool.junit/src/com/oracle/mxtool/junit/VerboseTextListener.java
+65 −23 mx.mx/suite.py
+2,800 −1,469 mx.py
+35 −13 mx_benchmark.py
+389 −0 mx_benchplot.py
+26 −0 mx_compat.py
+2 −1 mx_downstream.py
+20 −7 mx_findbugs.py
+13 −8 mx_gate.py
+5 −1 mx_jackpot.py
+163 −10 mx_javamodules.py
+5 −0 mx_sigtest.py
+16 −6 mx_subst.py
+27 −0 mx_tar_vcs.py
+69 −59 mx_unittest.py
+212 −0 select_jdk.py
+94 −0 tag_version.py

0 comments on commit fd0057c

Please sign in to comment.