Browse Source

<setpermission> requires Ant 1.10+. For the (nightly) build it is not that important.

master
Jan Matrne 9 years ago
parent
commit
f44dd8255f
1 changed files with 11 additions and 11 deletions
  1. +11
    -11
      build.xml

+ 11
- 11
build.xml View File

@@ -16,7 +16,7 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<project name="apache-ant" default="main" basedir=".">
<project name="apache-ant" default="main" basedir="." xmlns:if="ant:if">


<!-- Give user a chance to override without editing this file <!-- Give user a chance to override without editing this file
(and without typing -D on each invocation) --> (and without typing -D on each invocation) -->
@@ -100,6 +100,7 @@
=================================================================== ===================================================================
--> -->
<property name="debug" value="true"/> <property name="debug" value="true"/>
<antversion property="ant1.10+" atleast="1.10"/>
<property name="setpermissions.fail" value="true"/> <property name="setpermissions.fail" value="true"/>
<property name="deprecation" value="false"/> <property name="deprecation" value="false"/>
<property name="optimize" value="true"/> <property name="optimize" value="true"/>
@@ -121,7 +122,6 @@
<property name="junit.collector.dir" value="${build.dir}/failingTests"/> <property name="junit.collector.dir" value="${build.dir}/failingTests"/>
<property name="junit.collector.class" value="FailedTests"/> <property name="junit.collector.class" value="FailedTests"/>



<!-- <!--
=================================================================== ===================================================================
Set the paths used in the build Set the paths used in the build
@@ -913,13 +913,13 @@
<include name="*.pl"/> <include name="*.pl"/>
</fixcrlf> </fixcrlf>


<setpermissions mode="755" failonerror="${setpermissions.fail}">
<setpermissions mode="755" failonerror="${setpermissions.fail}" if:set="ant1.10+">
<dirset dir="${dist.dir}"/> <dirset dir="${dist.dir}"/>
</setpermissions> </setpermissions>
<setpermissions mode="644" failonerror="${setpermissions.fail}">
<setpermissions mode="644" failonerror="${setpermissions.fail}" if:set="ant1.10+">
<fileset dir="${dist.dir}"/> <fileset dir="${dist.dir}"/>
</setpermissions> </setpermissions>
<setpermissions mode="755" failonerror="${setpermissions.fail}">
<setpermissions mode="755" failonerror="${setpermissions.fail}" if:set="ant1.10+">
<fileset dir="${dist.bin}"> <fileset dir="${dist.bin}">
<include name="**/ant"/> <include name="**/ant"/>
<include name="**/antRun"/> <include name="**/antRun"/>
@@ -1027,13 +1027,13 @@
</fileset> </fileset>
</copy> </copy>


<setpermissions mode="755" failonerror="${setpermissions.fail}">
<setpermissions mode="755" failonerror="${setpermissions.fail}" if:set="ant1.10+">
<dirset dir="${dist.dir}"/> <dirset dir="${dist.dir}"/>
</setpermissions> </setpermissions>
<setpermissions mode="644" failonerror="${setpermissions.fail}">
<setpermissions mode="644" failonerror="${setpermissions.fail}" if:set="ant1.10+">
<fileset dir="${dist.dir}"/> <fileset dir="${dist.dir}"/>
</setpermissions> </setpermissions>
<setpermissions mode="755" failonerror="${setpermissions.fail}">
<setpermissions mode="755" failonerror="${setpermissions.fail}" if:set="ant1.10+">
<fileset dir="${dist.bin}"> <fileset dir="${dist.bin}">
<include name="**/ant"/> <include name="**/ant"/>
<include name="**/antRun"/> <include name="**/antRun"/>
@@ -1147,13 +1147,13 @@
<exclude name="${tests.etc.dir}/taskdefs/fixcrlf/input/Junk?.java"/> <exclude name="${tests.etc.dir}/taskdefs/fixcrlf/input/Junk?.java"/>
</fixcrlf> </fixcrlf>


<setpermissions mode="755" failonerror="${setpermissions.fail}">
<setpermissions mode="755" failonerror="${setpermissions.fail}" if:set="ant1.10+">
<dirset dir="${src.dist.dir}"/> <dirset dir="${src.dist.dir}"/>
</setpermissions> </setpermissions>
<setpermissions mode="644" failonerror="${setpermissions.fail}">
<setpermissions mode="644" failonerror="${setpermissions.fail}" if:set="ant1.10+">
<fileset dir="${src.dist.dir}"/> <fileset dir="${src.dist.dir}"/>
</setpermissions> </setpermissions>
<setpermissions mode="755" failonerror="${setpermissions.fail}">
<setpermissions mode="755" failonerror="${setpermissions.fail}" if:set="ant1.10+">
<fileset dir="${src.dist.dir}"> <fileset dir="${src.dist.dir}">
<include name="**/*.sh"/> <include name="**/*.sh"/>
<include name="**/*.pl"/> <include name="**/*.pl"/>


Loading…
Cancel
Save