diff options
| author | michelou <michelou@epfl.ch> | 2005-10-10 16:44:30 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2005-10-10 16:44:30 +0000 |
| commit | 082ab859acf79646a696be4d981e39f69cd587ed (patch) | |
| tree | fbe74019b5bc656e337e140dbfe24941cf2264ce | |
| parent | 36795d2e4ce446eb7ccd8c7d32a1aa6a320f499f (diff) | |
| download | scala-082ab859acf79646a696be4d981e39f69cd587ed.tar.gz scala-082ab859acf79646a696be4d981e39f69cd587ed.tar.bz2 scala-082ab859acf79646a696be4d981e39f69cd587ed.zip | |
- added Ant dependency.
| -rw-r--r-- | ant-build-nsc.bat | 2 | ||||
| -rwxr-xr-x | ant-build-nsc.sh | 2 | ||||
| -rw-r--r-- | build-nsc.xml | 8 |
3 files changed, 9 insertions, 3 deletions
diff --git a/ant-build-nsc.bat b/ant-build-nsc.bat index 0261879732..863ac308bb 100644 --- a/ant-build-nsc.bat +++ b/ant-build-nsc.bat @@ -21,7 +21,7 @@ call ant-common.bat build-nsc rem ########################################################################## rem # ant build -set CLASSPATH=%nsc_fjbg_jar%;%nsc_scala_jar%;%nsc_tools_jar%;%nsc_jaco_jar% +set CLASSPATH=%nsc_fjbg_jar%;%nsc_scala_jar%;%nsc_tools_jar%;%nsc_jaco_jar%;%nsc_ant_jar% %_ANTCMD% -Dplatform=win -f %ANT_BUILDFILE% %_ANTCMD_ARGS% %RM% %ANT_BUILDFILE% diff --git a/ant-build-nsc.sh b/ant-build-nsc.sh index b0aeb854f6..43550f7832 100755 --- a/ant-build-nsc.sh +++ b/ant-build-nsc.sh @@ -9,7 +9,7 @@ ############################################################################## # ant build -CLASSPATH=$nsc_fjbg_jar:$nsc_scala_jar:$nsc_tools_jar:$nsc_jaco_jar +CLASSPATH=$nsc_fjbg_jar:$nsc_scala_jar:$nsc_tools_jar:$nsc_jaco_jar:$nsc_ant_jar PLATFORM=unix # For Cygwin, switch paths to appropriate format before running ant diff --git a/build-nsc.xml b/build-nsc.xml index 2ebfa48c56..95b5a9d630 100644 --- a/build-nsc.xml +++ b/build-nsc.xml @@ -54,6 +54,11 @@ Missing library file ${nsc.jaco_jar}. Check your property file build-nsc.properties.${platform}. </fail> + <fail> + <condition><not><available file="${nsc.ant_jar}" /></not></condition> + Missing library file ${nsc.ant_jar}. + Check your property file build-nsc.properties.${platform}. + </fail> </target> <target name="init" depends="check.env"> @@ -89,7 +94,8 @@ <jar destfile="${nsc.nsrt_jar}" basedir="${nsc.tools_util_runtime_dir}"/> <scalac srcdir="sources" destdir="${nsc.nsc_dir}" debug="on" - classpath="${nsc.tools_util_runtime_dir}:${nsc.fjbg_jar}" sourcePath="sources" force="true"> + classpath="${nsc.tools_util_runtime_dir}:${nsc.fjbg_jar}:${nsc.ant_jar}" + sourcePath="sources" force="true"> <!-- force = "true" always recompiles all source files, because scalac does not always go find the latest source file (*3) --> |