Browse Source

build.xml: undo last change as it doesnt bring the desired result

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

+ 10
- 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="." xmlns:if="ant:if">
<project name="apache-ant" default="main" basedir=".">


<!-- 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,7 +100,6 @@
=================================================================== ===================================================================
--> -->
<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"/>
@@ -913,13 +912,13 @@
<include name="*.pl"/> <include name="*.pl"/>
</fixcrlf> </fixcrlf>


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


<setpermissions mode="755" failonerror="${setpermissions.fail}" if:set="ant1.10+">
<setpermissions mode="755" failonerror="${setpermissions.fail}">
<dirset dir="${dist.dir}"/> <dirset dir="${dist.dir}"/>
</setpermissions> </setpermissions>
<setpermissions mode="644" failonerror="${setpermissions.fail}" if:set="ant1.10+">
<setpermissions mode="644" failonerror="${setpermissions.fail}">
<fileset dir="${dist.dir}"/> <fileset dir="${dist.dir}"/>
</setpermissions> </setpermissions>
<setpermissions mode="755" failonerror="${setpermissions.fail}" if:set="ant1.10+">
<setpermissions mode="755" failonerror="${setpermissions.fail}">
<fileset dir="${dist.bin}"> <fileset dir="${dist.bin}">
<include name="**/ant"/> <include name="**/ant"/>
<include name="**/antRun"/> <include name="**/antRun"/>
@@ -1147,13 +1146,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}" if:set="ant1.10+">
<setpermissions mode="755" failonerror="${setpermissions.fail}">
<dirset dir="${src.dist.dir}"/> <dirset dir="${src.dist.dir}"/>
</setpermissions> </setpermissions>
<setpermissions mode="644" failonerror="${setpermissions.fail}" if:set="ant1.10+">
<setpermissions mode="644" failonerror="${setpermissions.fail}">
<fileset dir="${src.dist.dir}"/> <fileset dir="${src.dist.dir}"/>
</setpermissions> </setpermissions>
<setpermissions mode="755" failonerror="${setpermissions.fail}" if:set="ant1.10+">
<setpermissions mode="755" failonerror="${setpermissions.fail}">
<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