diff options
| author | michelou <michelou@epfl.ch> | 2005-10-28 12:30:15 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2005-10-28 12:30:15 +0000 |
| commit | e4f6a2470225fdfed2f440e4515bfca4cc0729de (patch) | |
| tree | 1f1137ec82c29a8d6180318390eab99697f34247 /build.xml | |
| parent | d17278ec0b4f38f771112c956e60fc75a3c5506b (diff) | |
| download | scala-e4f6a2470225fdfed2f440e4515bfca4cc0729de.tar.gz scala-e4f6a2470225fdfed2f440e4515bfca4cc0729de.tar.bz2 scala-e4f6a2470225fdfed2f440e4515bfca4cc0729de.zip | |
- fixed nasty bug introducted by Gilles in Wind...
- fixed nasty bug introducted by Gilles in Windows distrib.
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -351,6 +351,8 @@ description="Creates a simplified Scala distribution for Windows."> <property name="distrib.win.current.dir" value="${distrib.win.dir}/${distrib.current.prefix}-${start.DSTAMP}-${start.TSTAMP}"/> + <property name="quotted.lib.dir" + value=""%SCALA_HOME%"\lib"/> <!-- Set up 'bin' directory --> <mkdir dir="${distrib.win.current.dir}/bin"/> <copy file="${bin.dir}/.scala_bat.tmpl" @@ -359,7 +361,7 @@ <filter token="PRODUCT" value="scala"/> <filter token="VERSION" value="${scala.version}"/> <filter token="COPYRIGHT" value="${copyright.notice}"/> - <filter token="BOOTCPATH" value="%SCALA_HOME%"\lib\scala.jar;%SCALA_HOME%"\lib\tools.jar"/> + <filter token="BOOTCPATH" value="${quotted.lib.dir}\scala.jar;${quotted.lib.dir}\tools.jar"/> </filterset> </copy> <copy file="${bin.dir}/.nsc_bat.tmpl" @@ -369,7 +371,7 @@ <filter token="VERSION" value="${scala.version}"/> <filter token="COPYRIGHT" value="${copyright.notice}"/> <filter token="MAIN" value="scala.tools.nsc.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}"/> + <filter token="CPATH" value="${quotted.lib.dir}\fjbg.jar;${quotted.lib.dir}\msil.jar;${quotted.lib.dir}\scala.jar;${quotted.lib.dir}\tools.jar;${quotted.lib.dir}\${osc-nstools.jar.name}"/> </filterset> </copy> <copy file="${bin.dir}/.nsc_bat.tmpl" @@ -379,7 +381,7 @@ <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}"/> + <filter token="CPATH" value="${quotted.lib.dir}\fjbg.jar;${quotted.lib.dir}\msil.jar;${quotted.lib.dir}\scala.jar;${quotted.lib.dir}\tools.jar;${quotted.lib.dir}\${osc-nstools.jar.name}"/> </filterset> </copy> <fixcrlf srcdir="${distrib.win.current.dir}/bin" eol="dos"/> |