diff options
| author | michelou <michelou@epfl.ch> | 2005-09-02 16:50:31 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2005-09-02 16:50:31 +0000 |
| commit | 6a173f47a6c38c1902326ab05b3be9539936fbd0 (patch) | |
| tree | 0753020ef32d6f54e048ad854ffd83cbba3eb260 | |
| parent | 2c5d9fc10deb19f9e3d02bc322bc710aecb24343 (diff) | |
| download | scala-6a173f47a6c38c1902326ab05b3be9539936fbd0.tar.gz scala-6a173f47a6c38c1902326ab05b3be9539936fbd0.tar.bz2 scala-6a173f47a6c38c1902326ab05b3be9539936fbd0.zip | |
- added generation of 'nsrt.jar'.
| -rw-r--r-- | build-nsc.xml | 3 | ||||
| -rw-r--r-- | test-nsc.xml | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/build-nsc.xml b/build-nsc.xml index 7c9a4d98c9..3bd5eedca0 100644 --- a/build-nsc.xml +++ b/build-nsc.xml @@ -64,6 +64,9 @@ <delete file="${tools_util_runtime_dir}/scala/ScalaObject.class"/> <delete file="${tools_util_runtime_dir}/scala/Array.class"/> + <mkdir dir="${jars_dir}"/> + <jar destfile="${jars_dir}/nsrt.jar" basedir="${tools_util_runtime_dir}"/> + <mkdir dir="${nsc_dir}"/> <scalac srcdir="sources" destdir="${nsc_dir}" classpath="${tools_util_runtime_dir}" sourcePath="sources" force="true"> diff --git a/test-nsc.xml b/test-nsc.xml index 5fbe1eec2b..2f23e15df5 100644 --- a/test-nsc.xml +++ b/test-nsc.xml @@ -59,7 +59,7 @@ <echo>==== running nsc on predef and runtime</echo> <nsc srcdir="sources" destdir="${nsc_output_dir}" - classpath="sources:newsources:${tools_util_runtime_dir}" + classpath="sources:newsources:${nsrt_jar}" nscArgs="-nopredefs;${moreNscArgs}"> <include name="scala/Predef.scala"/> @@ -68,7 +68,7 @@ <echo>===== running nsc on the rest</echo> <nsc srcdir="sources" destdir="${nsc_output_dir}" - classpath="sources:newsources:${tools_util_runtime_dir}:${nsc_output_dir}" + classpath="sources:newsources:${nsrt_jar}:${nsc_output_dir}" nscArgs="${moreNscArgs}" force="true"> <include name="scala/**/*.scala"/> @@ -81,6 +81,8 @@ &userExcludes; </nsc> + <jar destfile="${jars_dir}/nsrt.jar" basedir="${nsc_output_dir}" update="true"/> + </target> </project> |