natas_hw
/
legacy-svn-scala
mirror of https://github.com/scala/legacy-svn-scala
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleaned-up some classpath incoherences and duplications and removed the build.nsbin target which should not have existed in the first place. 

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@4664 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
dubochet 2005-10-10 18:00:07 +00:00
parent 5921937cb2
commit dc1d8bd5bf
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build.xml
View File

@ -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