- corrected generation of executables for Cygwin and Windows
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5406 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
michelou
parent
f73e08ee6e
commit
ad6290fab9
65
build.xml
65
build.xml
|
|
@ -36,7 +36,7 @@
|
|||
<!-- User properties -->
|
||||
<property file="${basedir}/build.properties"/>
|
||||
<!-- General properties -->
|
||||
<property name="copyright" value="(c) 2002-05 LAMP/EPFL"/>
|
||||
<property name="copyright" value="(c) 2002-06 LAMP/EPFL"/>
|
||||
<!-- NSC configuration properties -->
|
||||
<property name="nsc.logging" value="none"/>
|
||||
<property name="nsc.debug-info" value="true"/>
|
||||
|
|
@ -201,7 +201,7 @@
|
|||
<copy file="${src.dir}/${exec.dir.name}/scala.unix.tmpl"
|
||||
tofile="@{exec.dir}/scala">
|
||||
<filterset>
|
||||
<filter token="version" value="${version}"/>
|
||||
<filter token="version" value="${version.number}"/>
|
||||
<filter token="copyright" value="${copyright}"/>
|
||||
<filter token="lib.path" value="@{lib.path}"/>
|
||||
</filterset>
|
||||
|
|
@ -210,7 +210,7 @@
|
|||
<copy file="${src.dir}/${exec.dir.name}/scala-tool.unix.tmpl"
|
||||
tofile="@{exec.dir}/scalac">
|
||||
<filterset>
|
||||
<filter token="version" value="${version}"/>
|
||||
<filter token="version" value="${version.number}"/>
|
||||
<filter token="copyright" value="${copyright}"/>
|
||||
<filter token="lib.path" value="@{lib.path}"/>
|
||||
<filter token="comp.path" value="@{comp.path}"/>
|
||||
|
|
@ -220,10 +220,21 @@
|
|||
</filterset>
|
||||
</copy>
|
||||
<chmod file="@{exec.dir}/scalac" perm="ugo+rx"/>
|
||||
</sequential>
|
||||
</macrodef>
|
||||
|
||||
<macrodef name="build.exec.win">
|
||||
<attribute name="lib.path"/>
|
||||
<attribute name="comp.path"/>
|
||||
<attribute name="fjbg.path"/>
|
||||
<attribute name="msil.path"/>
|
||||
<attribute name="exec.dir"/>
|
||||
<sequential>
|
||||
<mkdir dir="@{exec.dir}"/>
|
||||
<copy file="${src.dir}/${exec.dir.name}/scala.win.tmpl"
|
||||
tofile="@{exec.dir}/scala.bat">
|
||||
<filterset>
|
||||
<filter token="version" value="${version}"/>
|
||||
<filter token="version" value="${version.number}"/>
|
||||
<filter token="copyright" value="${copyright}"/>
|
||||
<filter token="lib.path" value="@{lib.path}"/>
|
||||
</filterset>
|
||||
|
|
@ -231,7 +242,7 @@
|
|||
<copy file="${src.dir}/${exec.dir.name}/scala-tool.win.tmpl"
|
||||
tofile="@{exec.dir}/scalac.bat">
|
||||
<filterset>
|
||||
<filter token="version" value="${version}"/>
|
||||
<filter token="version" value="${version.number}"/>
|
||||
<filter token="copyright" value="${copyright}"/>
|
||||
<filter token="lib.path" value="@{lib.path}"/>
|
||||
<filter token="comp.path" value="@{comp.path}"/>
|
||||
|
|
@ -305,11 +316,16 @@
|
|||
<excludesfile name="${nsc.excludes}" if="excludes.avail"/>
|
||||
</starr>
|
||||
<!-- Build executable files -->
|
||||
<build.exec lib.path="${locker.lib.dir}"
|
||||
comp.path="${locker.comp.dir}"
|
||||
fjbg.path="${fjbg.jar}"
|
||||
msil.path="${msil.jar}"
|
||||
<build.exec lib.path="$$PREFIX/${lib.dir.name}"
|
||||
comp.path="$$PREFIX/${comp.dir.name}"
|
||||
fjbg.path="../../../lib/${fjbg.name}"
|
||||
msil.path="../../../lib/${msil.name}"
|
||||
exec.dir="${locker.dir}/${exec.dir.name}"/>
|
||||
<build.exec.win lib.path="%SCALA_HOME%\${lib.dir.name}"
|
||||
comp.path="%SCALA_HOME%\${comp.dir.name}"
|
||||
fjbg.path="..\..\..\lib\${fjbg.name}"
|
||||
msil.path="..\..\..\lib\${msil.name}"
|
||||
exec.dir="${locker.dir}\${exec.dir.name}"/>
|
||||
</target>
|
||||
|
||||
<!--
|
||||
|
|
@ -374,11 +390,16 @@
|
|||
<excludesfile name="${nsc.excludes}" if="excludes.avail"/>
|
||||
</locker>
|
||||
<!-- Build executable files -->
|
||||
<build.exec lib.path="${quick.lib.dir}"
|
||||
comp.path="${quick.comp.dir}"
|
||||
fjbg.path="${fjbg.jar}"
|
||||
msil.path="${msil.jar}"
|
||||
<build.exec lib.path="$$PREFIX/${lib.dir.name}"
|
||||
comp.path="$$PREFIX/${comp.dir.name}"
|
||||
fjbg.path="../../../lib/${fjbg.name}"
|
||||
msil.path="../../../lib/${msil.name}"
|
||||
exec.dir="${quick.dir}/${exec.dir.name}"/>
|
||||
<build.exec.win lib.path="%SCALA_HOME%\${lib.dir.name}"
|
||||
comp.path="%SCALA_HOME%\${comp.dir.name}"
|
||||
fjbg.path="..\..\..\lib\${fjbg.name}"
|
||||
msil.path="..\..\..\lib\${msil.name}"
|
||||
exec.dir="${quick.dir}\${exec.dir.name}"/>
|
||||
</target>
|
||||
|
||||
<!--
|
||||
|
|
@ -444,11 +465,16 @@
|
|||
<excludesfile name="${nsc.excludes}" if="excludes.avail"/>
|
||||
</quick>
|
||||
<!-- Build executable files -->
|
||||
<build.exec lib.path="${strap.lib.dir}"
|
||||
comp.path="${strap.comp.dir}"
|
||||
fjbg.path="${fjbg.jar}"
|
||||
msil.path="${msil.jar}"
|
||||
<build.exec lib.path="$$$PREFIX/${lib.dir.name}"
|
||||
comp.path="$$PREFIX/${comp.dir.name}"
|
||||
fjbg.path="../../../lib/${fjbg.name}"
|
||||
msil.path="../../../lib/${msil.name}"
|
||||
exec.dir="${strap.dir}/${exec.dir.name}"/>
|
||||
<build.exec.win lib.path="%SCALA_HOME%\${lib.dir.name}"
|
||||
comp.path="%SCALA_HOME%\${comp.dir.name}"
|
||||
fjbg.path="..\..\..\lib\${fjbg.name}"
|
||||
msil.path="..\..\..\lib\${msil.name}"
|
||||
exec.dir="${strap.dir}\${exec.dir.name}"/>
|
||||
<!-- Compares quick and test level -->
|
||||
<checksum totalproperty="quick.md5">
|
||||
<fileset dir="${quick.dir}">
|
||||
|
|
@ -512,6 +538,11 @@
|
|||
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"/>
|
||||
<symlink link="${dist.latest.dir}"
|
||||
resource="${dist.current.dir}"
|
||||
overwrite="yes"/>
|
||||
|
|
|
|||
Loading…
Reference in New Issue