summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@epfl.ch>2008-09-05 07:40:11 +0000
committerLukas Rytz <lukas.rytz@epfl.ch>2008-09-05 07:40:11 +0000
commitf7eccb851af9418cc41635bd25fbcd3d79e19416 (patch)
treea23ec00c85f0d1e40290fcd1e83e56e5661cdf55 /build.xml
parent12bceb22fdc5ba8295b8980aa6ca069cb74308e4 (diff)
downloadscala-f7eccb851af9418cc41635bd25fbcd3d79e19416.tar.gz
scala-f7eccb851af9418cc41635bd25fbcd3d79e19416.tar.bz2
scala-f7eccb851af9418cc41635bd25fbcd3d79e19416.zip
applied fix for #1294
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml11
1 files changed, 6 insertions, 5 deletions
diff --git a/build.xml b/build.xml
index 05f1a0e824..cc9fdcd365 100644
--- a/build.xml
+++ b/build.xml
@@ -147,10 +147,10 @@ INITIALISATION
<condition property="os.win">
<os family="windows"/>
</condition>
- <!-- Finding out SVN revision
+ <!-- Finding out SVN revision -->
<exec executable="svn" outputproperty="svn.out">
<arg line=" info ${basedir}"/>
- </exec> -->
+ </exec>
<propertyregex
property="svn.number" input="${svn.out}" select="\1"
regexp="Revision: ([0-9]+)"
@@ -603,9 +603,10 @@ PACKED QUICK BUILD (PACK)
<mkdir dir="${build-pack.dir}/lib"/>
<jar destfile="${build-pack.dir}/lib/scala-compiler.jar" manifest="${build-pack.dir}/META-INF/MANIFEST.MF">
<fileset dir="${build-quick.dir}/classes/compiler"/>
- <zipfileset src="${fjbg.jar}"/>
- <zipfileset src="${msil.jar}"/>
- <zipfileset src="${jline.jar}"/>
+ <!-- filemode / dirmode: see trac ticket #1294 -->
+ <zipfileset dirmode="755" filemode="644" src="${fjbg.jar}"/>
+ <zipfileset dirmode="755" filemode="644" src="${msil.jar}"/>
+ <zipfileset dirmode="755" filemode="644" src="${jline.jar}"/>
</jar>
</target>