Author: carnold
Date: Fri Feb 22 10:05:55 2008
New Revision: 630269
URL: http://svn.apache.org/viewvc?rev=630269&view=rev
Log:
LOGCXX-62: log4cxx 0.10.0 push
Modified:
logging/log4cxx/trunk/build.xml
logging/log4cxx/trunk/src/site/apt/building/ant.apt
logging/log4cxx/trunk/src/site/apt/building/xcode.apt
Modified: logging/log4cxx/trunk/build.xml
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/build.xml?rev=630269&r1=630268&r2=630269&view=diff
==============================================================================
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Fri Feb 22 10:05:55 2008
@@ -570,9 +570,11 @@
</project>
</cc>
+ <!-- copy liblog4cxx.so to log4cxx.dll for MinGW and Cygwin -->
<condition property="copy.log4cxx"
value="${log4cxx.lib.dir}/${lib.prefix}${lib.name}${lib.suffix}.dll">
<and>
- <isset property="is-mingw"/>
+ <os family="windows"/>
+ <isset property="is-gcc"/>
<equals arg1="${lib.type}" arg2="shared"/>
<isset property="log4cxx.lib.file"/>
</and>
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=630269&r1=630268&r2=630269&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/site/apt/building/ant.apt (original)
+++ logging/log4cxx/trunk/src/site/apt/building/ant.apt Fri Feb 22 10:05:55 2008
@@ -172,18 +172,13 @@
*** 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).
+ gcc 3.x does not provide wchar_t support which needs to be explicitly
disabled.
+ The Win32 path to the APR libraries need to be provided (CYGWIN_HOME/lib) if
compiling against an installed APR and APR-Util.
+-----+
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
+ -Denable-wchar_t=0
+-----+
@@ -197,9 +192,9 @@
set TOTO=wonderful
set key1=value1
set key2=value2
-..\..\..\target\release\shared\testsuite -v
-..\..\..\target\release\shared\trivial
-..\..\..\target\release\shared\stream
+..\..\..\target\debug\shared\testsuite -v
+..\..\..\target\debug\shared\trivial
+..\..\..\target\debug\shared\stream
+----+
Running "ant check" was observed to fail with unexpected exceptions
@@ -209,12 +204,12 @@
** Mac OS/X:
- APR, APR-Util and iODBC are preinstalled in Mac OS/X 10.5 and later.
+ APR, APR-Util and iODBC are preinstalled in Mac OS/X.
Site generation requires "doxygen" command on path which can be provided
by installing Doxygen.app and then setting the path like:
+---+
-setenv PATH /Applications/Doxygen.app/Content/Resources:$PATH
+setenv PATH /Applications/Doxygen.app/Contents/Resources:$PATH
+---+
Modified: logging/log4cxx/trunk/src/site/apt/building/xcode.apt
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/site/apt/building/xcode.apt?rev=630269&r1=630268&r2=630269&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/site/apt/building/xcode.apt (original)
+++ logging/log4cxx/trunk/src/site/apt/building/xcode.apt Fri Feb 22 10:05:55
2008
@@ -22,16 +22,16 @@
*Building log4cxx.dylib
- Run configure to generate log4cxx.h and log4cxx_private.h.
+ Run configure to generate log4cxx.h and log4cxx_private.h
+ then launch Xcode.
+----+
cd apache-log4cxx-0.10.0
./autogen.sh
./configure
+open projects/log4cxx.xcodeproj
+----+
- Open projects/log4cxx.xcodeproj with Xcode 2.4 or later, address issues
described below
- and build as normal.
*Running unit tests
