Author: carnold
Date: Mon Feb 25 22:33:57 2008
New Revision: 631104
URL: http://svn.apache.org/viewvc?rev=631104&view=rev
Log:
LOGCXX-62: Simplify XCode projects
Modified:
logging/log4cxx/trunk/build.xml
logging/log4cxx/trunk/src/site/apt/building/ant.apt
logging/log4cxx/trunk/src/site/apt/building/autotools.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=631104&r1=631103&r2=631104&view=diff
==============================================================================
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Mon Feb 25 22:33:57 2008
@@ -1136,6 +1136,9 @@
<replace dir="${target.dir}" includes="**/*.pbxproj"
token="/usr/include/apr-1.0"
value="/usr/include/apr-1"/>
+ <replace dir="${target.dir}" includes="**/*.pbxproj"
+ token="MacOSX10.4u.sdk"
+ value="MacOSX10.5.sdk"/>
<replace dir="${target.dir}/site" includes="**/*.html">
<replacetoken><html</replacetoken>
<replacevalue><!--
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=631104&r1=631103&r2=631104&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/site/apt/building/ant.apt (original)
+++ logging/log4cxx/trunk/src/site/apt/building/ant.apt Mon Feb 25 22:33:57 2008
@@ -204,7 +204,7 @@
** Mac OS/X:
- APR, APR-Util and iODBC are preinstalled in Mac OS/X.
+ APR and APR-Util are provided by the platform in Mac OS/X 10.5 and iODBC in
10.4.
Site generation requires "doxygen" command on path which can be provided
by installing Doxygen.app and then setting the path like:
Modified: logging/log4cxx/trunk/src/site/apt/building/autotools.apt
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/site/apt/building/autotools.apt?rev=631104&r1=631103&r2=631104&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/site/apt/building/autotools.apt (original)
+++ logging/log4cxx/trunk/src/site/apt/building/autotools.apt Mon Feb 25
22:33:57 2008
@@ -67,7 +67,7 @@
** Mac OS/X:
- APR, APR-Util and iODBC are preinstalled in Mac OS/X 10.5 and later.
+ APR and APR-Util are provided by the platform in Mac OS/X 10.5 and iODBC in
10.4.
** Cygwin:
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=631104&r1=631103&r2=631104&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/site/apt/building/xcode.apt (original)
+++ logging/log4cxx/trunk/src/site/apt/building/xcode.apt Mon Feb 25 22:33:57
2008
@@ -50,23 +50,6 @@
* In the Arguments pane, add "-v" for verbose output, or individual test
names in "Arguments to be passed on launch".
*Issues
-
- Xcode fails when linking to apr and aprutil dylibs in /usr/lib,
- however it will succeed linking to symbolic links to the same files.
- As a workaround until a resolution is found:
-
- Create symbolic links to the libraries in some arbitrary directory:
-
-+-----+
-mkdir ~/apr-dylib
-cd ~/apr-dylib
-ln -s /usr/lib/libapr-1.dylib libapr-1.dylib
-ln -s /usr/lib/libaprutil-1.dylib libaprutil-1.dylib
-+------+
-
- Then add the arbitary directory to the Library Search Paths
- (Build tab of the Get Info page for the project).
-
The project file generation does does not
properly create an entry in the "Link Binary with Libraries"
@@ -77,3 +60,6 @@
under Targets.
See issue {{{http://issues.apache.org/jira/browse/LOGCXX-245}LOGCXX-245}}
for further information.
+
+ Thw generated projects us the Mac OS/X 10.5 SDK which provides APR and
APR-Util. To generated
+ XCode projects that do not use Mac OS/X, set up the ant build and then "ant
build-projects-xcode".
