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/03/21 05:34:48 UTC
svn commit: r639541 - in /logging/log4cxx/trunk: build.xml
src/ant/apr-build.xml src/ant/apr-util-build.xml src/ant/common.xml
src/site/apt/building/ant.apt
Author: carnold
Date: Thu Mar 20 21:34:45 2008
New Revision: 639541
URL: http://svn.apache.org/viewvc?rev=639541&view=rev
Log:
LOGCXX-254: Add build option for static C RTL
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
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=639541&r1=639540&r2=639541&view=diff
==============================================================================
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Thu Mar 20 21:34:45 2008
@@ -366,6 +366,7 @@
<property name="lib.prefix" value="${apr.lib.prefix}"/>
<property name="lib.suffix" value="${apr.lib.suffix}"/>
<property name="compiler" value="${compiler}"/>
+ <property name="runtime" value="${runtime}"/>
<property name="lib.type" value="${apr.lib.type}"/>
<property name="project.type" value="${project.type}"/>
<property name="projects.dir" value="${projects.dir}"/>
@@ -397,6 +398,7 @@
<property name="lib.prefix" value="${apr-util.lib.prefix}"/>
<property name="lib.suffix" value="${apr-util.lib.suffix}"/>
<property name="compiler" value="${compiler}"/>
+ <property name="runtime" value="${runtime}"/>
<property name="apr.include.dir" value="${apr.include.dir}"/>
<property name="apr.lib.dir" value="${apr.lib.dir}"/>
<property name="apr.lib.type" value="${apr.lib.type}"/>
@@ -433,6 +435,7 @@
<property name="lib.prefix" value="${esmtp.lib.prefix}"/>
<property name="lib.suffix" value="${esmtp.lib.suffix}"/>
<property name="compiler" value="${esmtp.compiler}"/>
+ <property name="runtime" value="${runtime}"/>
<property name="lib.type" value="${esmtp.lib.type}"/>
<property name="project.type" value="${project.type}"/>
<property name="projects.dir" value="${projects.dir}"/>
@@ -538,6 +541,7 @@
outputfileproperty="log4cxx.lib.file"
subsystem="console"
multithreaded="true"
+ runtime="${runtime}"
outtype="${lib.type}"
objdir="${log4cxx.lib.dir}/log4cxx_obj"
debug="${debug}"
@@ -595,6 +599,7 @@
outfile="${log4cxx.lib.dir}/${example.name}"
subsystem="console"
multithreaded="true"
+ runtime="${runtime}"
outtype="executable"
objdir="${log4cxx.lib.dir}/${example.name}_obj"
debug="${debug}"
@@ -691,6 +696,7 @@
outfile="${log4cxx.lib.dir}/testsuite"
subsystem="console"
multithreaded="true"
+ runtime="${runtime}"
outputfileproperty="testsuite.exe"
outtype="executable"
objdir="${log4cxx.lib.dir}/testsuite_obj"
@@ -739,6 +745,7 @@
outfile="${executable.dir}/static/testsuite-standalone"
subsystem="console"
multithreaded="true"
+ runtime="${runtime}"
outputfileproperty="testsuite-standalone.exe"
outtype="executable"
objdir="${executable.dir}/static/testsuite-standalone_obj"
Modified: logging/log4cxx/trunk/src/ant/apr-build.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/apr-build.xml?rev=639541&r1=639540&r2=639541&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/apr-build.xml (original)
+++ logging/log4cxx/trunk/src/ant/apr-build.xml Thu Mar 20 21:34:45 2008
@@ -50,7 +50,6 @@
<property name="include.dir" location="${src.dir}/include"/>
<property name="test.dir" location="${src.dir}/test"/>
<property name="target.dir" location="${basedir}/target"/>
-<property name="lib.type" value="shared"/>
<property name="lib.name" value="apr-1"/>
<property name="lib.prefix" value=""/>
@@ -110,6 +109,7 @@
outfile="${executable.dir}/${lib.prefix}${lib.name}${lib.suffix}"
subsystem="console"
multithreaded="true"
+ runtime="${runtime}"
outtype="${lib.type}"
objdir="${executable.dir}/apr-ofiles"
outputfileproperty="apr-1.dll"
@@ -166,6 +166,7 @@
outfile="${executable.dir}/${test}"
subsystem="console"
multithreaded="true"
+ runtime="${runtime}"
outtype="executable"
objdir="${executable.dir}/apr-test-ofiles"
debug="${debug}"
@@ -305,6 +306,7 @@
outfile="${executable.dir}/.libs/mod_test"
subsystem="console"
multithreaded="true"
+ runtime="${runtime}"
outtype="shared"
objdir="${executable.dir}/test-ofiles"
outputfileproperty="libmod_test.so"
@@ -340,6 +342,7 @@
outfile="${executable.dir}/testall"
subsystem="console"
multithreaded="true"
+ runtime="${runtime}"
outtype="executable"
objdir="${executable.dir}/test-ofiles"
debug="${debug}"
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=639541&r1=639540&r2=639541&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/apr-util-build.xml (original)
+++ logging/log4cxx/trunk/src/ant/apr-util-build.xml Thu Mar 20 21:34:45 2008
@@ -147,6 +147,7 @@
outfile="${executable.dir}/expat"
subsystem="console"
multithreaded="true"
+ runtime="${runtime}"
outtype="static"
objdir="${executable.dir}/apr-util-ofiles"
warnings="none"
@@ -181,6 +182,7 @@
outfile="${executable.dir}/aprutil-1${lib-suffix}"
subsystem="console"
multithreaded="true"
+ runtime="${runtime}"
outtype="${lib.type}"
objdir="${executable.dir}/apr-util-ofiles"
warnings="none"
@@ -233,6 +235,7 @@
outfile="${executable.dir}/${test}"
subsystem="console"
multithreaded="true"
+ runtime="${runtime}"
outtype="executable"
objdir="${executable.dir}/apr-util-test-ofiles"
debug="${debug}"
Modified: logging/log4cxx/trunk/src/ant/common.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/common.xml?rev=639541&r1=639540&r2=639541&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/common.xml (original)
+++ logging/log4cxx/trunk/src/ant/common.xml Thu Mar 20 21:34:45 2008
@@ -20,7 +20,8 @@
<property name="debug" value="true"/>
<property name="rtti" value="false"/>
<property name="optimize" value="none"/>
-<property name="lib.type" value="shared"/>
+<property name="lib.type" value="shared"/>
+<property name="runtime" value="dynamic"/>
<taskdef resource="cpptasks.tasks"/>
<typedef resource="cpptasks.types"/>
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=639541&r1=639540&r2=639541&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/site/apt/building/ant.apt (original)
+++ logging/log4cxx/trunk/src/site/apt/building/ant.apt Thu Mar 20 21:34:45 2008
@@ -144,13 +144,21 @@
*-------------------+---------------------------------------------------------------------------------------------+
| -Dprojects.dir | Location for generated IDE projects. |
*-------------------+---------------------------------------------------------------------------------------------+
+| -Dlib.type | Library type to create, choice of shared (default), static. |
+*-------------------+---------------------------------------------------------------------------------------------+
+| -Druntime | Type of C runtime library to use, choice of dynamic (default), static. |
+*-------------------+---------------------------------------------------------------------------------------------+
+| -Doptimization | Optimization: none (default), size, minimal, speed, full, aggressive, extreme, unsafe. |
+*-------------------+---------------------------------------------------------------------------------------------+
| -p | Display available targets and quit. |
*-------------------+---------------------------------------------------------------------------------------------+
SMTP and ODBC options can depend on libraries that
that have different licenses.
You should review the corresponding licenses and understand
- the implications before redistribution.
+ the implications before redistribution.
+
+ Combining -Dlib.type=shared and -Druntime=static is unsafe.
Properties may also be placed in a build.properties file in the log4cxx directory.