Author: carnold
Date: Thu Sep 7 15:03:36 2006
New Revision: 441251
URL: http://svn.apache.org/viewvc?view=rev&rev=441251
Log:
LOGCXX-62: Remove stray .cvsignore, include *.m4, performance.xml in dist
Removed:
logging/log4cxx/trunk/docs/.cvsignore
logging/log4cxx/trunk/examples/.cvsignore
logging/log4cxx/trunk/include/.cvsignore
logging/log4cxx/trunk/include/log4cxx/.cvsignore
logging/log4cxx/trunk/include/log4cxx/config/.cvsignore
logging/log4cxx/trunk/include/log4cxx/db/.cvsignore
logging/log4cxx/trunk/include/log4cxx/helpers/.cvsignore
logging/log4cxx/trunk/include/log4cxx/net/.cvsignore
logging/log4cxx/trunk/include/log4cxx/nt/.cvsignore
logging/log4cxx/trunk/include/log4cxx/rolling/.cvsignore
logging/log4cxx/trunk/include/log4cxx/spi/.cvsignore
logging/log4cxx/trunk/include/log4cxx/spi/location/.cvsignore
logging/log4cxx/trunk/include/log4cxx/varia/.cvsignore
logging/log4cxx/trunk/include/log4cxx/xml/.cvsignore
logging/log4cxx/trunk/performance/.cvsignore
logging/log4cxx/trunk/performance/xml/.cvsignore
logging/log4cxx/trunk/simplesocketserver/.cvsignore
logging/log4cxx/trunk/tests/.cvsignore
logging/log4cxx/trunk/tests/input/.cvsignore
logging/log4cxx/trunk/tests/input/xml/.cvsignore
logging/log4cxx/trunk/tests/src/.cvsignore
logging/log4cxx/trunk/tests/src/.kdbgrc.testsuite
logging/log4cxx/trunk/tests/src/customlogger/.cvsignore
logging/log4cxx/trunk/tests/src/db/.cvsignore
logging/log4cxx/trunk/tests/src/defaultinit/.cvsignore
logging/log4cxx/trunk/tests/src/helpers/.cvsignore
logging/log4cxx/trunk/tests/src/net/.cvsignore
logging/log4cxx/trunk/tests/src/nt/.cvsignore
logging/log4cxx/trunk/tests/src/pattern/.cvsignore
logging/log4cxx/trunk/tests/src/rolling/.cvsignore
logging/log4cxx/trunk/tests/src/util/.cvsignore
logging/log4cxx/trunk/tests/src/varia/.cvsignore
logging/log4cxx/trunk/tests/src/xml/.cvsignore
logging/log4cxx/trunk/tests/witness/.cvsignore
Modified:
logging/log4cxx/trunk/build.xml
Modified: logging/log4cxx/trunk/build.xml
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/build.xml?view=diff&rev=441251&r1=441250&r2=441251
==============================================================================
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Thu Sep 7 15:03:36 2006
@@ -336,16 +336,30 @@
<available property="cppunit-available"
file="${cppunit.lib.dir}/${lib.prefix}cppunit${lib-suffix}${lib.extension}"/>
- <available property="apr-src-available"
file="${lib.dir}/apr-${apr.version}.tar.gz"/>
- <available property="aprutil-src-available"
- file="${lib.dir}/apr-util-${aprutil.version}.tar.gz"/>
- <available property="cppunit-src-available"
- file="${lib.dir}/cppunit-${cppunit.version}.tar.gz"/>
<available property="apr-src-expanded"
file="${lib.dir}/apr-${apr.version}"/>
<available property="aprutil-src-expanded"
file="${lib.dir}/apr-util-${aprutil.version}"/>
<available property="cppunit-src-expanded"
file="${lib.dir}/cppunit-${cppunit.version}"/>
+ <condition property="apr-src-available" value="">
+ <or>
+ <isset property="apr-src-expanded"/>
+ <available file="${lib.dir}/apr-${apr.version}.tar.gz"/>
+ </or>
+ </condition>
+ <condition property="aprutil-src-available" value="">
+ <or>
+ <isset property="aprutil-src-expanded"/>
+ <available file="${lib.dir}/apr-util-${aprutil.version}.tar.gz"/>
+ </or>
+ </condition>
+ <condition property="cppunit-src-available" value="">
+ <or>
+ <isset property="cppunit-src-expanded"/>
+ <available file="${lib.dir}/cppunit-${cppunit.version}.tar.gz"/>
+ </or>
+ </condition>
+
<condition property="is-static" value="true">
<equals arg1="${lib.type}" arg2="static"/>
</condition>
@@ -1369,6 +1383,7 @@
<include name="Makefile.am"/>
<include name="NEWS"/>
<include name="README"/>
+ <include name="STATUS"/>
<include name="*.xml"/>
<include name="examples/*.cpp"/>
<include name="include/**/*.h"/>
@@ -1380,6 +1395,7 @@
<include name="simplesocketserver/*.cpp"/>
<include name="src/*.cpp"/>
<include name="msvc/**"/>
+ <include name="tests/performance.xml"/>
<include name="tests/**/*.properties"/>
<include name="tests/input/**/*.xml"/>
<include name="tests/input/**/*.dtd"/>
@@ -1392,9 +1408,8 @@
<include name="tests/log4j.dtd"/>
<include name="lib/apr-${apr.version}/**"/>
<include name="lib/apr-util-${aprutil.version}/**"/>
- <include name="**/*.am"/>
- <include name="**/*.in"/>
- <include name="**/*.patch"/>
+ <include name="include/log4cxx/nt/EventLogCategories.mc"/>
+ <include name="*.patch"/>
<include name="docs/**"/>
<include name="xdocs/**"/>
<exclude name="include/log4cxx/log4cxx.h"/>
@@ -1405,6 +1420,13 @@
<exclude name="lib/apr-util-${aprutil.version}/include/apu.h"/>
<exclude name="lib/apr-util-${aprutil.version}/include/apuwant.h"/>
<exclude
name="lib/apr-util-${aprutil.version}/include/private/*.h"/>
+ <exclude name="**/.svn"/>
+ </tarfileset>
+ <tarfileset dir="${base.dir}" prefix="apache-log4cxx-${version}">
+ <include name="**/*.m4"/>
+ <include name="**/*.am"/>
+ <include name="**/*.in"/>
+ <exclude name="lib/**"/>
</tarfileset>
</tar>
@@ -1420,6 +1442,7 @@
<include name="Makefile.am"/>
<include name="NEWS"/>
<include name="README"/>
+ <include name="STATUS"/>
<include name="*.xml"/>
<include name="examples/*.cpp"/>
<include name="include/**/*.h"/>
@@ -1431,6 +1454,7 @@
<include name="simplesocketserver/*.cpp"/>
<include name="src/*.cpp"/>
<include name="msvc/**"/>
+ <include name="tests/performance.xml"/>
<include name="tests/**/*.properties"/>
<include name="tests/input/**/*.xml"/>
<include name="tests/input/**/*.dtd"/>
@@ -1443,9 +1467,8 @@
<include name="tests/log4j.dtd"/>
<include name="lib/apr-${apr.version}/**"/>
<include name="lib/apr-util-${aprutil.version}/**"/>
- <include name="**/*.am"/>
- <include name="**/*.in"/>
- <include name="**/*.patch"/>
+ <include name="include/log4cxx/nt/EventLogCategories.mc"/>
+ <include name="*.patch"/>
<include name="docs/**"/>
<include name="xdocs/**"/>
<exclude name="include/log4cxx/log4cxx.h"/>
@@ -1456,6 +1479,13 @@
<exclude name="lib/apr-util-${aprutil.version}/include/apu.h"/>
<exclude name="lib/apr-util-${aprutil.version}/include/apuwant.h"/>
<exclude name="lib/apr-util-${aprutil.version}/include/private/*.h"/>
+ <exclude name="**/.svn"/>
+ </zipfileset>
+ <zipfileset dir="${base.dir}" prefix="apache-log4cxx-${version}">
+ <include name="**/*.m4"/>
+ <include name="**/*.am"/>
+ <include name="**/*.in"/>
+ <exclude name="lib/**"/>
</zipfileset>
</zip>
</target>
