ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jan Matèrne (jhm) <apa...@materne.de>
Subject AW: ant git commit: build.xml: undo last change as it doesnt bring the desired result
Date Fri, 27 May 2016 09:13:21 GMT
I am working on bringing the Ant-Nightly back to work.
So I am "deactivating" not (yet) working tools ...

Jan

> -----Urspr√ľngliche Nachricht-----
> Von: jhm@apache.org [mailto:jhm@apache.org]
> Gesendet: Freitag, 27. Mai 2016 10:11
> An: notifications@ant.apache.org
> Betreff: ant git commit: build.xml: undo last change as it doesnt bring
> the desired result
> 
> Repository: ant
> Updated Branches:
>   refs/heads/master 5669303f2 -> 4c903be17
> 
> 
> build.xml: undo last change as it doesnt bring the desired result
> 
> 
> Project: http://git-wip-us.apache.org/repos/asf/ant/repo
> Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/4c903be1
> Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/4c903be1
> Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/4c903be1
> 
> Branch: refs/heads/master
> Commit: 4c903be177c3c034a429cabc414f48220703565f
> Parents: 5669303
> Author: Jan MatC(rne <jhm@apache.org>
> Authored: Fri May 27 10:10:31 2016 +0200
> Committer: Jan MatC(rne <jhm@apache.org>
> Committed: Fri May 27 10:10:31 2016 +0200
> 
> ----------------------------------------------------------------------
>  build.xml | 21 ++++++++++-----------
>  1 file changed, 10 insertions(+), 11 deletions(-)
> ----------------------------------------------------------------------
> 
> 
> http://git-wip-us.apache.org/repos/asf/ant/blob/4c903be1/build.xml
> ----------------------------------------------------------------------
> diff --git a/build.xml b/build.xml
> index 32d17c8..02f6c9a 100644
> --- a/build.xml
> +++ b/build.xml
> @@ -16,7 +16,7 @@
>     See the License for the specific language governing permissions and
>     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
>         (and without typing -D on each invocation) --> @@ -100,7 +100,6
> @@
> 
> ===================================================================
>    -->
>    <property name="debug" value="true"/>
> -  <antversion property="ant1.10+" atleast="1.10"/>
>    <property name="setpermissions.fail" value="true"/>
>    <property name="deprecation" value="false"/>
>    <property name="optimize" value="true"/> @@ -913,13 +912,13 @@
>        <include name="*.pl"/>
>      </fixcrlf>
> 
> -    <setpermissions mode="755" failonerror="${setpermissions.fail}"
> if:set="ant1.10+">
> +    <setpermissions mode="755" failonerror="${setpermissions.fail}">
>        <dirset dir="${dist.dir}"/>
>      </setpermissions>
> -    <setpermissions mode="644" failonerror="${setpermissions.fail}"
> if:set="ant1.10+">
> +    <setpermissions mode="644" failonerror="${setpermissions.fail}">
>        <fileset dir="${dist.dir}"/>
>      </setpermissions>
> -    <setpermissions mode="755" failonerror="${setpermissions.fail}"
> if:set="ant1.10+">
> +    <setpermissions mode="755" failonerror="${setpermissions.fail}">
>        <fileset dir="${dist.bin}">
>          <include name="**/ant"/>
>          <include name="**/antRun"/>
> @@ -1027,13 +1026,13 @@
>        </fileset>
>      </copy>
> 
> -    <setpermissions mode="755" failonerror="${setpermissions.fail}"
> if:set="ant1.10+">
> +    <setpermissions mode="755" failonerror="${setpermissions.fail}">
>        <dirset dir="${dist.dir}"/>
>      </setpermissions>
> -    <setpermissions mode="644" failonerror="${setpermissions.fail}"
> if:set="ant1.10+">
> +    <setpermissions mode="644" failonerror="${setpermissions.fail}">
>        <fileset dir="${dist.dir}"/>
>      </setpermissions>
> -    <setpermissions mode="755" failonerror="${setpermissions.fail}"
> if:set="ant1.10+">
> +    <setpermissions mode="755" failonerror="${setpermissions.fail}">
>        <fileset dir="${dist.bin}">
>          <include name="**/ant"/>
>          <include name="**/antRun"/>
> @@ -1147,13 +1146,13 @@
>        <exclude
> name="${tests.etc.dir}/taskdefs/fixcrlf/input/Junk?.java"/>
>      </fixcrlf>
> 
> -    <setpermissions mode="755" failonerror="${setpermissions.fail}"
> if:set="ant1.10+">
> +    <setpermissions mode="755" failonerror="${setpermissions.fail}">
>        <dirset dir="${src.dist.dir}"/>
>      </setpermissions>
> -    <setpermissions mode="644" failonerror="${setpermissions.fail}"
> if:set="ant1.10+">
> +    <setpermissions mode="644" failonerror="${setpermissions.fail}">
>        <fileset dir="${src.dist.dir}"/>
>      </setpermissions>
> -    <setpermissions mode="755" failonerror="${setpermissions.fail}"
> if:set="ant1.10+">
> +    <setpermissions mode="755" failonerror="${setpermissions.fail}">
>        <fileset dir="${src.dist.dir}">
>          <include name="**/*.sh"/>
>          <include name="**/*.pl"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message