diff options
| author | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2005-10-10 18:00:07 +0000 |
|---|---|---|
| committer | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2005-10-10 18:00:07 +0000 |
| commit | dd918cc2b87c9443e29f0cd4105148ad13e5c3c0 (patch) | |
| tree | f1b9348cd058d15ca2c3e6cdd558d32f3d1d3b95 /build.xml | |
| parent | c141a84b496f6317f7fee6c18ccdd2c3ce294dfb (diff) | |
| download | scala-dd918cc2b87c9443e29f0cd4105148ad13e5c3c0.tar.gz scala-dd918cc2b87c9443e29f0cd4105148ad13e5c3c0.tar.bz2 scala-dd918cc2b87c9443e29f0cd4105148ad13e5c3c0.zip | |
Cleaned-up some classpath incoherences and dupl...
Cleaned-up some classpath incoherences and duplications and removed the
build.nsbin target which should not have existed in the first place.
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 18 |
1 files changed, 2 insertions, 16 deletions
@@ -87,7 +87,7 @@ <mkdir dir="${build.nslib.dir}"/> <pico srcdir="${sources.dir}" destdir="${build.nslib.dir}" scalahack="true"> <classpath> - <pathelement location="${build.osc-nstools.dir}"/> + <pathelement location="${build.nslib.dir}"/> </classpath> <include name="scala/runtime/*.java"/> <include name="scala/runtime/**/*.java"/> @@ -106,6 +106,7 @@ <classpath> <pathelement location="${build.osc-nstools.dir}"/> <pathelement location="${oslib.jar}"/> + <pathelement location="${fjbg.jar}"/> <pathelement location="${ant.jar}"/> </classpath> <include name="scala/tools/nsc/**/*.scala"/> @@ -131,7 +132,6 @@ <pathelement location="${build.nslib.dir}"/> <pathelement location="${sources.dir}"/> <pathelement location="${newsources.dir}"/> - <pathelement location="${build.osc-nstools.dir}"/> <pathelement location="${fjbg.jar}"/> </classpath> <include name="scala/**/*.scala"/> @@ -155,20 +155,6 @@ </nsc> </target> - <target name="build.nsbin" depends="init.nsc, build.nsc.nslib" description="Builds the Scala tools (NSC and Scalap) with the new Scala compiler."> - <mkdir dir="${build.nstools.dir}"/> - <nsc srcdir="${sources.dir}" destdir="${build.nstools.dir}" excludesfile="${nsc.nstools.excludes}" stop="${nsc.stop}" skip="${nsc.skip}" check="${nsc.check}" logging="${nsc.logging}"> - <classpath> - <pathelement location="${build.nslib.dir}"/> - <pathelement location="${build.nstools.dir}"/> - <pathelement location="${fjbg.jar}"/> - <pathelement location="${ant.jar}"/> - </classpath> - <include name="scala/tools/nsc/**/*.scala"/> - <exclude name="scala/tools/nsc/ant/*.scala"/> - </nsc> - </target> - <!-- ##################################################################### DISTRIB |