Skip to content

Commit 513d339

Browse files
smarrsmarr
committed
Remove some bits from build.xml which were already ported to mx
Signed-off-by: Stefan Marr <[email protected]>
1 parent 2b56b14 commit 513d339

File tree

1 file changed

+9
-95
lines changed

1 file changed

+9
-95
lines changed

‎build.xml‎

Lines changed: 9 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -87,34 +87,12 @@ kernel: ${kernel}</echo>
8787
<available file="${truffle.dir}" type="dir" property="truffle.present"/>
8888
<available file="${jvmci.home}" type="dir" property="jvmci.home.present" />
8989

90-
<condition property="truffle.and.jvmci.present">
91-
<and>
92-
<available file="${truffle.dir}" />
93-
<available file="${jvmci.home}" />
94-
</and>
95-
</condition>
96-
9790
<target name="clean" description="Remove build directories and generated code">
9891
<delete dir="${build.dir}"/>
9992
<delete dir="${src_gen.dir}"/>
10093
<ant dir="${corelib.dir}/TestSuite/extension" useNativeBasedir="true" target="clean" inheritAll="false" />
10194
</target>
10295

103-
<target name="clean-truffle" if="truffle.and.jvmci.present">
104-
<exec executable="${mx.cmd}" dir="${vm.dir}">
105-
<arg value="--dynamicimports"/>
106-
<arg value="../substratevm,../tools,../truffle,../sdk,../compiler"/>
107-
<arg value="clean"/>
108-
<env key="JAVA_HOME" value="${jvmci.home}" />
109-
</exec>
110-
</target>
111-
112-
<target name="clobber-truffle" >
113-
<exec executable="git" dir="${lib.dir}/truffle">
114-
<arg line="clean -f -f -d -x" />
115-
</exec>
116-
</target>
117-
11896
<target name="clobber" description="Do clean, and also clean truffle build" depends="clean,clobber-truffle">
11997
<exec executable="${mx.cmd}" dir="${svm.dir}" failonerror="true" if:true="${truffle.and.jvmci.present}">
12098
<arg value="--dynamicimports"/>
@@ -128,58 +106,6 @@ kernel: ${kernel}</echo>
128106
<ant dir="${bd.dir}" useNativeBasedir="true" target="clean" inheritAll="false"/>
129107
</target>
130108

131-
<!-- libgraal-jdk also implicitly builds truffle-libs -->
132-
<target name="truffle-libs" unless="skip.truffle" depends="truffle-submodule,jvmci-libs">
133-
<exec executable="${mx.cmd}" dir="${compiler.dir}" failonerror="true">
134-
<env key="DYNAMIC_IMPORTS" value="/tools" />
135-
<env key="EXCLUDE_COMPONENTS" value="svmag,nju,nic,ni,nil,ins,dap,lsp,insight,insightheap,vvm" />
136-
<arg value="build"/>
137-
<arg value="--no-native" unless:true="${build.native}" />
138-
<env key="JAVA_HOME" value="${jvmci.home}" />
139-
</exec>
140-
</target>
141-
142-
<target name="libgraal-jdk" unless="skip.truffle" depends="truffle-submodule,jvmci-libs">
143-
<exec executable="${mx.cmd}" dir="${vm.dir}" failonerror="true">
144-
<env key="JAVA_HOME" value="${jvmci.home}" />
145-
<!-- REM: This needs to match ./som -->
146-
<env key="DYNAMIC_IMPORTS" value="/substratevm,/tools,/truffle,/sdk,/compiler" />
147-
<env key="FORCE_BASH_LAUNCHERS" value="true" />
148-
<env key="DISABLE_LIBPOLYGLOT" value="true" />
149-
<env key="EXCLUDE_COMPONENTS" value="svmag,nju,nic,ni,nil,ins,dap,lsp,insight,insightheap,vvm" />
150-
<arg line="build"/>
151-
</exec>
152-
</target>
153-
154-
<target name="bd-libs"> <!-- implicit dependency on truffle-libs/libgraal-jdk -->
155-
<ant dir="${bd.dir}" useNativeBasedir="true" target="libs-junit" inheritAll="false">
156-
</ant>
157-
<ant dir="${bd.dir}" useNativeBasedir="true" target="compile-nodeps" inheritAll="false">
158-
<property name="sdk.build" value="${sdk.build}" />
159-
<property name="truffle.dir" value="${truffle.dir}" />
160-
<property name="truffle.build" value="${truffle.build}" />
161-
</ant>
162-
</target>
163-
164-
<target name="ideinit" depends="source">
165-
<exec executable="${mx.cmd}" dir="${svm.dir}" failonerror="true">
166-
<env key="JAVA_HOME" value="${jvmci.home}" />
167-
<arg value="--dynamicimports"/>
168-
<arg value="../truffle,../tools,../compiler,../sdk"/>
169-
<arg value="eclipseinit"/>
170-
</exec>
171-
</target>
172-
173-
<target name="jvmci-libs" unless="skip.libs">
174-
<exec executable="${mx.cmd}" dir="${compiler.dir}">
175-
<arg line="fetch-jdk --jdk-id ${labs-jdk} --alias ${lib.dir}/jvmci" />
176-
</exec>
177-
</target>
178-
179-
<target name="jvmci-home">
180-
<echo>${jvmci.home}</echo>
181-
</target>
182-
183109
<target name="som-libs">
184110
<get src="${lib.url}/somns-deps-${somns-deps.version}.jar"
185111
usetimestamp="true"
@@ -190,12 +116,8 @@ kernel: ${kernel}</echo>
190116
<get src="https://repo1.maven.org/maven2/org/java-websocket/Java-WebSocket/1.5.1/Java-WebSocket-1.5.1.jar"
191117
usetimestamp="true"
192118
dest="${lib.dir}/Java-WebSocket-1.5.1.jar" />
193-
<get src="https://repo1.maven.org/maven2/net/openhft/affinity/${affinity.version}/affinity-${affinity.version}.jar"
194-
usetimestamp="true"
195-
dest="${lib.dir}/affinity.jar" />
196-
<get src="https://repo1.maven.org/maven2/net/openhft/affinity/${affinity.version}/affinity-${affinity.version}-sources.jar"
197-
usetimestamp="true"
198-
dest="${lib.dir}/affinity-sources.jar" />
119+
120+
199121
<get src="https://repo1.maven.org/maven2/org/slf4j/slf4j-api/${slf4j.version}/slf4j-api-${slf4j.version}.jar"
200122
usetimestamp="true"
201123
dest="${lib.dir}/slf4j-api.jar" />
@@ -213,14 +135,6 @@ kernel: ${kernel}</echo>
213135
dest="${lib.dir}/jna.jar" />
214136
</target>
215137

