diff options
author | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2006-01-09 17:19:23 +0000 |
---|---|---|
committer | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2006-01-09 17:19:23 +0000 |
commit | 156a21e2668e0af5bf52a55522801e2fbdfc97e4 (patch) | |
tree | d0e0ba47b7efbed51b47d0f7e534fd2e7db27645 /build.xml | |
parent | 281a73cdd54392a730a213a7976300f274c6564a (diff) | |
download | scala-156a21e2668e0af5bf52a55522801e2fbdfc97e4.tar.gz scala-156a21e2668e0af5bf52a55522801e2fbdfc97e4.tar.bz2 scala-156a21e2668e0af5bf52a55522801e2fbdfc97e4.zip |
Improved the ScalaTool Ant task to be more cros...
Improved the ScalaTool Ant task to be more cross-platform.
Diffstat (limited to 'build.xml')
-rw-r--r-- | build.xml | 53 |
1 files changed, 29 insertions, 24 deletions
@@ -65,10 +65,10 @@ PROPERTIES <property name="dist.name" value="scala"/> <property name="lib.jar.name" value="${dist.name}-${lib.dir.name}.jar"/> <property name="comp.jar.name" value="${dist.name}-${comp.dir.name}.jar"/> - <property name="scala.exec.name" value="${dist.name}"/> - <property name="scalai.exec.name" value="${dist.name}i"/> - <property name="scalac.exec.name" value="${dist.name}c"/> - <property name="scalatok.exec.name" value="${dist.name}tok"/> + <property name="scala.exec.name" value="${dist.name}2"/> + <property name="scalai.exec.name" value="${dist.name}i2"/> + <property name="scalac.exec.name" value="${dist.name}c2"/> + <property name="scalatok.exec.name" value="${dist.name}tok2"/> <!-- Shorcut names --> <property name="locker.lib.dir" value="${locker.dir}/${lib.dir.name}"/> <property name="locker.comp.dir" value="${locker.dir}/${comp.dir.name}"/> @@ -478,8 +478,8 @@ BUILD QUICK-TEST LAYER class="scala.tools.nsc.Main" version="${version.number}" copyright="${copyright}" - classpath="$$PREFIX/${lib.dir.name}:$$PREFIX/${comp.dir.name}:$$PREFIX/${fjbg.name}:$$PREFIX/${msil.name}" - properties="scala.boot.class.path=$$CP" + classpath="#PREFIX#/${lib.dir.name}:#PREFIX#/${comp.dir.name}:#PREFIX#/${fjbg.name}:#PREFIX#/${msil.name}" + properties="scala.boot.class.path=#CLASSPATH#" javaFlags="-Xmx256M -Xms16M"/> <chmod file="${quick.dir}/${exec.dir.name}/${scalac.exec.name}" perm="ugo+rx"/> @@ -558,14 +558,14 @@ TEST <!-- Build executable files --> <mkdir dir="${strap.dir}/${exec.dir.name}"/> <quicktool file="${strap.dir}/${exec.dir.name}/${scalac.exec.name}" - genericFile="${strap.dir}/${exec.dir.name}/${scala.exec.name}" - name="Scala compiler" - class="scala.tools.nsc.Main" - version="${version.number}" - copyright="${copyright}" - classpath="$$PREFIX/${lib.dir.name}:$$PREFIX/${comp.dir.name}:$$PREFIX/${fjbg.name}:$$PREFIX/${msil.name}" - properties="scala.boot.class.path=$$CP" - javaFlags="-Xmx256M -Xms16M"/> + genericFile="${strap.dir}/${exec.dir.name}/${scala.exec.name}" + name="Scala compiler" + class="scala.tools.nsc.Main" + version="${version.number}" + copyright="${copyright}" + classpath="#PREFIX#/${lib.dir.name}:#PREFIX#/${comp.dir.name}:#PREFIX#/${fjbg.name}:#PREFIX#/${msil.name}" + properties="scala.boot.class.path=#CLASSPATH#" + javaFlags="-Xmx256M -Xms16M"/> <chmod file="${strap.dir}/${exec.dir.name}/${scalac.exec.name}" perm="ugo+rx"/> <chmod file="${strap.dir}/${exec.dir.name}/${scala.exec.name}" @@ -629,16 +629,21 @@ GENERATES A DISTRIBUTION <copy file="${fjbg.jar}" todir="${dist.current.dir}/lib"/> <copy file="${msil.jar}" todir="${dist.current.dir}/lib"/> <mkdir dir="${dist.current.dir}/bin"/> - <build.exec.unix lib.path="$$PREFIX/lib/${lib.jar.name}" - comp.path="$$PREFIX/lib/${comp.jar.name}" - fjbg.path="$$PREFIX/lib/${fjbg.name}" - msil.path="$$PREFIX/lib/${msil.name}" - exec.dir="${dist.current.dir}/bin"/> - <build.exec.win lib.path="%SCALA_HOME%\lib\${lib.jar.name}" - comp.path="%SCALA_HOME%\lib\${comp.jar.name}" - fjbg.path="%SCALA_HOME%\lib\${fjbg.name}" - msil.path="%SCALA_HOME%\lib\${msil.name}" - exec.dir="${dist.current.dir}\bin"/> + <!-- Build executable files --> + <mkdir dir="${dist.current.dir}/bin"/> + <lockertool file="${dist.current.dir}/bin/${scalac.exec.name}" + genericFile="${dist.current.dir}/bin/${scala.exec.name}" + name="Scala compiler" + class="scala.tools.nsc.Main" + version="${version.number}" + copyright="${copyright}" + classpath="" + properties="scala.boot.class.path=#CLASSPATH#" + javaFlags="-Xmx256M -Xms16M"/> + <chmod file="${dist.current.dir}/bin/${scalac.exec.name}" + perm="ugo+rx"/> + <chmod file="${dist.current.dir}/bin/${scala.exec.name}" + perm="ugo+rx"/> <if><isset property="os.unix"/> <then> <symlink link="${dist.latest.dir}" |