diff options
author | michelou <michelou@epfl.ch> | 2005-10-28 11:36:01 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2005-10-28 11:36:01 +0000 |
commit | aab12e76a34952a0bcbb2b92e6eb01c744716ee1 (patch) | |
tree | e1d6615aa37ceaa33d96e271218a87050826ad31 | |
parent | f2a21aafec3ca0faad5346e38a7e107c1021a94b (diff) | |
download | scala-aab12e76a34952a0bcbb2b92e6eb01c744716ee1.tar.gz scala-aab12e76a34952a0bcbb2b92e6eb01c744716ee1.tar.bz2 scala-aab12e76a34952a0bcbb2b92e6eb01c744716ee1.zip |
- corrected wrong path in target 'distrib.win'.
- added command 'scalap'.
- added 2nd VERSION file for Windows.
-rw-r--r-- | build.xml | 18 |
1 files changed, 16 insertions, 2 deletions
@@ -324,6 +324,8 @@ link="${distrib.unix.scala.dir}/bin/scala"/> <symlink resource="${distrib.unix.scala.dir}/bin/.nsc_wrapper" link="${distrib.unix.scala.dir}/bin/scalac"/> + <symlink resource="${distrib.unix.scala.dir}/bin/.nsc_wrapper" + link="${distrib.unix.scala.dir}/bin/scalap"/> <symlink resource="${distrib.unix.scala.dir}/bin" link="${distrib.unix.current.dir}/bin"/> <!-- Set up 'lib' directory --> @@ -370,6 +372,16 @@ <filter token="CPATH" value=""%SCALA_HOME%"\lib\fjbg.jar;"%SCALA_HOME%"\lib\msil.jar;"%SCALA_HOME%"\lib\scala.jar;%SCALA_HOME%"\lib\tools.jar;"%SCALA_HOME%"\lib\${osc-nstools.jar.name}"/> </filterset> </copy> + <copy file="${bin.dir}/.nsc_bat.tmpl" + tofile="${distrib.win.current.dir}/bin/scalap.bat"> + <filterset> + <filter token="PRODUCT" value="scalap"/> + <filter token="VERSION" value="${scala.version}"/> + <filter token="COPYRIGHT" value="${copyright.notice}"/> + <filter token="MAIN" value="scala.tools.scalap.Main"/> + <filter token="CPATH" value=""%SCALA_HOME%"\lib\fjbg.jar;"%SCALA_HOME%"\lib\msil.jar;"%SCALA_HOME%"\lib\scala.jar;%SCALA_HOME%"\lib\tools.jar;"%SCALA_HOME%"\lib\${osc-nstools.jar.name}"/> + </filterset> + </copy> <fixcrlf srcdir="${distrib.win.current.dir}/bin" eol="dos"/> <attrib readonly="true"> <fileset dir="${distrib.win.current.dir}/bin" @@ -382,8 +394,8 @@ <include name="*.jar"/> </fileset> </copy> - <copy todir="${distrib.unix.scala.dir}/lib" file="${oslib.jar}"/> - <copy todir="${distrib.unix.scala.dir}/lib" file="${ostools.jar}"/> + <copy todir="${distrib.win.scala.dir}/lib" file="${oslib.jar}"/> + <copy todir="${distrib.win.scala.dir}/lib" file="${ostools.jar}"/> <copy todir="${distrib.win.current.dir}/lib" file="${fjbg.jar}"/> <copy todir="${distrib.win.current.dir}/lib" file="${msil.jar}"/> <copy todir="${distrib.win.current.dir}/lib" file="${scala.dll}"/> @@ -461,6 +473,8 @@ <fileset dir="${basedir}" includes="LICENSE,README,VERSION"/> <fileset dir="${basedir}/sources" includes="examples/**/*.scala"/> </copy> + <copy file="${basedir}/VERSION" + tofile="${distrib.win.current.dir}/VERSION-${scala.version}"/> <fixcrlf srcdir="${distrib.win.current.dir}" eol="dos" includes="LICENSE,README,VERSION,examples/**/*.scala"/> <!-- Set up 'support' directory --> |