216-
<target name="libs" depends="som-libs,bd-libs" unless="skip.libs" />
217-
218-
<target name="source" description="Download Source Jars for development">
219-
<get src="${lib.url}/somns-deps-source-${somns-deps.version}.jar"
220-
usetimestamp="true"
221-
dest="${lib.dir}/somns-deps-source.jar" />
222-
</target>
223-
224138
<target name="jacoco-lib" description="Get JaCoCo dependency">
225139
<get src="https://repo1.maven.org/maven2/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip"
226140
usetimestamp="true"
@@ -285,11 +199,11 @@ kernel: ${kernel}</echo>
285199
<target name="compile-all" depends="compile,kompos" description="Build SOMns and Kompos">
286200
</target>
287201

288-
<target name="jar" depends="truffle-libs,compile-core" description="Package as JAR">
202+
<target name="jar" depends=",compile-core" description="Package as JAR">
289203
<jar destfile="${build.dir}/som.jar" basedir="${classes.dir}"></jar>
290204
</target>
291205

292-
<target name="unit-tests" depends="truffle-libs,compile-core,jacoco-lib,run-unit-tests" description="Execute tests">
206+
<target name="unit-tests" depends="compile-core,jacoco-lib,run-unit-tests" description="Execute tests">
293207
</target>
294208

295209
<target name="run-unit-tests" depends="jacoco-lib" description="Execute tests, without dependencies">
@@ -325,7 +239,7 @@ kernel: ${kernel}</echo>
325239
<fail message="Basic tests failed." if="test.failed" />
326240
</target>
327241

328-
<target name="som-tests" depends="truffle-libs,compile-core">
242+
<target name="som-tests" depends="compile-core">
329243
</target>
330244

331245
<target name="run-som-tests">
@@ -347,7 +261,7 @@ kernel: ${kernel}</echo>
347261
</exec>
348262
</target>
349263

350-
<target name="serialization-tests" depends="truffle-libs,compile-core">
264+
<target name="serialization-tests" depends="compile-core">
351265
<exec executable="./som" failonerror="true">
352266
<arg value="-G" />
353267
<arg value="-at" />
@@ -377,7 +291,7 @@ kernel: ${kernel}</echo>
377291
</exec>
378292
</target>
379293

380-
<target name="replay-tests" depends="truffle-libs,compile-core">
294+
<target name="replay-tests" depends="compile-core">
381295
<exec executable="tests/replay/test.sh" failonerror="true">
382296
<arg value="1" />
383297
</exec>
@@ -386,7 +300,7 @@ kernel: ${kernel}</echo>
386300
</exec>
387301
</target>
388302

389-
<target name="snapshot-tests" depends="truffle-libs,compile-core">
303+
<target name="snapshot-tests" depends="compile-core">
390304
<exec executable="tests/snapshot/test.sh" failonerror="true">
391305
</exec>
392306
</target>
@@ -447,7 +361,7 @@ kernel: ${kernel}</echo>
447361
<target name="tests" depends="core-tests,replay-tests,coverage">
448362
</target>
449363

450-
<target name="native-deps" depends="truffle-libs,libs,jvmci-libs,compile-svm,compile-som" />
364+
<target name="native-deps" depends="libs,compile-svm,compile-som" />
451365

452366
<target name="native" depends="native-deps,compile-native" />
453367

0 commit comments

Comments
 (0)