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 2005/02/04 05:47:50 UTC
cvs commit: logging-log4cxx/mock sstream
carnold 2005/02/03 20:47:50
Modified: . build.xml
mock sstream
Log:
Gump fixes
Revision Changes Path
1.28 +16 -16 logging-log4cxx/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/build.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- build.xml 30 Jan 2005 06:18:33 -0000 1.27
+++ build.xml 4 Feb 2005 04:47:50 -0000 1.28
@@ -556,9 +556,9 @@
<exec executable="${log4cxx-test.exe}" dir="${tests.dir}"
failonerror="true">
<env key="LD_LIBRARY_PATH"
- value="${build.dir}:${apr.lib.dir}:${env.LD_LIBRARY_PATH}"/>
+ value="${build.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${apriconv.lib.dir}:${env.LD_LIBRARY_PATH}"/>
<env key="DYLD_LIBRARY_PATH"
- value="${build.dir}:${apr.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
+ value="${build.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${apriconv.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
<env key="Path"
value="${build.dir};${env.Path}"/>
</exec>
@@ -569,9 +569,9 @@
<exec executable="${log4cxx-testcase3.exe}" dir="${tests.dir}"
failonerror="true">
<env key="LD_LIBRARY_PATH"
- value="${build.dir}:${apr.lib.dir}:${env.LD_LIBRARY_PATH}"/>
+ value="${build.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${apriconv.lib.dir}:${env.LD_LIBRARY_PATH}"/>
<env key="DYLD_LIBRARY_PATH"
- value="${build.dir}:${apr.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
+ value="${build.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${apriconv.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
<env key="log4j.configuration"
value="${defaultInit3.properties}"/>
</exec>
@@ -580,9 +580,9 @@
<exec executable="${log4cxx-testcase3.exe}" dir="${tests.dir}"
failonerror="true">
<env key="LD_LIBRARY_PATH"
- value="${build.dir}:${apr.lib.dir}:${env.LD_LIBRARY_PATH}"/>
+ value="${build.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${apriconv.lib.dir}:${env.LD_LIBRARY_PATH}"/>
<env key="DYLD_LIBRARY_PATH"
- value="${build.dir}:${apr.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
+ value="${build.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${apriconv.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
<env key="LOG4CXX_CONFIGURATION"
value="${defaultInit3.properties}"/>
</exec>
@@ -596,9 +596,9 @@
<exec executable="${log4cxx-testcase3.exe}" dir="${build.dir}"
failonerror="true">
<env key="DYLD_LIBRARY_PATH"
- value="${build.dir}:${apr.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
+ value="${build.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${apriconv.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
<env key="LD_LIBRARY_PATH"
- value="${build.dir}:${apr.lib.dir}:${env.LD_LIBRARY_PATH}"/>
+ value="${build.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${apriconv.lib.dir}:${env.LD_LIBRARY_PATH}"/>
</exec>
<!-- modify log4j.properties so if it has precedence the test fails -->
@@ -608,9 +608,9 @@
<exec executable="${log4cxx-testcase3.exe}" dir="${build.dir}"
failonerror="true">
<env key="DYLD_LIBRARY_PATH"
- value="${build.dir}:${apr.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
+ value="${build.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${apriconv.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
<env key="LD_LIBRARY_PATH"
- value="${build.dir}:${apr.lib.dir}:${env.LD_LIBRARY_PATH}"/>
+ value="${build.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${apriconv.lib.dir}:${env.LD_LIBRARY_PATH}"/>
</exec>
<delete file="${build.dir}/log4cxx.properties"/>
@@ -624,9 +624,9 @@
<exec executable="${log4cxx-testcase4.exe}" dir="${build.dir}"
failonerror="true">
<env key="LD_LIBRARY_PATH"
- value="${build.dir}:${apr.lib.dir}:${env.LD_LIBRARY_PATH}"/>
+ value="${build.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${apriconv.lib.dir}:${env.LD_LIBRARY_PATH}"/>
<env key="DYLD_LIBRARY_PATH"
- value="${build.dir}:${apr.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
+ value="${build.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${apriconv.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
</exec>
</target>
@@ -637,16 +637,16 @@
<exec executable="${log4cxx-standalone-test.exe}" dir="${tests.dir}"
failonerror="true">
<env key="DYLD_LIBRARY_PATH"
- value="${build.dir}:${apr.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
+ value="${build.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${apriconv.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
<env key="LD_LIBRARY_PATH"
- value="${build.dir}:${apr.lib.dir}:${env.LD_LIBRARY_PATH}"/>
+ value="${build.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${apriconv.lib.dir}:${env.LD_LIBRARY_PATH}"/>
<env key="Path"
value="${build.dir};${env.Path}"/>
</exec>
</target>
-<target name="test-all" depends="build-log4cxx, run-unittest"/>
+<target name="check" depends="build-log4cxx, run-unittest"/>
-<target name="gump" depends="build-log4cxx, header-check, test-all"/>
+<target name="gump" depends="build-log4cxx, check, header-check"/>
</project>
1.3 +2 -2 logging-log4cxx/mock/sstream
Index: sstream
===================================================================
RCS file: /home/cvs/logging-log4cxx/mock/sstream,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sstream 4 Jan 2005 04:57:41 -0000 1.2
+++ sstream 4 Feb 2005 04:47:50 -0000 1.3
@@ -53,8 +53,8 @@
template<class Char, class Traits, class Alloc>
class basic_ostringstream : public basic_ostream<Char, Traits> {
public:
- string<Char> str();
- void str(const string<Char>&);
+ basic_string<Char> str();
+ void str(const basic_string<Char>&);
};
}