diff options
| -rw-r--r-- | build.number | 4 | ||||
| -rw-r--r-- | build.xml | 46 | ||||
| -rw-r--r-- | lib/scala-compiler.jar.desired.sha1 | 2 | ||||
| -rw-r--r-- | lib/scala-library-src.jar.desired.sha1 | 2 | ||||
| -rw-r--r-- | lib/scala-library.jar.desired.sha1 | 2 |
5 files changed, 36 insertions, 20 deletions
diff --git a/build.number b/build.number index 42e74a992c..1c9db3ab15 100644 --- a/build.number +++ b/build.number @@ -1,5 +1,5 @@ #Tue Sep 11 19:21:09 CEST 2007 version.minor=6 -version.patch=0 -version.suffix=-final +version.patch=1 +version.suffix=-RC1 version.major=2 @@ -820,8 +820,6 @@ CLDC ANDROID ============================================================================ --> - <property name="dx.jar" value="${android.home}/tools/lib/dx.jar"/> - <target name="android.sources" description="Create the source directory for Android library" > @@ -843,7 +841,7 @@ ANDROID </copy> </target> - <target name="android.libraries" + <target name="android.libraries" depends="setup.quick, android.sources" description="Builds the Scala library for Android"> <fail message="Android home is not set or could not find android.jar in ${android.home}"> @@ -897,9 +895,9 @@ ANDROID </quick> </target> - <target name="android" depends="android.libraries" + <target name="android.build" depends="android.libraries" description="Convert this project's .class files into .dex files"> - <java jar="${dx.jar}" fork="true" failonerror="true"> + <java jar="${dx.jar}" fork="true" failonerror="true"> <jvmarg value="-Djava.ext.dirs=${android.home}${file.separator}tools${file.separator}lib"/> <jvmarg value="-Xmx384M"/> <arg value="--dex"/> @@ -921,6 +919,22 @@ ANDROID <!-- examples ? --> </target> + <target name="android" depends="init"> + <condition property="android.supported"> + <and> + <not><contains string="${java.version}" substring="1.4"/></not> + <contains string="${java.vendor}" substring="Sun"/> + </and> + </condition> + <if><isset property="android.supported"/><then> + <antcall target="android.build"> + <param name="dx.jar" value="${android.home}/tools/lib/dx.jar"/> + </antcall> + </then><else> + <echo message="The Android library build requires Sun Java 1.5 or newer"/> + </else></if> + </target> + <!-- =========================================================================== MSIL ============================================================================ --> @@ -1751,7 +1765,7 @@ GENERATES A DISTRIBUTION <libset dir="${dist.current.dir}/lib" includes="${lib.jar.name},${dbc.jar.name}"/> <srcset dir="${dist.current.dir}/lib" includes="${libsrc.jar.name},${dbcsrc.jar.name}"/> </quicksbaz> - <!-- Create the Scala developper package --> + <!-- Create the Scala developer package --> <quicksbaz file="${dist.dir}/scala-devel-${version.number}.sbp" adfile="${dist.dir}/scala-devel-${version.number}.advert" @@ -1812,15 +1826,17 @@ GENERATES A DISTRIBUTION <libset dir="${cldc.dir}/lib" includes="*.jar"/> </quicksbaz> <!-- Creates the Android package --> - <quicksbaz - file="${dist.dir}/scala-android-${version.number}.sbp" - adfile="${dist.dir}/scala-android-${version.number}.advert" - name="scala-android" - version="${version.number}" - desc="The Scala Android package contains everything needed to use Scala on Android." - link="${sbaz.universe}/scala-android-${version.number}.sbp"> - <libset dir="${android.dir}/lib" includes="*.jar"/> - </quicksbaz> + <if><isset property="android.supported"/> + <quicksbaz + file="${dist.dir}/scala-android-${version.number}.sbp" + adfile="${dist.dir}/scala-android-${version.number}.advert" + name="scala-android" + version="${version.number}" + desc="The Scala Android package contains everything needed to use Scala on Android." + link="${sbaz.universe}/scala-android-${version.number}.sbp"> + <libset dir="${android.dir}/lib" includes="*.jar"/> + </quicksbaz> + </if> </target> <target name="build.archive" depends="build.dist"> diff --git a/lib/scala-compiler.jar.desired.sha1 b/lib/scala-compiler.jar.desired.sha1 index c6ca82cece..ab66ea4c73 100644 --- a/lib/scala-compiler.jar.desired.sha1 +++ b/lib/scala-compiler.jar.desired.sha1 @@ -1 +1 @@ -721b29f280c60cf975a101c360246135b1af9a9f ?scala-compiler.jar +9a001a02ab50cb4648a17bdc5920c90b0c1cabb4 ?scala-compiler.jar diff --git a/lib/scala-library-src.jar.desired.sha1 b/lib/scala-library-src.jar.desired.sha1 index f92eb515ea..34232a5250 100644 --- a/lib/scala-library-src.jar.desired.sha1 +++ b/lib/scala-library-src.jar.desired.sha1 @@ -1 +1 @@ -47278c07711b765f6ecd55f9aeb5e3042342f7d4 ?scala-library-src.jar +928b22d23989689c15c7df9d824eb67994c734d4 ?scala-library-src.jar diff --git a/lib/scala-library.jar.desired.sha1 b/lib/scala-library.jar.desired.sha1 index 0a71e0b637..91287328cd 100644 --- a/lib/scala-library.jar.desired.sha1 +++ b/lib/scala-library.jar.desired.sha1 @@ -1 +1 @@ -d9c467a178885f8f63e7af9e0c114e97a514f86a ?scala-library.jar +9b27d9d6b8f71a0a78862955229f5c8b7f6091a0 ?scala-library.jar |