Skip to content

Commit cfad8df

Browse files
Thomas KarolskiThomas Karolski
Thomas Karolski
authored and
Thomas Karolski
committed
- add targets for compiling clojure systems with dx
1 parent 860d401 commit cfad8df

File tree

1 file changed

+217
-2
lines changed

1 file changed

+217
-2
lines changed

‎build.xml‎

Lines changed: 217 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<property name="test-classes" location="test-classes"/>
1717
<property name="dist" location="dist"/>
1818
<property name="android-sdk-location" location="/home/thomas/sources/android-sdk-linux_86"/>
19+
<property name="dx" location="${android-sdk-location}/platforms/android-8/tools/dx"/>
1920

2021
<!-- version related properties -->
2122
<property file="${cljsrc}/clojure/version.properties"/>
@@ -146,6 +147,218 @@
146147
<copy file="${clojure_jar}" tofile="${clojure_noversion_jar}" />
147148
</target>
148149

150+
<target name="clojure.core" depends="compile-clojure"
151+
description="Create clojure jar file for core system.">
152+
<jar jarfile="jars/clojure.core.jar">
153+
<fileset dir="${build}">
154+
<include name="clojure/asm/**/*"/>
155+
<include name="clojure/lang/**/*"/>
156+
<include name="clojure/core/**/*"/>
157+
<include name="clojure/core*.class"/>
158+
<include name="clojure/genclass*.class"/>
159+
<include name="clojure/gvec*.class"/>
160+
<include name="clojure/version.properties"/>
161+
</fileset>
162+
</jar>
163+
<apply taskname="dx" executable="${dx}" failonerror="true" parallel="false">
164+
<arg value="-JXmx2048m" />
165+
<arg value="--dex" />
166+
<arg value="--output=jars/clojure.core.dex" />
167+
<fileset dir="jars" includes="clojure.core.jar"/>
168+
</apply>
169+
</target>
170+
171+
<target name="clojure.inspector" depends="compile-clojure"
172+
description="Create clojure jar file for inspector system.">
173+
<jar jarfile="jars/clojure.inspector.jar">
174+
<fileset dir="${build}">
175+
<include name="clojure/inspector/**/*"/>
176+
<include name="clojure/inspector*.class"/>
177+
</fileset>
178+
</jar>
179+
<apply taskname="dx" executable="${dx}" failonerror="true" parallel="false">
180+
<arg value="-JXmx2048m" />
181+
<arg value="--dex" />
182+
<arg value="--output=jars/clojure.inspector.dex" />
183+
<fileset dir="jars" includes="clojure.inspector.jar"/>
184+
</apply>
185+
</target>
186+
187+
<target name="clojure.java" depends="compile-clojure"
188+
description="Create clojure jar file for java system.">
189+
<jar jarfile="jars/clojure.java.jar">
190+
<fileset dir="${build}">
191+
<include name="clojure/java/*.class"/>
192+
</fileset>
193+
</jar>
194+
<apply taskname="dx" executable="${dx}" failonerror="true" parallel="false">
195+
<arg value="-JXmx2048m" />
196+
<arg value="--dex" />
197+
<arg value="--output=jars/clojure.java.dex" />
198+
<fileset dir="jars" includes="clojure.java.jar"/>
199+
</apply>
200+
</target>
201+
202+
<target name="clojure.java.io" depends="compile-clojure"
203+
description="Create clojure jar file for java.io system.">
204+
<jar jarfile="jars/clojure.java.io.jar">
205+
<fileset dir="${build}">
206+
<include name="clojure/java/io/*.class"/>
207+
</fileset>
208+
</jar>
209+
<apply taskname="dx" executable="${dx}" failonerror="true" parallel="false">
210+
<arg value="-JXmx2048m" />
211+
<arg value="--dex" />
212+
<arg value="--output=jars/clojure.java.io.dex" />
213+
<fileset dir="jars" includes="clojure.java.io.jar"/>
214+
</apply>
215+
</target>
216+
217+
<target name="clojure.java.browse_ui" depends="compile-clojure"
218+
description="Create clojure jar file for java.browse_ui system.">
219+
<jar jarfile="jars/clojure.java.browse_ui.jar">
220+
<fileset dir="${build}">
221+
<include name="clojure/java/browse_ui/*.class"/>
222+
</fileset>
223+
</jar>
224+
<apply taskname="dx" executable="${dx}" failonerror="true" parallel="false">
225+
<arg value="-JXmx2048m" />
226+
<arg value="--dex" />
227+
<arg value="--output=jars/clojure.java.browse_ui.dex" />
228+
<fileset dir="jars" includes="clojure.java.browse_ui.jar"/>
229+
</apply>
230+
</target>
231+
232+
<target name="clojure.main" depends="compile-clojure"
233+
description="Create clojure jar file for main system.">
234+
<jar jarfile="jars/clojure.main.jar">
235+
<fileset dir="${build}">
236+
<include name="clojure/main*.class"/>
237+
</fileset>
238+
</jar>
239+
<apply taskname="dx" executable="${dx}" failonerror="true" parallel="false">
240+
<arg value="-JXmx2048m" />
241+
<arg value="--dex" />
242+
<arg value="--output=jars/clojure.main.dex" />
243+
<fileset dir="jars" includes="clojure.main.jar"/>
244+
</apply>
245+
</target>
246+
247+
<target name="clojure.pprint" depends="compile-clojure"
248+
description="Create clojure jar file for pprint system.">
249+
<jar jarfile="jars/clojure.pprint.jar">
250+
<fileset dir="${build}">
251+
<include name="clojure/pprint*.class"/>
252+
<include name="clojure/pprint/**/*.class"/>
253+
</fileset>
254+
</jar>
255+
<apply taskname="dx" executable="${dx}" failonerror="true" parallel="false">
256+
<arg value="-JXmx2048m" />
257+
<arg value="--dex" />
258+
<arg value="--output=jars/clojure.pprint.dex" />
259+
<fileset dir="jars" includes="clojure.pprint.jar"/>
260+
</apply>
261+
</target>
262+
263+
<target name="clojure.repl" depends="compile-clojure"
264+
description="Create clojure jar file for repl system.">
265+
<jar jarfile="jars/clojure.repl.jar">
266+
<fileset dir="${build}">
267+
<include name="clojure/repl*.class"/>
268+
<include name="clojure/repl/**/*.class"/>
269+
</fileset>
270+
</jar>
271+
<apply taskname="dx" executable="${dx}" failonerror="true" parallel="false">
272+
<arg value="-JXmx2048m" />
273+
<arg value="--dex" />
274+
<arg value="--output=jars/clojure.repl.dex" />
275+
<fileset dir="jars" includes="clojure.repl.jar"/>
276+
</apply>
277+
</target>
278+
279+
<target name="clojure.set" depends="compile-clojure"
280+
description="Create clojure jar file for set system.">
281+
<jar jarfile="jars/clojure.set.jar">
282+
<fileset dir="${build}">
283+
<include name="clojure/set*.class"/>
284+
<include name="clojure/set/**/*.class"/>
285+
</fileset>
286+
</jar>
287+
<apply taskname="dx" executable="${dx}" failonerror="true" parallel="false">
288+
<arg value="-JXmx2048m" />
289+
<arg value="--dex" />
290+
<arg value="--output=jars/clojure.set.dex" />
291+
<fileset dir="jars" includes="clojure.set.jar"/>
292+
</apply>
293+
</target>
294+
295+
<target name="clojure.test" depends="compile-clojure"
296+
description="Create clojure jar file for test system.">
297+
<jar jarfile="jars/clojure.test.jar">
298+
<fileset dir="${build}">
299+
<include name="clojure/test*.class"/>
300+
<include name="clojure/test/**/*.class"/>
301+
</fileset>
302+
</jar>
303+
<apply taskname="dx" executable="${dx}" failonerror="true" parallel="false">
304+
<arg value="-JXmx2048m" />
305+
<arg value="--dex" />
306+
<arg value="--output=jars/clojure.test.dex" />
307+
<fileset dir="jars" includes="clojure.test.jar"/>
308+
</apply>
309+
</target>
310+
311+
<target name="clojure.xml" depends="compile-clojure"
312+
description="Create clojure jar file for xml system.">
313+
<jar jarfile="jars/clojure.xml.jar">
314+
<fileset dir="${build}">
315+
<include name="clojure/xml*.class"/>
316+
<include name="clojure/xml/**/*.class"/>
317+
</fileset>
318+
</jar>
319+
<apply taskname="dx" executable="${dx}" failonerror="true" parallel="false">
320+
<arg value="-JXmx2048m" />
321+
<arg value="--dex" />
322+
<arg value="--output=jars/clojure.xml.dex" />
323+
<fileset dir="jars" includes="clojure.xml.jar"/>
324+
</apply>
325+
</target>
326+
327+
<target name="clojure.walk" depends="compile-clojure"
328+
description="Create clojure jar file for walk system.">
329+
<jar jarfile="jars/clojure.walk.jar">
330+
<fileset dir="${build}">
331+
<include name="clojure/walk*.class"/>
332+
<include name="clojure/walk/**/*.class"/>
333+
</fileset>
334+
</jar>
335+
<apply taskname="dx" executable="${dx}" failonerror="true" parallel="false">
336+
<arg value="-JXmx2048m" />
337+
<arg value="--dex" />
338+
<arg value="--output=jars/clojure.walk.dex" />
339+
<fileset dir="jars" includes="clojure.walk.jar"/>
340+
</apply>
341+
</target>
342+
343+
<target name="clojure.zip" depends="compile-clojure"
344+
description="Create clojure jar file for zip system.">
345+
<jar jarfile="jars/clojure.zip.jar">
346+
<fileset dir="${build}">
347+
<include name="clojure/zip*.class"/>
348+
<include name="clojure/zip/**/*.class"/>
349+
</fileset>
350+
</jar>
351+
</target>
352+
353+
<target name="clojure.all.dex" depends="clojure.system.jars"
354+
description="Create single jar with all .dex files in it.">
355+
<jar jarfile="jars/clojure-all-dex.jar">
356+
<fileset dir="jars">
357+
<include name="*.dex"/>
358+
</fileset>
359+
</jar>
360+
</target>
361+
149362
<target name="test"
150363
description="Run clojure tests"
151364
depends="compile-tests">
@@ -188,9 +401,11 @@
188401
<copy file="${src_jar}" tofile="${src_noversion_jar}" />
189402
</target>
190403

191-
<target name="jar" depends="clojure"/>
404+
<target name="clojure.system.jars" depends="clojure.core,clojure.main,clojure.set,clojure.xml,clojure.zip,clojure.inspector,clojure.walk,clojure.test,clojure.pprint,clojure.java,clojure.repl"/>
405+
406+
<target name="jar" depends="clojure,clojure.system.jars"/>
192407

193-
<target name="all" depends="clojure,clojure-slim,clojure-sources"/>
408+
<target name="all" depends="clojure,clojure-slim,clojure-sources,clojure.all.dex"/>
194409

195410
<target name="clean"
196411
description="Remove autogenerated files and directories.">

0 commit comments

Comments
 (0)