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/14 19:29:07 UTC

svn commit: r627825 - in /logging/log4cxx/trunk: build.xml src/ant/common.xml src/site/apt/building/ant.apt

Author: carnold
Date: Thu Feb 14 10:29:00 2008
New Revision: 627825

URL: http://svn.apache.org/viewvc?rev=627825&view=rev
Log:
LOGCXX-1: Retweaking esmtp Ant build

Modified:
    logging/log4cxx/trunk/build.xml
    logging/log4cxx/trunk/src/ant/common.xml
    logging/log4cxx/trunk/src/site/apt/building/ant.apt

Modified: logging/log4cxx/trunk/build.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/build.xml?rev=627825&r1=627824&r2=627825&view=diff
==============================================================================
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Thu Feb 14 10:29:00 2008
@@ -423,7 +423,11 @@
     <property name="esmtp.lib.type" value="static"/>
     <property name="esmtp.lib.prefix" value=""/>
     <property name="esmtp.lib.suffix" value=""/>
-   <property name="project.type" value="msvc6"/>
+    <property name="project.type" value="msvc6"/>
+    <condition property="esmtp.compiler" value="gcc">
+        <equals arg1="${compiler}" arg2="g++"/>
+    </condition>
+    <property name="esmtp.compiler" value="${compiler}"/>
 
     <ant antfile="src/ant/esmtp-build.xml" target="build" inheritAll="false">
         <property name="target.dir" value="${target.dir}"/>
@@ -431,7 +435,7 @@
         <property name="debug" value="${debug}"/>
         <property name="lib.prefix" value="${esmtp.lib.prefix}"/>
         <property name="lib.suffix" value="${esmtp.lib.suffix}"/>
-        <property name="compiler" value="${compiler}"/>
+        <property name="compiler" value="${esmtp.compiler}"/>
         <property name="lib.type" value="${esmtp.lib.type}"/>
         <property name="project.type" value="${project.type}"/>
         <property name="projects.dir" value="${projects.dir}"/>

Modified: logging/log4cxx/trunk/src/ant/common.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/common.xml?rev=627825&r1=627824&r2=627825&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/common.xml (original)
+++ logging/log4cxx/trunk/src/ant/common.xml Thu Feb 14 10:29:00 2008
@@ -70,7 +70,7 @@
 
 <target name="unix-init" depends="mac-init" if="is-unix">
 
-    <property name="compiler" value="gcc"/>
+    <property name="compiler" value="g++"/>
 
     <condition property="has-expat" value="true">
          <not><isset property="is-mac"/></not>

Modified: logging/log4cxx/trunk/src/site/apt/building/ant.apt
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/site/apt/building/ant.apt?rev=627825&r1=627824&r2=627825&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/site/apt/building/ant.apt (original)
+++ logging/log4cxx/trunk/src/site/apt/building/ant.apt Thu Feb 14 10:29:00 2008
@@ -35,8 +35,8 @@
      ant-contribs 1.0b3 or later is needed for some less frequent build targets.
 
   *Install APR and APR-Util or place source in apr and apr-util directories in same parent directory
-      as log4cxx directory.
-
+      as log4cxx directory.
+
         
    Building and testing log4cxx on a Unix platform with packaged APR and APR-Util.  
 
@@ -151,32 +151,35 @@
    Properties may also be placed in a build.properties file in the log4cxx directory.
 
 * Platform specific notes:
-
-  ** Microsoft Windows
-
-  A GNU sed command is required to be on the path to complete the unit tests.
-  Cygwin's implementation is known to work.
+
+  ** Microsoft Windows
+
+  A GNU sed command is required to be on the path to complete the unit tests.
+  Cygwin's implementation is known to work.
+  
+  If -Dwith-SMTP=libesmtp is specified, the build will attempt to build
+  libesmtp from source, unfortunately libesmtp depends on poll.h and will not build.
 
   
   *** Cygwin:
-  
-  The Ant build will successfully complete for static libary builds when started from a 
-  Windows Command Prompt.  Shared library builds will create liblog4cxx.so, but
-  the unit tests will fail reporting that they could not find the log4cxx library
-  (likely missing a step to create an import library from the .so).  From a cygwin
-  command prompt, the unit tests will fail, possibly due to an issue spawning sed.
-  Cygwin does not provide wchar_t support which needs to be explicitly disabled.
-  The location of the APR libraries need to be provided (CYGWIN_HOME/lib).
-  
-  +-----+
-  cd apache-log4cxx-0.10.0
-  ant -Dos.family=cygwin -Dwith-apr=/cygwin/lib -Dwith-apr-util=/cygwin/lib \
-      -Denable-wchar_t=0 -Dlib.type=static
-  +-----+  
-    
+  
+  The Ant build will successfully complete for static libary builds when started from a 
+  Windows Command Prompt.  Shared library builds will create liblog4cxx.so, but
+  the unit tests will fail reporting that they could not find the log4cxx library
+  (likely missing a step to create an import library from the .so).  From a cygwin
+  command prompt, the unit tests will fail, possibly due to an issue spawning sed.
+  Cygwin does not provide wchar_t support which needs to be explicitly disabled.
+  The location of the APR libraries need to be provided (CYGWIN_HOME/lib).
+  
+  +-----+
+  cd apache-log4cxx-0.10.0
+  ant -Dos.family=cygwin -Dwith-apr=/cygwin/lib -Dwith-apr-util=/cygwin/lib \
+      -Denable-wchar_t=0 -Dlib.type=static
+  +-----+  
+    
 
   *** MinGW:
-
-  ** Mac OS/X:
-  
-  APR, APR-Util and iODBC are preinstalled in Mac OS/X 10.5 and later.
+
+  ** Mac OS/X:
+  
+  APR, APR-Util and iODBC are preinstalled in Mac OS/X 10.5 and later.