summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2007-11-26 12:25:03 +0000
committermichelou <michelou@epfl.ch>2007-11-26 12:25:03 +0000
commit639adcce01aeef1d8161b2e6f3bf0fad16928f15 (patch)
tree327197fad80f2fa504e016e26c20d920bfd82bf3 /build.xml
parent50a757c94708bba01a60a911d95ba4c6dd2db22c (diff)
downloadscala-639adcce01aeef1d8161b2e6f3bf0fad16928f15.tar.gz
scala-639adcce01aeef1d8161b2e6f3bf0fad16928f15.tar.bz2
scala-639adcce01aeef1d8161b2e6f3bf0fad16928f15.zip
Fixed runtime.StringAdd for MSIL and CLDC
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml29
1 files changed, 29 insertions, 0 deletions
diff --git a/build.xml b/build.xml
index aeec0900cd..01c42e6919 100644
--- a/build.xml
+++ b/build.xml
@@ -849,6 +849,13 @@ ANDROID
<include name="**/*.java"/>
</javac>
+ <javac
+ srcdir="${android.dir}/src"
+ destdir="${android.dir}"
+ source="1.4" target="1.4" deprecation="yes"
+ classpath="${android.dir}"
+ includes="**/*.java"
+ />
<quick
srcdir="${android.dir}/src"
destdir="${android.dir}/lib/library"
@@ -882,6 +889,28 @@ ANDROID
</quick>
</target>
+ <target name="dex" depends="android.lib"
+ description="Convert this project's .class files into .dex files">
+ <exec executable="${android.home}/tools/dx" failonerror="false">
+ <arg value="-JXmx384M"/>
+ <arg value="--dex"/>
+ <arg value="--output=${android.dir}/classes.dex"/>
+ <arg value="--locals=full"/>
+ <arg value="--positions=lines"/>
+ <arg path="${android.dir}"/>
+ </exec>
+ <jar
+ destfile="${android.dir}/scala.jar"
+ basedir="${android.dir}"
+ includes="classes.dex"
+ />
+ <jar
+ destfile="${android.dir}/scala-library.jar"
+ basedir="${android.dir}"
+ includes="scala/**/*.class"
+ />
+ </target>
+
<!-- ===========================================================================
MSIL
============================================================================ -->