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

Modified the generation of scripts in build/ to work when linked to from a symbolic link. 

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5448 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
dubochet 2006-01-04 16:57:36 +00:00
parent b7932de1de
commit 98ec0e162b
1 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
build.xml
View File

@ -148,7 +148,7 @@ INITIALISATION
classpath="${jaco.jar}"/>
<taskdef resource="net/sf/antcontrib/antlib.xml">
<classpath>
<pathelement location="${ant-contrib.jar}" />
<pathelement location="${ant-contrib.jar}"/>
</classpath>
</taskdef>
<!-- Finding out what is available -->
@ -355,16 +355,25 @@ BUILD LOCAL REFERENCE (LOCKER) LAYER
<include name="**/*.scala"/>
<excludesfile name="${nsc.excludes}" if="excludes.avail"/>
</starr>
<!-- Link to libraries -->
<symlink link="${locker.dir}/${fjbg.name}"
resource="${fjbg.jar}"
overwrite="yes"
failonerror="no"/>
<symlink link="${locker.dir}/${msil.name}"
resource="${msil.jar}"
overwrite="yes"
failonerror="no"/>
<!-- Build executable files -->
<build.exec.unix lib.path="$$PREFIX/${lib.dir.name}"
comp.path="$$PREFIX/${comp.dir.name}"
fjbg.path="../../../lib/${fjbg.name}"
msil.path="../../../lib/${msil.name}"
fjbg.path="$$PREFIX/${fjbg.name}"
msil.path="$$PREFIX/${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}"
fjbg.path="%SCALA_HOME%\${fjbg.name}"
msil.path="%SCALA_HOME%\${msil.name}"
exec.dir="${locker.dir}\${exec.dir.name}"/>
</target>
@ -424,16 +433,25 @@ BUILD QUICK-TEST LAYER
<include name="**/*.scala"/>
<excludesfile name="${nsc.excludes}" if="excludes.avail"/>
</locker>
<!-- Link to libraries -->
<symlink link="${quick.dir}/${fjbg.name}"
resource="${fjbg.jar}"
overwrite="yes"
failonerror="no"/>
<symlink link="${quick.dir}/${msil.name}"
resource="${msil.jar}"
overwrite="yes"
failonerror="no"/>
<!-- Build executable files -->
<build.exec.unix lib.path="$$PREFIX/${lib.dir.name}"
comp.path="$$PREFIX/${comp.dir.name}"
fjbg.path="../../../lib/${fjbg.name}"
msil.path="../../../lib/${msil.name}"
fjbg.path="$$PREFIX/${fjbg.name}"
msil.path="$$PREFIX/${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}"
fjbg.path="%SCALA_HOME%\${fjbg.name}"
msil.path="%SCALA_HOME%\${msil.name}"
exec.dir="${quick.dir}\${exec.dir.name}"/>
</target>
@ -494,16 +512,25 @@ TEST
<include name="**/*.scala"/>
<excludesfile name="${nsc.excludes}" if="excludes.avail"/>
</quick>
<!-- Link to libraries -->
<symlink link="${strap.dir}/${fjbg.name}"
resource="${fjbg.jar}"
overwrite="yes"
failonerror="no"/>
<symlink link="${strap.dir}/${msil.name}"
resource="${msil.jar}"
overwrite="yes"
failonerror="no"/>
<!-- Build executable files -->
<build.exec.unix lib.path="$$$PREFIX/${lib.dir.name}"
comp.path="$$PREFIX/${comp.dir.name}"
fjbg.path="../../../lib/${fjbg.name}"
msil.path="../../../lib/${msil.name}"
fjbg.path="$$PREFIX/${fjbg.name}"
msil.path="$$PREFIX/${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}"
fjbg.path="%SCALA_HOME%\${fjbg.name}"
msil.path="%SCALA_HOME%\${msil.name}"
exec.dir="${strap.dir}\${exec.dir.name}"/>
<!-- Compares quick and test level -->
<checksum totalproperty="quick.md5">