You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4cxx-dev@logging.apache.org by ts...@apache.org on 2014/01/20 15:32:30 UTC
svn commit: r1559711 - in /incubator/log4cxx/trunk/src/ant: common.xml
find-apr.xml
Author: tschoening
Date: Mon Jan 20 14:32:29 2014
New Revision: 1559711
URL: http://svn.apache.org/r1559711
Log:
Fixed indentation and tried to increase readibility with a semi consistent codestyle.
Modified:
incubator/log4cxx/trunk/src/ant/common.xml
incubator/log4cxx/trunk/src/ant/find-apr.xml
Modified: incubator/log4cxx/trunk/src/ant/common.xml
URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/ant/common.xml?rev=1559711&r1=1559710&r2=1559711&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/ant/common.xml (original)
+++ incubator/log4cxx/trunk/src/ant/common.xml Mon Jan 20 14:32:29 2014
@@ -103,7 +103,6 @@
/>
</target>
-
<target name="unix-init"
depends="mac-init" if="is-unix">
<property name="compiler"
@@ -120,7 +119,6 @@
</condition>
</target>
-
<target name="common-init"
depends="win-init, unix-init">
<available classname="net.sf.antcontrib.cpptasks.CCTask"
Modified: incubator/log4cxx/trunk/src/ant/find-apr.xml
URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/ant/find-apr.xml?rev=1559711&r1=1559710&r2=1559711&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/ant/find-apr.xml (original)
+++ incubator/log4cxx/trunk/src/ant/find-apr.xml Mon Jan 20 14:32:29 2014
@@ -105,7 +105,8 @@
<condition property="apr.dir" value="/usr">
<isset property="apr.lib.file" />
</condition>
- <condition property="apr.lib.file.dir" value="/usr/lib">
+ <condition property="apr.lib.file.dir"
+ value="/usr/lib">
<isset property="apr.lib.file" />
</condition>
@@ -126,18 +127,22 @@
value="/usr/local/lib/lib${apr.lib.name}.a">
<available file="/usr/local/lib/lib${apr.lib.name}.a" />
</condition>
- <condition property="apr.dir" value="/usr/local">
+ <condition property="apr.dir"
+ value="/usr/local">
<isset property="apr.lib.file" />
</condition>
- <condition property="apr.lib.file.dir" value="/usr/local/lib">
+ <condition property="apr.lib.file.dir"
+ value="/usr/local/lib">
<isset property="apr.lib.file" />
</condition>
-
- <property name="relative-apr" location="../apr" />
- <condition property="apr.dir" value="${relative-apr}">
- <available file="${relative-apr}" />
- </condition>
+ <property name="relative-apr"
+ location="../apr"
+ />
+ <condition property="apr.dir"
+ value="${relative-apr}">
+ <available file="${relative-apr}" />
+ </condition>
<condition property="apr.lib.file"
value="${apr.dir}/lib${apr.lib.name}.la">
<available file="${apr.dir}/lib${apr.lib.name}.la" />
@@ -181,68 +186,56 @@
<condition property="apr.lib.file.dir" value="${apr.dir}/.libs">
<isset property="apr.lib.file" />
</condition>
- <fail unless="apr.dir">Unable to locate apr base directory.</fail>
-
-
+ <fail unless="apr.dir">Unable to locate apr base directory.</fail>
-
- <!-- Static debug libraries in APR's VC6 projects typical location (ignored unless debug build) -->
+ <!-- Static debug libraries in APR's VC6 projects typical location (ignored unless debug build) -->
<condition property="apr.lib.file"
- value="${apr.dir}/LibD/${apr.lib.name}.lib">
+ value="${apr.dir}/LibD/${apr.lib.name}.lib">
<and>
<isset property="is-debug" />
<available file="${apr.dir}/LibD/${apr.lib.name}.lib" />
</and>
</condition>
<condition property="apr.lib.file.dir"
- value="${apr.dir}/LibD">
- <isset property="apr.lib.file" />
+ value="${apr.dir}/LibD">
+ <isset property="apr.lib.file" />
</condition>
-
-
-
- <!-- Shared debug libraries in APR's VC6 projects typical location (ignored unless debug build) -->
+ <!-- Shared debug libraries in APR's VC6 projects typical location (ignored unless debug build) -->
<condition property="apr.lib.file"
- value="${apr.dir}/Debug/lib${apr.lib.name}.lib">
+ value="${apr.dir}/Debug/lib${apr.lib.name}.lib">
<and>
<isset property="is-debug" />
<available file="${apr.dir}/Debug/lib${apr.lib.name}.lib" />
</and>
</condition>
<condition property="apr.lib.file.dir"
- value="${apr.dir}/Debug">
- <isset property="apr.lib.file" />
+ value="${apr.dir}/Debug">
+ <isset property="apr.lib.file" />
</condition>
-
-
- <!-- Static release libraries in APR's VC6 projects typical location (ignored unless debug build) -->
+ <!-- Static release libraries in APR's VC6 projects typical location (ignored unless debug build) -->
<condition property="apr.lib.file"
- value="${apr.dir}/LibR/${apr.lib.name}.lib">
- <available file="${apr.dir}/LibR/${apr.lib.name}.lib" />
+ value="${apr.dir}/LibR/${apr.lib.name}.lib">
+ <available file="${apr.dir}/LibR/${apr.lib.name}.lib" />
</condition>
<condition property="apr.lib.file.dir"
- value="${apr.dir}/LibR">
- <isset property="apr.lib.file" />
+ value="${apr.dir}/LibR">
+ <isset property="apr.lib.file" />
</condition>
-
-
-
- <!-- Shared release libraries in APR's VC6 projects typical location -->
+ <!-- Shared release libraries in APR's VC6 projects typical location -->
<condition property="apr.lib.file"
- value="${apr.dir}/Release/lib${apr.lib.name}.lib">
- <available file="${apr.dir}/Release/lib${apr.lib.name}.lib" />
+ value="${apr.dir}/Release/lib${apr.lib.name}.lib">
+ <available file="${apr.dir}/Release/lib${apr.lib.name}.lib" />
</condition>
<condition property="apr.lib.file.dir"
- value="${apr.dir}/Release">
- <isset property="apr.lib.file" />
+ value="${apr.dir}/Release">
+ <isset property="apr.lib.file" />
</condition>
-
-
- <condition property="apr.lib.dir" value="${apr.lib.file.dir}">
+ <condition property="apr.lib.dir"
+ value="${apr.lib.file.dir}">
<and>
<isset property="apr.lib.file.dir" />
<not>
@@ -254,48 +247,70 @@
</and>
</condition>
- <condition property="apr.lib.suffix" value="d">
+ <condition property="apr.lib.suffix"
+ value="d">
<or>
- <contains string="${apr.lib.file}" substring="/lib${apr.lib.name}d." />
- <contains string="${apr.lib.file}" substring="/${apr.lib.name}d." />
+ <contains string="${apr.lib.file}"
+ substring="/lib${apr.lib.name}d."
+ />
+ <contains string="${apr.lib.file}"
+ substring="/${apr.lib.name}d."
+ />
</or>
</condition>
- <condition property="apr.lib.suffix" value="D">
+ <condition property="apr.lib.suffix"
+ value="D">
<or>
- <contains string="${apr.lib.file}" substring="/lib${apr.lib.name}D." />
- <contains string="${apr.lib.file}" substring="/${apr.lib.name}D." />
+ <contains string="${apr.lib.file}"
+ substring="/lib${apr.lib.name}D."
+ />
+ <contains string="${apr.lib.file}"
+ substring="/${apr.lib.name}D."
+ />
</or>
</condition>
- <condition property="apr.lib.suffix" value="">
+ <condition property="apr.lib.suffix"
+ value="">
<isset property="apr.lib.file" />
</condition>
- <condition property="apr.lib.prefix" value="lib">
+ <condition property="apr.lib.prefix"
+ value="lib">
<or>
- <contains string="[${apr.lib.file}]" substring="/lib${apr.lib.name}.lib]" />
+ <contains string="[${apr.lib.file}]"
+ substring="/lib${apr.lib.name}.lib]"
+ />
</or>
</condition>
- <condition property="apr.lib.prefix" value="">
+ <condition property="apr.lib.prefix"
+ value="">
<isset property="apr.lib.file" />
</condition>
- <condition property="apr.lib.type" value="shared">
+ <condition property="apr.lib.type"
+ value="shared">
<or>
- <contains string="${apr.lib.file}]"
- substring=".dylib]"
- casesensitive="no" />
- <contains string="${apr.lib.file}]"
- substring=".so]"
- casesensitive="no" />
- <contains string="${apr.lib.file}]"
- substring=".la]"
- casesensitive="no" />
+ <contains string="${apr.lib.file}]"
+ substring=".dylib]"
+ casesensitive="no"
+ />
+ <contains string="${apr.lib.file}]"
+ substring=".so]"
+ casesensitive="no"
+ />
+ <contains string="${apr.lib.file}]"
+ substring=".la]"
+ casesensitive="no"
+ />
<and>
- <!-- if we have just a .lib, guess based on file size.
- Import libs should be much smaller. -->
- <contains string="${apr.lib.file}]"
- substring=".lib]"
- casesensitive="no" />
+ <!--
+ If we have just a .lib, guess based on file size. Import libs should be much
+ smaller.
+ -->
+ <contains string="${apr.lib.file}]"
+ substring=".lib]"
+ casesensitive="no"
+ />
<isfileselected file="${apr.lib.file}">
<size value="250000" when="less" />
</isfileselected>
@@ -303,36 +318,44 @@
</or>
</condition>
-
- <condition property="apr.lib.type" value="static">
+ <condition property="apr.lib.type"
+ value="static">
<isset property="apr.lib.file" />
</condition>
</target>
-<target name="find-apr" depends="find-apr-lib">
- <!-- use character ref to prevent directory name from
- being changed on global search and replacements -->
- <condition property="apr.include.dir" value="${apr.dir}/include/apr-1.0">
- <available file="${apr.dir}/include/apr-1.0/${apr.sample.h}" />
- </condition>
- <condition property="apr.include.dir" value="${apr.dir}/include/apr-1">
- <available file="${apr.dir}/include/apr-1/${apr.sample.h}" />
- </condition>
- <condition property="apr.include.dir" value="${apr.dir}/include">
- <available file="${apr.dir}/include/${apr.sample.h}" />
- </condition>
- <condition property="apr.include.dir" value="${apr.dir}/../usr/include/apr-1">
- <available file="${apr.dir}/../usr/include/apr-1/${apr.sample.h}" />
- </condition>
- <condition property="apr.include.dir" value="${apr.src.dir}/include">
- <available file="${apr.src.dir}/include/${apr.sample.h}" />
- </condition>
+<target name="find-apr"
+ depends="find-apr-lib">
+ <!--
+ Use character ref to prevent directory name from being changed on global search and
+ replacements.
+ -->
+ <condition property="apr.include.dir"
+ value="${apr.dir}/include/apr-1.0">
+ <available file="${apr.dir}/include/apr-1.0/${apr.sample.h}" />
+ </condition>
+ <condition property="apr.include.dir"
+ value="${apr.dir}/include/apr-1">
+ <available file="${apr.dir}/include/apr-1/${apr.sample.h}" />
+ </condition>
+ <condition property="apr.include.dir"
+ value="${apr.dir}/include">
+ <available file="${apr.dir}/include/${apr.sample.h}" />
+ </condition>
+ <condition property="apr.include.dir"
+ value="${apr.dir}/../usr/include/apr-1">
+ <available file="${apr.dir}/../usr/include/apr-1/${apr.sample.h}" />
+ </condition>
+ <condition property="apr.include.dir"
+ value="${apr.src.dir}/include">
+ <available file="${apr.src.dir}/include/${apr.sample.h}" />
+ </condition>
- <condition property="apr.dir" value="${apr.src.dir}">
+ <condition property="apr.dir"
+ value="${apr.src.dir}">
<isset property="apr.src.dir" />
</condition>
-
<echo>apr-find:
apr.dir=${apr.dir}
apr.include.dir=${apr.include.dir}
@@ -343,5 +366,5 @@ apr.lib.dir=${apr.lib.dir}
apr.lib.prefix=${apr.lib.prefix}
apr.lib.suffix=${apr.lib.suffix}
apr.lib.type=${apr.lib.type}
-</echo>
+ </echo>
</target>