Some windows oriented fixes for build.xml. No review.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21123 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
parent
7678303e15
commit
cdba29c6f3
|
@ -234,7 +234,7 @@ INITIALISATION
|
||||||
<equals arg1="${svn.number.svn}" arg2="0" />
|
<equals arg1="${svn.number.svn}" arg2="0" />
|
||||||
<then>
|
<then>
|
||||||
<!-- Finding SVN revision, git style -->
|
<!-- Finding SVN revision, git style -->
|
||||||
<exec executable="tools/git-get-rev" outputproperty="svn.number.git" failifexecutionfails="false" />
|
<exec osfamily="unix" executable="tools/git-get-rev" outputproperty="svn.number.git" failifexecutionfails="false" />
|
||||||
<propertyregex
|
<propertyregex
|
||||||
property="svn.number" input="${svn.number.git}" select="\1"
|
property="svn.number" input="${svn.number.git}" select="\1"
|
||||||
regexp="\D*?(\d+)"
|
regexp="\D*?(\d+)"
|
||||||
|
@ -874,7 +874,7 @@ PACKED QUICK BUILD (PACK)
|
||||||
<chmod perm="ugo+rx" file="${build-pack.dir}/bin/scalap"/>
|
<chmod perm="ugo+rx" file="${build-pack.dir}/bin/scalap"/>
|
||||||
|
|
||||||
<mkdir dir="${build-pack.dir}/etc"/>
|
<mkdir dir="${build-pack.dir}/etc"/>
|
||||||
<exec executable="${build-pack.dir}/bin/scala" output="${build-pack.dir}/etc/scala_completion.sh" failifexecutionfails="false" >
|
<exec osfamily="unix" executable="${build-pack.dir}/bin/scala" output="${build-pack.dir}/etc/scala_completion.sh" failifexecutionfails="false" >
|
||||||
<arg line="scala.tools.util.BashCompletion" />
|
<arg line="scala.tools.util.BashCompletion" />
|
||||||
</exec>
|
</exec>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue