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 ca...@apache.org on 2008/02/03 22:53:32 UTC
svn commit: r618100 - in /logging/log4cxx/trunk: build.xml
src/ant/apr-build.xml src/ant/apr-util-build.xml src/ant/common.xml
Author: carnold
Date: Sun Feb 3 13:53:30 2008
New Revision: 618100
URL: http://svn.apache.org/viewvc?rev=618100&view=rev
Log:
LOGCXX-230: Add dependencies to generated project files (requires rev 148 of cpptasks)
Modified:
logging/log4cxx/trunk/build.xml
logging/log4cxx/trunk/src/ant/apr-build.xml
logging/log4cxx/trunk/src/ant/apr-util-build.xml
logging/log4cxx/trunk/src/ant/common.xml
Modified: logging/log4cxx/trunk/build.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/build.xml?rev=618100&r1=618099&r2=618100&view=diff
==============================================================================
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Sun Feb 3 13:53:30 2008
@@ -515,7 +515,10 @@
<defineset define="WIN32" if="is-windows"/>
<compilerarg value="${pic-option}" if="pic-option"/>
&libsets;
- <project type="${project.type}" outfile="${projects.dir}/${lib.name}" if="project.if"/>
+ <project type="${project.type}" outfile="${projects.dir}/${lib.name}" if="project.if">
+ <dependency file="${projects.dir}/apr-1"/>
+ <dependency file="${projects.dir}/aprutil-1" depends="apr-1"/>
+ </project>
</cc>
</target>
@@ -548,7 +551,12 @@
<libset libs="${lib.prefix}${lib.name}${lib.suffix}" dir="${log4cxx.lib.dir}"/>
&libsets;
- <project outfile="${projects.dir}/${example.name}" type="${project.type}" if="project.if"/>
+ <project outfile="${projects.dir}/${example.name}" type="${project.type}" if="project.if">
+ <dependency file="${projects.dir}/apr-1"/>
+ <dependency name="${projects.dir}/aprutil-1"/>
+ <dependency file="${projects.dir}/log4cxx" depends="apr-1,aprutil-1"/>
+ </project>
+
</cc>
</target>
@@ -645,7 +653,11 @@
<libset libs="dl" if="is-unix"/>
&libsets;
- <project outfile="${projects.dir}/testsuite" type="${project.type}" if="project.if"/>
+ <project outfile="${projects.dir}/testsuite" type="${project.type}" if="project.if">
+ <dependency file="${projects.dir}/apr-1"/>
+ <dependency file="${projects.dir}/aprutil-1" depends="apr-1"/>
+ <dependency file="${projects.dir}/log4cxx" depends="apr-1,aprutil-1"/>
+ </project>
</cc>
</target>
@@ -653,7 +665,8 @@
<target name="build-standalone-unittest"
- description="Builds a unit tests + log4cxx executable">
+ description="Builds a unit tests + log4cxx executable"
+ depends="build-apr-util,configure">
<mkdir dir="${executable.dir}/static/testsuite-standalone_obj"/>
<property name="project.compiler" value="${compiler}"/>
<property name="project.type" value="msvc6"/>
@@ -689,7 +702,10 @@
<project outfile="${projects.dir}/testsuite-standalone"
type="${project.type}"
- if="project.if"/>
+ if="project.if">
+ <dependency file="${projects.dir}/apr-1"/>
+ <dependency file="${projects.dir}/aprutil-1" depends="apr-1"/>
+ </project>
</cc>
</target>
@@ -864,35 +880,33 @@
<target name="build-projects">
<mkdir dir="${projects.dir}"/>
<property name="project.type" value="msvc6"/>
- <antcall target="build">
- <param name="project.if" value="true"/>
- <param name="project.type" value="${project.type}"/>
- <param name="project.compiler" value="${project.compiler}"/>
- <param name="projectsOnly" value="true"/>
- </antcall>
<antcall target="build-unittest">
<param name="project.if" value="true"/>
<param name="project.type" value="${project.type}"/>
<param name="project.compiler" value="${project.compiler}"/>
<param name="projectsOnly" value="true"/>
+ <param name="os.family" value="${os.family}"/>
</antcall>
<antcall target="build-standalone-unittest">
<param name="project.if" value="true"/>
<param name="project.type" value="${project.type}"/>
<param name="project.compiler" value="${project.compiler}"/>
<param name="projectsOnly" value="true"/>
+ <param name="os.family" value="${os.family}"/>
</antcall>
<antcall target="build-examples">
<param name="project.if" value="true"/>
<param name="project.type" value="${project.type}"/>
<param name="project.compiler" value="${project.compiler}"/>
<param name="projectsOnly" value="true"/>
+ <param name="os.family" value="${os.family}"/>
</antcall>
<antcall target="build-performance">
<param name="project.if" value="true"/>
<param name="project.type" value="${project.type}"/>
<param name="project.compiler" value="${project.compiler}"/>
<param name="projectsOnly" value="true"/>
+ <param name="os.family" value="${os.family}"/>
</antcall>
</target>
@@ -901,6 +915,7 @@
<antcall target="build-projects">
<param name="project.type" value="msvc6"/>
<param name="project.compiler" value="msvc"/>
+ <param name="os.family" value="windows"/>
</antcall>
</target>
@@ -909,6 +924,7 @@
<antcall target="build-projects">
<param name="project.type" value="msvc8"/>
<param name="project.compiler" value="msvc"/>
+ <param name="os.family" value="windows"/>
</antcall>
</target>
@@ -917,6 +933,7 @@
<antcall target="build-projects">
<param name="project.type" value="xcode"/>
<param name="project.compiler" value="g++"/>
+ <param name="os.family" value="mac"/>
</antcall>
</target>
Modified: logging/log4cxx/trunk/src/ant/apr-build.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/apr-build.xml?rev=618100&r1=618099&r2=618100&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/apr-build.xml (original)
+++ logging/log4cxx/trunk/src/ant/apr-build.xml Sun Feb 3 13:53:30 2008
@@ -70,13 +70,10 @@
<target name="init" depends="common-init">
- <condition property="arch" value="unix">
- <isset property="is-unix"/>
- </condition>
<condition property="arch" value="win32">
<isset property="is-windows"/>
</condition>
-
+ <property name="arch" value="unix"/>
</target>
<target name="configure" depends="init, unix-configure, win-configure"/>
@@ -387,6 +384,7 @@
<param name="project.compiler" value="${project.compiler}"/>
<param name="projects.dir" value="${projects.dir}"/>
<param name="projectsOnly" value="true"/>
+ <param name="arch" value="${arch}"/>
</antcall>
<antcall target="build-check">
<param name="project.if" value="true"/>
@@ -394,6 +392,7 @@
<param name="project.compiler" value="${project.compiler}"/>
<param name="projects.dir" value="${projects.dir}"/>
<param name="projectsOnly" value="true"/>
+ <param name="arch" value="${arch}"/>
</antcall>
</target>
@@ -402,14 +401,16 @@
<antcall target="build-projects">
<param name="project.type" value="msvc6"/>
<param name="project.compiler" value="msvc"/>
+ <param name="arch" value="win32"/>
</antcall>
</target>
<target name="build-projects-vc8" depends="init"
description="Builds project files for Microsoft Visual C++ 2005">
<antcall target="build-projects">
- <param name="project.type" value="msvc8"/>
- <param name="project.compiler" value="msvc"/>
+ <param name="project.type" value="msvc8"/>
+ <param name="project.compiler" value="msvc"/>
+ <param name="arch" value="win32"/>
</antcall>
</target>
@@ -418,6 +419,7 @@
<antcall target="build-projects">
<param name="project.type" value="xcode"/>
<param name="project.compiler" value="${compiler}"/>
+ <param name="arch" value="unix"/>
</antcall>
</target>
Modified: logging/log4cxx/trunk/src/ant/apr-util-build.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/apr-util-build.xml?rev=618100&r1=618099&r2=618100&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/apr-util-build.xml (original)
+++ logging/log4cxx/trunk/src/ant/apr-util-build.xml Sun Feb 3 13:53:30 2008
@@ -45,6 +45,10 @@
</target>
<target name="init" depends="common-init">
+ <condition property="arch" value="win32">
+ <isset property="is-windows"/>
+ </condition>
+ <property name="arch" value="unix"/>
</target>
<target name="clean" description="Deletes build products">
@@ -160,7 +164,9 @@
<defineset if="is-bcc">
<define name="EILSEQ" value="50"/>
</defineset>
- <project type="${project.type}" outfile="${projects.dir}/aprutil-1" if="project.if"/>
+ <project type="${project.type}" outfile="${projects.dir}/aprutil-1" if="project.if">
+ <dependency file="${projects.dir}/apr-1"/>
+ </project>
</cc>
<property name="apr.lib.dir" location="${executable.dir}"/>
</target>
@@ -194,7 +200,10 @@
<libset libs="pthread dl" if="is-unix"/>
<libset libs="iconv" if="has-iconv"/>
<libset libs="sqlite3" if="has-sqlite3"/>
- <project type="${project.type}" outfile="${projects.dir}/${test}" if="project.if"/>
+ <project type="${project.type}" outfile="${projects.dir}/${test}" if="project.if">
+ <dependency file="${projects.dir}/apr-1"/>
+ <dependency file="${projects.dir}/aprutil-1" depends="apr-1"/>
+ </project>
</cc>
</target>
Modified: logging/log4cxx/trunk/src/ant/common.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/common.xml?rev=618100&r1=618099&r2=618100&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/common.xml (original)
+++ logging/log4cxx/trunk/src/ant/common.xml Sun Feb 3 13:53:30 2008
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--->
+-->
<property file="build.properties"/>
<property name="debug" value="true"/>
@@ -26,36 +26,26 @@
<typedef resource="cpptasks.types"/>
<target name="os-detect">
- <condition property="is-mac" value="true">
- <and>
- <os family="mac"/>
- <not><isset property="is-windows"/></not>
- </and>
- </condition>
- <condition property="is-unix" value="true">
- <or>
- <isset property="is-mac"/>
- <equals arg1="${os.family}" arg2="cygwin"/>
- <and>
- <os family="unix"/>
- <not><isset property="is-windows"/></not>
- </and>
- </or>
- </condition>
- <condition property="is-windows" value="true">
- <and>
- <os family="windows"/>
- <not><isset property="is-unix"/></not>
- </and>
+ <condition property="os.family" value="mac">
+ <os family="mac"/>
</condition>
<condition property="os.family" value="windows">
- <isset property="is-windows"/>
+ <os family="windows"/>
</condition>
- <condition property="os.family" value="unix">
- <isset property="is-unix"/>
+ <property name="os.family" value="unix"/>
+ <condition property="is-mac" value="1">
+ <equals arg1="${os.family}" arg2="mac"/>
+ </condition>
+ <condition property="is-windows" value="1">
+ <equals arg1="${os.family}" arg2="windows"/>
+ </condition>
+ <condition property="is-unix" value="1">
+ <or>
+ <equals arg1="${os.family}" arg2="unix"/>
+ <equals arg1="${os.family}" arg2="mac"/>
+ <equals arg1="${os.family}" arg2="cygwin"/>
+ </or>
</condition>
-
-
</target>
@@ -137,14 +127,14 @@
<isset property="is-debug"/>
</condition>
<property name="D.debug" value=""/>
-
- <condition property="D.R" value="d">
- <isset property="is-debug"/>
- </condition>
- <property name="D.R" value="r"/>
-
- <property name="lib-suffix" value=""/>
+ <condition property="D.R" value="d">
+ <isset property="is-debug"/>
+ </condition>
+ <property name="D.R" value="r"/>
+
+
+ <property name="lib-suffix" value=""/>
<condition property="is-static" value="1">
<equals arg1="${lib.type}" arg2="static"/>
@@ -156,13 +146,13 @@
<property name="executable.dir" value="${target.dir}/${debug.release}/${lib.type}"/>
<property name="projectsOnly" value="false"/>
-
- <property name="apr.lib.name" value="apr-1"/>
+
+ <property name="apr.lib.name" value="apr-1"/>
<property name="apr.sample.h" value="apr_pools.h"/>
- <property name="apr.sample.c" value="file_io/unix/dir.c"/>
- <property name="apr-util.lib.name" value="aprutil-1"/>
- <property name="apr-util.sample.h" value="apr_xml.h"/>
- <property name="apr-util.sample.c" value="xml/apr_xml.c"/>
+ <property name="apr.sample.c" value="file_io/unix/dir.c"/>
+ <property name="apr-util.lib.name" value="aprutil-1"/>
+ <property name="apr-util.sample.h" value="apr_xml.h"/>
+ <property name="apr-util.sample.c" value="xml/apr_xml.c"/>
</target>