Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Switch to unified Truffle+Graal repo #149

Merged
merged 2 commits into from
May 11, 2017
Merged

Switch to unified Truffle+Graal repo #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29521b2
Update to united Graal repo and latest Truffle/mx
smarr May 7, 2017
26bf0d3
Remove output in test that shouldn’t have been committed
smarr May 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .factorypath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<factorypath>
<factorypathentry kind="WKSPJAR" id="/SOMns/libs/truffle/mxbuild/dists/truffle-api.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="WKSPJAR" id="/SOMns/libs/truffle/mxbuild/dists/truffle-dsl-processor.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="WKSPJAR" id="/TRUFFLE_API/truffle-api.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="WKSPJAR" id="/TRUFFLE_DSL_PROCESSOR/truffle-dsl-processor.jar" enabled="true" runInBatchMode="false"/>
</factorypath>
2 changes: 2 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
[submodule "libs/truffle"]
path = libs/truffle
url = https://github.com/smarr/Truffle.git
shallow = true
[submodule "libs/mx"]
path = libs/mx
url = https://github.com/smarr/mx.git
shallow = true
10 changes: 6 additions & 4 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
<property name="src_gen.dir" value="src_gen"/>
<property name="lib.dir" value="libs" />
<property name="kompos.dir" value="tools/kompos" />
<property name="truffle.dir" value="${lib.dir}/truffle" />
<property name="truffle.dir" value="${lib.dir}/truffle/truffle" />
<property name="truffle.build" value="${truffle.dir}/mxbuild/dists" />
<property name="somns-deps.version" value="0.3.3" />
<property name="checkstyle.version" value="7.6.1" />

<property name="mx.cmd" value="../../mx/mx" />

<property name="build.dir" value="build"/>
<property name="classes.dir" value="${build.dir}/classes"/>
Expand All @@ -31,7 +33,7 @@
</target>

<target name="clobber" description="Do clean, and also clean truffle build" depends="clean">
<exec executable="../mx/mx" dir="${truffle.dir}">
<exec executable="${mx.cmd}" dir="${truffle.dir}">
<arg value="clean"/>
</exec>
<delete dir="${kompos.dir}/out"/>
Expand All @@ -51,14 +53,14 @@
</target>

<target name="truffle-libs" unless="skip.libs" depends="truffle">
<exec executable="../mx/mx" dir="${truffle.dir}" failonerror="true">
<exec executable="${mx.cmd}" dir="${truffle.dir}" failonerror="true">
<arg value="build"/>
<arg value="--no-native"/>
</exec>
</target>

<target name="ideinit" depends="source">
<exec executable="../mx/mx" dir="${truffle.dir}" failonerror="true">
<exec executable="${mx.cmd}" dir="${truffle.dir}" failonerror="true">
<arg value="eclipseinit"/>
</exec>
</target>
Expand Down
1 change: 0 additions & 1 deletion core-lib/TestSuite/ThreadingTests.som
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ class ThreadingTests usingPlatform: platform testFramework: minitest = (
self assert: (thread name beginsWith: 'Thread(').

thread := Thread spawn: [:i | i ] with: (Array with: 1).
thread name println.
self assert: (thread name beginsWith: 'Thread(')
)

Expand Down
2 changes: 1 addition & 1 deletion libs/mx
Open in desktop
Submodule mx updated 6 files
+2 −2 ci.hocon
+4 −3 java/com.oracle.mxtool.junit/src/com/oracle/mxtool/junit/MxJUnitWrapper.java
+169 −150 mx.py
+44 −8 mx_benchmark.py
+6 −0 mx_compat.py
+171 −109 mx_gate.py
2 changes: 1 addition & 1 deletion libs/truffle
Open in desktop
Submodule truffle updated 3755 files
4 changes: 2 additions & 2 deletions som
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ else:

BOOT_CLASSPATH = ('-Xbootclasspath/a:'
+ BASE_DIR + '/build/classes:'
+ BASE_DIR + '/libs/truffle/mxbuild/dists/truffle-api.jar:'
+ BASE_DIR + '/libs/truffle/mxbuild/dists/truffle-debug.jar:'
+ BASE_DIR + '/libs/truffle/truffle/mxbuild/dists/truffle-api.jar:'
+ BASE_DIR + '/libs/truffle/truffle/mxbuild/dists/truffle-debug.jar:'
+ BASE_DIR + '/libs/somns-deps.jar')

SOM_ARGS = [BOOT_CLASSPATH, 'som.VM',
Expand Down
5 changes: 5 additions & 0 deletions tests/som/tests/TruffleSomTCK.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,4 +318,9 @@ public void testNull() throws Exception { }
@Override
@Ignore("todo: remove override")
public void testNullCanBeCastToAnything() throws Exception { }

@Test
@Override
@Ignore("todo: remove override")
public void testObjectWithKeyInfoAttributes() throws Exception { }
}