Author: tschoening
Date: Sun Sep 7 15:01:19 2014
New Revision: 1623040
URL: http://svn.apache.org/r1623040
Log:
LOGCXX-421: We have a user who wants to build log4cxx under Windows XP, but the
current work to get C++ Builder XE 4 supported introduced a dependency on
where.exe, which is not available under Windows XP out of the box. So I had two
options: Either remove the added logic or make the use of where.exe optional. I
decided the first, because the already implemented logic already seems hard to
maintain and simply doesn't work, it looks like some changes to cpptasks is
necessary anyways. If that's the case, I could fix all problems directly in
cpptasks, which surely is easier than using ANT. And as always, no work done is
lost, we can always revert...
Removed:
incubator/log4cxx/trunk/src/ant/ilink32-workaround.xml
Modified:
incubator/log4cxx/trunk/build.xml
incubator/log4cxx/trunk/src/ant/apr-build.xml
incubator/log4cxx/trunk/src/ant/common.xml
Modified: incubator/log4cxx/trunk/build.xml
URL:
http://svn.apache.org/viewvc/incubator/log4cxx/trunk/build.xml?rev=1623040&r1=1623039&r2=1623040&view=diff
==============================================================================
--- incubator/log4cxx/trunk/build.xml (original)
+++ incubator/log4cxx/trunk/build.xml Sun Sep 7 15:01:19 2014
@@ -81,7 +81,6 @@
<!ENTITY find-apr SYSTEM 'src/ant/find-apr.xml'>
<!ENTITY find-apr-util SYSTEM 'src/ant/find-apr-util.xml'>
<!ENTITY find-libesmtp SYSTEM 'src/ant/find-libesmtp.xml'>
-<!ENTITY ilink32Workaround SYSTEM 'src/ant/ilink32-workaround.xml'>
]>
<!--
@@ -94,7 +93,6 @@
&find-apr;
&find-apr-util;
&find-libesmtp;
- &ilink32Workaround;
<property name="base.dir"
location="."
@@ -971,11 +969,6 @@
<antcall target="update-rc-files-version-info" />
- <!--
- Linking doesn't work for bcc and is implemented
manually afterwards, but because
- compiling works we don't want to unnecessary double
code and simply ignore linkage
- errors until there's a way to explicitly don't link if
bcc.
- -->
<cc name="${project.compiler}"
exceptions="true"
outfile="${log4cxx.lib.dir}/${lib.prefix}${lib.name}${lib.suffix}"
@@ -1049,7 +1042,6 @@
<dependency name="${projects.dir}/libesmtp" />
</project>
</cc>
- <antcall target="build-lib-ilink32-workaround" />
<antcall target="restore-rc-files-version-info" />
@@ -1296,7 +1288,6 @@
<dependency file="${projects.dir}/log4cxx"
depends="apr,aprutil,libesmtp" />
</project>
</cc>
- <antcall target="build-unittest-ilink32-workaround" />
</target>
<target name="build-standalone-unittest"
Modified: incubator/log4cxx/trunk/src/ant/apr-build.xml
URL:
http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/ant/apr-build.xml?rev=1623040&r1=1623039&r2=1623040&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/ant/apr-build.xml (original)
+++ incubator/log4cxx/trunk/src/ant/apr-build.xml Sun Sep 7 15:01:19 2014
@@ -18,7 +18,6 @@
-->
<!DOCTYPE project [
<!ENTITY common SYSTEM 'common.xml'>
-<!ENTITY ilink32Workaround SYSTEM 'ilink32-workaround.xml'>
<!ENTITY license '
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -43,7 +42,6 @@
<project name="apr" default="check">
&common;
-&ilink32Workaround;
<property name="src.dir"
location="${basedir}"
@@ -270,7 +268,6 @@
<comment>&license;</comment>
</project>
</cc>
- <!-- antcall target="apr-build-ilink32-workaround" /-->
<property name="apr.lib.dir"
location="${executable.dir}"
Modified: incubator/log4cxx/trunk/src/ant/common.xml
URL:
http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/ant/common.xml?rev=1623040&r1=1623039&r2=1623040&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/ant/common.xml (original)
+++ incubator/log4cxx/trunk/src/ant/common.xml Sun Sep 7 15:01:19 2014
@@ -94,20 +94,7 @@
<equals arg1="${compiler}" arg2="gcc" />
<equals arg1="${compiler}" arg2="g++" />
</or>
- </condition>
-
- <!-- LOG4CXX-421 -->
- <exec executable="where"
- outputproperty="ilink32.path"
- failonerror="false">
- <arg value="ilink32" />
- </exec>
- <propertyregex property="bcc.rootPath"
- input="${ilink32.path}"
- regexp="^(.+?)\\bin\\ilink32.exe"
- select="\1"
- casesensitive="false"
- />
+ </condition>
</target>
<target name="mac-init"
