Author: carnold
Date: Thu Sep 7 11:00:44 2006
New Revision: 441160
URL: http://svn.apache.org/viewvc?view=rev&rev=441160
Log:
LOGCXX-153: Automate log4cxx site and manual build and deployment
Added:
logging/log4cxx/trunk/LICENSE
logging/log4cxx/trunk/NOTICE
logging/log4cxx/trunk/xdocs/src/stylesheets/site.css
Removed:
logging/log4cxx/trunk/.cvsignore
logging/log4cxx/trunk/license.apl
logging/log4cxx/trunk/xdocs/build.xml
logging/log4cxx/trunk/xdocs/src/manual/
logging/log4cxx/trunk/xdocs/www/
Modified:
logging/log4cxx/trunk/ (props changed)
logging/log4cxx/trunk/apr-build.xml
logging/log4cxx/trunk/aprutil-build.xml
logging/log4cxx/trunk/build.xml
logging/log4cxx/trunk/cppunit-build.xml
logging/log4cxx/trunk/docs/ (props changed)
logging/log4cxx/trunk/docs/Doxyfile.in
logging/log4cxx/trunk/xdocs/src/stylesheets/project.xml
Propchange: logging/log4cxx/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Sep 7 11:00:44 2006
@@ -14,3 +14,5 @@
xcode
cbx
msvc
+velocity.log
+
Added: logging/log4cxx/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/LICENSE?view=auto&rev=441160
==============================================================================
--- logging/log4cxx/trunk/LICENSE (added)
+++ logging/log4cxx/trunk/LICENSE Thu Sep 7 11:00:44 2006
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Added: logging/log4cxx/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/NOTICE?view=auto&rev=441160
==============================================================================
--- logging/log4cxx/trunk/NOTICE (added)
+++ logging/log4cxx/trunk/NOTICE Thu Sep 7 11:00:44 2006
@@ -0,0 +1,2 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
Modified: logging/log4cxx/trunk/apr-build.xml
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/apr-build.xml?view=diff&rev=441160&r1=441159&r2=441160
==============================================================================
--- logging/log4cxx/trunk/apr-build.xml (original)
+++ logging/log4cxx/trunk/apr-build.xml Thu Sep 7 11:00:44 2006
@@ -154,14 +154,16 @@
<target name="build" depends="configure" description="Build library">
<mkdir dir="${apr.lib.dir}/apr_obj"/>
- <cc name="${compiler}"
+ <property name="project.compiler" value="${compiler}"/>
+ <cc name="${project.compiler}"
outfile="${apr.lib.dir}/apr-1${lib-suffix}"
subsystem="console"
multithreaded="true"
outtype="${apr.lib.type}"
objdir="${apr.lib.dir}/apr_obj"
outputfileproperty="apr-1.dll"
- debug="${debug}">
+ debug="${debug}"
+ projectsOnly="${projectsOnly}">
<fileset dir="${src.dir}" includes="**/${arch}/*.c"
excludes="**/apr_app.c"/>
<fileset dir="${src.dir}" includes="**/${arch}/apr_app.c"
if="is-static"/>
<fileset dir="${src.dir}/file_io/unix"
@@ -201,13 +203,15 @@
<target name="build-test">
<mkdir dir="${apr.lib.dir}/apr_obj"/>
- <cc name="${compiler}"
+ <property name="project.compiler" value="${compiler}"/>
+ <cc name="${project.compiler}"
outfile="${apr.lib.dir}/${test}"
subsystem="console"
multithreaded="true"
outtype="executable"
objdir="${apr.lib.dir}/apr_obj"
- debug="${debug}">
+ debug="${debug}"
+ projectsOnly="${projectsOnly}">
<fileset dir="${test.dir}" includes="${testfiles}"/>
<includepath path="${apr.include.dir}"/>
<defineset if="is-windows">
@@ -333,14 +337,16 @@
<target name="build-mod_test" depends="build">
<mkdir dir="${apr.lib.dir}/apr_obj"/>
<mkdir dir="${apr.lib.dir}/.libs"/>
- <cc name="${compiler}"
+ <property name="project.compiler" value="${compiler}"/>
+ <cc name="${project.compiler}"
outfile="${apr.lib.dir}/.libs/mod_test"
subsystem="console"
multithreaded="true"
outtype="shared"
objdir="${apr.lib.dir}/apr_obj"
outputfileproperty="libmod_test.so"
- debug="${debug}">
+ debug="${debug}"
+ projectsOnly="${projectsOnly}">
<fileset dir="${test.dir}" includes="mod_test.c"/>
<includepath path="${apr.include.dir}"/>
<defineset if="is-windows">
@@ -360,13 +366,15 @@
<target name="build-testall" depends="build">
<mkdir dir="${apr.lib.dir}/apr_obj"/>
- <cc name="${compiler}"
+ <property name="project.compiler" value="${compiler}"/>
+ <cc name="${project.compiler}"
outfile="${apr.lib.dir}/testall"
subsystem="console"
multithreaded="true"
outtype="executable"
objdir="${apr.lib.dir}/apr_obj"
- debug="${debug}">
+ debug="${debug}"
+ projectsOnly="${projectsOnly}">
<fileset dir="${test.dir}" includes="*.c">
<exclude name="nw_misc.c"/>
<exclude name="testlockperf.c"/>
@@ -434,12 +442,14 @@
<antcall target="build">
<param name="project.if" value="true"/>
<param name="project.type" value="${project.type}"/>
+ <param name="project.compiler" value="${project.compiler}"/>
<param name="projects.dir" value="${project.dir}"/>
<param name="projectsOnly" value="true"/>
</antcall>
<antcall target="build-check">
<param name="project.if" value="true"/>
<param name="project.type" value="${project.type}"/>
+ <param name="project.compiler" value="${project.compiler}"/>
<param name="projects.dir" value="${project.dir}"/>
<param name="projectsOnly" value="true"/>
</antcall>
@@ -449,13 +459,23 @@
<antcall target="build-projects">
<param name="project.dir" value="msvc"/>
<param name="project.type" value="msvc6"/>
+ <param name="project.compiler" value="msvc"/>
</antcall>
</target>
+<target name="build-projects-vc8" description="Builds project files for
Microsoft Visual C++ 2005">
+ <antcall target="build-projects">
+ <param name="project.dir" value="msvc"/>
+ <param name="project.type" value="msvc8"/>
+ <param name="project.compiler" value="msvc"/>
+ </antcall>
+</target>
+
<target name="build-projects-xcode" description="Builds project files for
Apple Xcode">
<antcall target="build-projects">
<param name="project.dir" value="xcode"/>
<param name="project.type" value="xcode"/>
+ <param name="project.compiler" value="${compiler}"/>
</antcall>
</target>
@@ -463,6 +483,7 @@
<antcall target="build-projects">
<param name="project.dir" value="cbx"/>
<param name="project.type" value="cbuilderx"/>
+ <param name="project.compiler" value="${compiler}"/>
</antcall>
</target>
Modified: logging/log4cxx/trunk/aprutil-build.xml
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/aprutil-build.xml?view=diff&rev=441160&r1=441159&r2=441160
==============================================================================
--- logging/log4cxx/trunk/aprutil-build.xml (original)
+++ logging/log4cxx/trunk/aprutil-build.xml Thu Sep 7 11:00:44 2006
@@ -197,14 +197,16 @@
<replacefilter token="XML_MICRO_VERSION" value="1"/>
<replacefilter token="VERSION" value='"expat_1.95.1"'/>
</replace>
- <cc name="${compiler}"
+ <property name="project.compiler" value="${compiler}"/>
+ <cc name="${project.compiler}"
outfile="${aprutil.lib.dir}/aprutil-1${lib-suffix}"
subsystem="console"
multithreaded="true"
outtype="${aprutil.lib.type}"
objdir="${aprutil.lib.dir}/aprutil_obj"
warnings="none"
- debug="${debug}">
+ debug="${debug}"
+ projectsOnly="${projectsOnly}">
<fileset dir="${aprutil.dir}" includes="**/*.c"
excludes="test/*.c ldap/*.c xml/expat/lib/*"/>
<fileset dir="${aprutil.dir}/xml/expat/lib"
@@ -240,13 +242,15 @@
<target name="build-test">
<mkdir dir="${aprutil.lib.dir}/apr_obj"/>
- <cc name="${compiler}"
+ <property name="project.compiler" value="${compiler}"/>
+ <cc name="${project.compiler}"
outfile="${aprutil.lib.dir}/${test}"
subsystem="console"
multithreaded="true"
outtype="executable"
objdir="${aprutil.lib.dir}/apr_obj"
- debug="${debug}">
+ debug="${debug}"
+ projectsOnly="${projectsOnly}">
<fileset dir="${aprutil.dir}/test" includes="${testfiles}"/>
<includepath path="${aprutil.include.dir}"/>
<includepath path="${apr.include.dir}"/>
@@ -393,13 +397,15 @@
<target name="build-testall" depends="build">
<mkdir dir="${aprutil.lib.dir}/apr_obj"/>
- <cc name="${compiler}"
+ <property name="project.compiler" value="${compiler}"/>
+ <cc name="${project.compiler}"
outfile="${aprutil.lib.dir}/testall"
subsystem="console"
multithreaded="true"
outtype="executable"
objdir="${aprutil.lib.dir}/apr_obj"
- debug="${debug}">
+ debug="${debug}"
+ projectsOnly="${projectsOnly}">
<fileset dir="${aprutil.dir}/test" includes="*.c">
<exclude name="nw_misc.c"/>
<exclude name="testdbm.c"/>
@@ -465,6 +471,7 @@
<antcall target="build">
<param name="project.if" value="true"/>
<param name="project.type" value="${project.type}"/>
+ <param name="project.compiler"
value="${project.compiler}"/>
<param name="projects.dir" value="${project.dir}"/>
<param name="projectsOnly" value="true"/>
</antcall>
@@ -474,13 +481,23 @@
<antcall target="build-projects">
<param name="project.dir" value="msvc"/>
<param name="project.type" value="msvc6"/>
+ <param name="project.compiler" value="msvc"/>
</antcall>
</target>
+ <target name="build-projects-vc8" description="Builds project files for
Microsoft Visual C++ 2005">
+ <antcall target="build-projects">
+ <param name="project.dir" value="msvc"/>
+ <param name="project.type" value="msvc8"/>
+ <param name="project.compiler" value="msvc"/>
+ </antcall>
+ </target>
+
<target name="build-projects-xcode" description="Builds project files for
Apple Xcode">
<antcall target="build-projects">
<param name="project.dir" value="xcode"/>
<param name="project.type" value="xcode"/>
+ <param name="project.compiler" value="${compiler}"/>
</antcall>
</target>
@@ -488,6 +505,7 @@
<antcall target="build-projects">
<param name="project.dir" value="cbx"/>
<param name="project.type" value="cbuilderx"/>
+ <param name="project.compiler" value="${compiler}"/>
</antcall>
</target>
Modified: logging/log4cxx/trunk/build.xml
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/build.xml?view=diff&rev=441160&r1=441159&r2=441160
==============================================================================
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Thu Sep 7 11:00:44 2006
@@ -39,6 +39,9 @@
<project name="log4cxx" default="check">
<property environment="env"/>
+<!-- The build.properties file defines the parth to local jar files -->
+<property file="build.properties"/>
+
<property name="debug" value="true"/>
<property name="base.dir" location="."/>
<property name="src.dir" location="${base.dir}/src"/>
@@ -48,6 +51,14 @@
<property name="examples.dir" location="${base.dir}/examples"/>
<property name="tests.dir" location="${base.dir}/tests"/>
<property name="performance.dir" location="${base.dir}/performance"/>
+<!-- Destination for documentation files -->
+<property name="docs.dest" value="${base.dir}/docs"/>
+<property name="manual.dest" value="${docs.dest}/manual"/>
+<!-- Source directory for xml docs -->
+<property name="xdocs.src" value="${base.dir}/xdocs/src"/>
+<property name="doxygen.exe" value="doxygen"/>
+<property name="enable_dot" value="YES"/>
+
<property name="version" value="0.9.8"/>
<property name="rtti" value="false"/>
<property name="optimize" value="none"/>
@@ -58,7 +69,10 @@
<property name="cppunit.mirror"
value="http://easynews.dl.sourceforge.net/sourceforge"/>
<property name="apache.dist" value="http://archive.apache.org/dist"/>
-
+<!-- property name="apache.doc_dest" value="/www/logging.apache.org/log4cxx"/
-->
+<property name="apache.doc_dest"
value="/home/${apache.user}/public_html/test"/>
+<property name="apache.manual_dest" value="${apache.doc_dest}/manual"/>
+<property name="apache.host" value="people.apache.org"/>
<property name="apr.version" value="1.2.7"/>
@@ -79,6 +93,20 @@
<typedef resource="cpptasks.types"/>
+<!-- Velocity's Anakia task is used in the generation of the documentation
+ download from http://jakarta.apache.org -->
+<property name="velocity.jar"
location="${lib.home.dir}/velocity-1.4/velocity-dep-1.4.jar"/>
+<!-- Velocity's Anakia task requires JDOM,
+ but Velocity 1.4 is not compatible with JDOM 1.0, but beta 8 works okay
+ download for http://www.jdom.org/dist/binary/archive -->
+<property name="jdom.jar" location="${lib.home.dir}/jdom-b8/build/jdom.jar"/>
+
+<!-- Construct classpath for building the html pages-->
+<path id="site.classpath">
+ <pathelement location="${velocity.jar}"/>
+ <pathelement location="${jdom.jar}"/>
+</path>
+
<target name="usage" description="Describes usage of the build script">
<echo>
@@ -349,11 +377,16 @@
<target name="clean" depends="init" description="Removes built files">
<delete dir="${build.dir}"/>
+ <delete dir="${docs.dest}/manual"/>
+ <delete dir="${docs.dest}/css"/>
<delete>
<fileset dir="${tests.dir}/src" includes="shortsocket*"
excludes="*.cpp"/>
<fileset dir="${tests.dir}" includes="output/*"/>
<fileset dir="${include.dir}/log4cxx" includes="**/log4cxx.h"/>
+ <fileset dir="${docs.dest}" includes="Doxyfile, *.html"/>
+ <fileset dir="${base.dir}" includes="velocity.log"/>
</delete>
+
</target>
<target name="config-check" depends="os-detect">
@@ -1184,17 +1217,130 @@
</target>
-<target name="dist" depends="init"
+<!-- ============================================== -->
+<!-- Build the site files using Anakia -->
+<!-- ============================================== -->
+<target name="prepareSite">
+ <available classname="org.apache.velocity.anakia.AnakiaTask"
+ property="AnakiaTask.present">
+ <classpath refid="site.classpath"/>
+ </available>
+</target>
+
+<target name="checkSite" depends="prepareSite" unless="AnakiaTask.present">
+ <fail>
+ AnakiaTask is not present! Please check to make sure that
+ the velocity.jar property is specified and contains the correct path.
+ </fail>
+</target>
+
+<target name="site" depends="checkSite" if="AnakiaTask.present"
description="build log4cxx website">
+ <taskdef name="anakia" classname="org.apache.velocity.anakia.AnakiaTask">
+ <classpath refid="site.classpath"/>
+ </taskdef>
+
+ <mkdir dir="${docs.dest}/css"/>
+ <copy file="${xdocs.src}/stylesheets/site.css"
tofile="${docs.dest}/css/site.css"/>
+ <copy file="${base.dir}/ChangeLog" tofile="${docs.dest}/ChangeLog"/>
+
+ <anakia basedir="${xdocs.src}" destdir="${docs.dest}/"
+ extension=".html"
+ style="site.vsl"
+ projectFile="stylesheets/project.xml"
+ excludes="**/stylesheets/**, empty.xml"
+ includes="**/*.xml"
+ lastModifiedCheck="true"
+ templatePath="${xdocs.src}/stylesheets">
+ </anakia>
+</target>
+
+<target name="deploy-site" depends="site" description="Deploy log4cxx website">
+ <fail unless="apache.user">-Dapache.user=USERNAME must be specified.</fail>
+ <tar destfile="${build.dir}/apache-log4cxx-site.tar.gz" compression="gzip">
+ <tarfileset dir="${docs.dest}">
+ <include name="*.html"/>
+ <include name="ChangeLog"/>
+ <include name="css/*.css"/>
+ </tarfileset>
+ </tar>
+ <exec executable="scp" dir="${build.dir}">
+ <arg value="apache-log4cxx-site.tar.gz"/>
+ <arg value="[EMAIL PROTECTED]:"/>
+ </exec>
+ <exec executable="ssh">
+ <arg value="-l"/>
+ <arg value="${apache.user}"/>
+ <arg value="${apache.host}"/>
+ <arg value="tar"/>
+ <arg value="--directory=${apache.doc_dest}"/>
+ <arg value="-xvzf"/>
+ <arg value="apache-log4cxx-site.tar.gz"/>
+ </exec>
+ <exec executable="ssh">
+ <arg value="-l"/>
+ <arg value="${apache.user}"/>
+ <arg value="${apache.host}"/>
+ <arg value="chmod"/>
+ <arg value="-R"/>
+ <arg value="g+w"/>
+ <arg value="${apache.doc_dest}"/>
+ </exec>
+</target>
+
+<target name="manual" depends="init" description="Build log4cxx manual">
+ <copy file="${base.dir}/docs/Doxyfile.in" tofile="${base.dir}/docs/Doxyfile"
overwrite="true"/>
+ <replace file="${base.dir}/docs/Doxyfile">
+ <replacefilter token="@VERSION@" value="${version}"/>
+ <replacefilter token="@top_srcdir@" value="${base.dir}"/>
+ <replacefilter token="@enable_dot@" value="${enable_dot}"/>
+ <replacefilter token="@manual_dest@" value="${manual.dest}"/>
+ </replace>
+ <exec executable="${doxygen.exe}" dir="${base.dir}/docs"/>
+</target>
+
+
+<target name="deploy-manual" depends="manual" description="Deploy log4cxx
manual to website">
+ <fail unless="apache.user">-Dapache.user=USERNAME must be specified.</fail>
+ <tar destfile="${build.dir}/apache-log4cxx-manual.tar.gz" compression="gzip">
+ <tarfileset dir="${manual.dest}"/>
+ </tar>
+ <exec executable="scp" dir="${build.dir}">
+ <arg value="apache-log4cxx-manual.tar.gz"/>
+ <arg value="[EMAIL PROTECTED]:"/>
+ </exec>
+ <exec executable="ssh">
+ <arg value="-l"/>
+ <arg value="${apache.user}"/>
+ <arg value="${apache.host}"/>
+ <arg value="tar"/>
+ <arg value="--directory=${apache.manual_dest}"/>
+ <arg value="-xvzf"/>
+ <arg value="apache-log4cxx-manual.tar.gz"/>
+ </exec>
+ <exec executable="ssh">
+ <arg value="-l"/>
+ <arg value="${apache.user}"/>
+ <arg value="${apache.host}"/>
+ <arg value="chmod"/>
+ <arg value="-R"/>
+ <arg value="g+w"/>
+ <arg value="${apache.manual_dest}"/>
+ </exec>
+</target>
+
+
+<target name="dist" depends="init, site, build-projects-vc6, manual"
description="Builds a source distribution">
- <tar destfile="${build.dir}/log4cxx-${version}.tar.gz"
+ <tar destfile="${build.dir}/apache-log4cxx-${version}.tar.gz"
compression="gzip">
- <tarfileset dir="${base.dir}" prefix="log4cxx-${version}">
+ <tarfileset dir="${base.dir}" prefix="apache-log4cxx-${version}">
<include name="AUTHORS"/>
<include name="autogen.sh"/>
<include name="ChangeLog"/>
<include name="COPYING"/>
<include name="INSTALL"/>
- <include name="license.apl"/>
+ <include name="NOTICE"/>
+ <include name="LICENSE"/>
<include name="Makefile.am"/>
<include name="NEWS"/>
<include name="README"/>
@@ -1208,6 +1354,7 @@
<include name="performance/**/*.xml"/>
<include name="simplesocketserver/*.cpp"/>
<include name="src/*.cpp"/>
+ <include name="msvc/**"/>
<include name="tests/**/*.properties"/>
<include name="tests/input/**/*.xml"/>
<include name="tests/input/**/*.dtd"/>
@@ -1218,15 +1365,74 @@
<include name="tests/witness/encoding/*"/>
<include name="tests/witness/rolling/*"/>
<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"/>
- <exclude name="**/.cvsignore"/>
- <exclude name="lib/**"/>
+ <include name="docs/**"/>
+ <include name="xdocs/**"/>
<exclude name="include/log4cxx/log4cxx.h"/>
<exclude name="include/log4cxx/private/log4cxx_private.h"/>
+ <exclude name="docs/Doxyfile"/>
+ <exclude name="lib/apr-${apr.version}/include/apr.h"/>
+ <exclude name="lib/apr-util-${aprutil.version}/include/aprldap.h"/>
+ <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"/>
</tarfileset>
</tar>
+
+ <zip destfile="${build.dir}/apache-log4cxx-${version}.zip">
+ <zipfileset dir="${base.dir}" prefix="apache-log4cxx-${version}">
+ <include name="AUTHORS"/>
+ <include name="autogen.sh"/>
+ <include name="ChangeLog"/>
+ <include name="COPYING"/>
+ <include name="INSTALL"/>
+ <include name="NOTICE"/>
+ <include name="LICENSE"/>
+ <include name="Makefile.am"/>
+ <include name="NEWS"/>
+ <include name="README"/>
+ <include name="*.xml"/>
+ <include name="examples/*.cpp"/>
+ <include name="include/**/*.h"/>
+ <include name="include/**/*.hw"/>
+ <include name="mock/*"/>
+ <include name="performance/*.cpp"/>
+ <include name="performance/*.h"/>
+ <include name="performance/**/*.xml"/>
+ <include name="simplesocketserver/*.cpp"/>
+ <include name="src/*.cpp"/>
+ <include name="msvc/**"/>
+ <include name="tests/**/*.properties"/>
+ <include name="tests/input/**/*.xml"/>
+ <include name="tests/input/**/*.dtd"/>
+ <include name="tests/src/**/*.cpp"/>
+ <include name="tests/src/**/*.h"/>
+ <include name="tests/witness/*"/>
+ <include name="tests/witness/ndc/*"/>
+ <include name="tests/witness/encoding/*"/>
+ <include name="tests/witness/rolling/*"/>
+ <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="docs/**"/>
+ <include name="xdocs/**"/>
+ <exclude name="include/log4cxx/log4cxx.h"/>
+ <exclude name="include/log4cxx/private/log4cxx_private.h"/>
+ <exclude name="docs/Doxyfile"/>
+ <exclude name="lib/apr-${apr.version}/include/apr.h"/>
+ <exclude name="lib/apr-util-${aprutil.version}/include/aprldap.h"/>
+ <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"/>
+ </zipfileset>
+ </zip>
</target>
<target name="gump" depends="check, header-check"/>
Modified: logging/log4cxx/trunk/cppunit-build.xml
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/cppunit-build.xml?view=diff&rev=441160&r1=441159&r2=441160
==============================================================================
--- logging/log4cxx/trunk/cppunit-build.xml (original)
+++ logging/log4cxx/trunk/cppunit-build.xml Thu Sep 7 11:00:44 2006
@@ -115,7 +115,8 @@
<target name="build" depends="configure" description="Build library">
<mkdir dir="${executable.dir}/${lib.type}/cppunit_obj"/>
- <cc name="${compiler}"
+ <property name="project.compiler" value="${compiler}"/>
+ <cc name="${project.compiler}"
outfile="${executable.dir}/${lib.type}/cppunit${lib-suffix}"
subsystem="console"
multithreaded="true"
@@ -123,7 +124,8 @@
rtti="true"
exceptions="true"
objdir="${executable.dir}/${lib.type}/cppunit_obj"
- debug="${debug}">
+ debug="${debug}"
+ projectsOnly="${projectsOnly}">
<fileset dir="${base.dir}/src/cppunit" includes="**/*.cpp"
excludes="DllMain.cpp"/>
<fileset dir="${base.dir}/include/cppunit" includes="**/*.h"/>
<includepath path="${include.dir}"/>
@@ -137,7 +139,8 @@
<target name="build-check" depends="build">
<mkdir dir="${executable.dir}/${lib.type}/cppunittest_obj"/>
- <cc name="${compiler}"
+ <property name="project.compiler" value="${compiler}"/>
+ <cc name="${project.compiler}"
outfile="${executable.dir}/${lib.type}/cppunittest"
subsystem="console"
multithreaded="true"
@@ -145,7 +148,8 @@
rtti="true"
exceptions="true"
objdir="${executable.dir}/${lib.type}/cppunittest_obj"
- debug="${debug}">
+ debug="${debug}"
+ projectsOnly="${projectsOnly}">
<fileset dir="${base.dir}/examples/cppunittest" includes="**/*.cpp,
**/*.h"/>
<includepath path="${include.dir}"/>
<defineset define="CPPUNIT_DLL" if="is-shared"/>
Propchange: logging/log4cxx/trunk/docs/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Sep 7 11:00:44 2006
@@ -1,4 +1,6 @@
-Makefile
-Makefile.in
+*.html
+ChangeLog
Doxyfile
-html
+css
+manual
+
Modified: logging/log4cxx/trunk/docs/Doxyfile.in
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/docs/Doxyfile.in?view=diff&rev=441160&r1=441159&r2=441160
==============================================================================
--- logging/log4cxx/trunk/docs/Doxyfile.in (original)
+++ logging/log4cxx/trunk/docs/Doxyfile.in Thu Sep 7 11:00:44 2006
@@ -471,13 +471,13 @@
# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
# generate HTML output.
-GENERATE_HTML = @enable_html_docs@
+GENERATE_HTML = YES
# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `html' will be used as the default path.
-HTML_OUTPUT = html
+HTML_OUTPUT = @manual_dest@
# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
@@ -582,7 +582,7 @@
# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
# generate Latex output.
-GENERATE_LATEX = @enable_latex_docs@
+GENERATE_LATEX = NO
# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
Modified: logging/log4cxx/trunk/xdocs/src/stylesheets/project.xml
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/xdocs/src/stylesheets/project.xml?view=diff&rev=441160&r1=441159&r2=441160
==============================================================================
--- logging/log4cxx/trunk/xdocs/src/stylesheets/project.xml (original)
+++ logging/log4cxx/trunk/xdocs/src/stylesheets/project.xml Thu Sep 7 11:00:44
2006
@@ -4,7 +4,7 @@
<title>log4cxx</title>
<!-- <logo href="images/logo.jpg">Apache Logging Services</logo> -->
- <copyright year="2004" />
+ <copyright year="2004-2006" />
<body>
@@ -17,11 +17,9 @@
<item name="Introduction" href="/index.html"/>
<item name="Download" href="/download.html"/>
<item name="Documentation" href="/manual/Introduction.html"/>
- <item name="CVS Repositories"
href="http://logging.apache.org/site/cvs-repositories.html"/>
+ <item name="SVN Repositories"
href="http://logging.apache.org/site/cvs-repositories.html"/>
<item name="Mailing Lists"
href="http://logging.apache.org/site/mailing-lists.html"/>
<item name="Bug Reporting"
href="http://logging.apache.org/site/bugreport.html"/>
- <item name="Gump"
href="http://brutus.apache.org/gump/public/logging-log4cxx/logging-log4cxx-ant/gump_work/build_logging-log4cxx_logging-log4cxx-ant.html"/>
-
</menu>
</body>
Added: logging/log4cxx/trunk/xdocs/src/stylesheets/site.css
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/xdocs/src/stylesheets/site.css?view=auto&rev=441160
==============================================================================
--- logging/log4cxx/trunk/xdocs/src/stylesheets/site.css (added)
+++ logging/log4cxx/trunk/xdocs/src/stylesheets/site.css Thu Sep 7 11:00:44
2006
@@ -0,0 +1,140 @@
+
+H1, H2, H3 {
+ color: #101099;
+}
+
+A:link, A:visited {
+ text-decoration: none;
+ color: #006699;
+}
+
+A:link:hover {
+ text-decoration: underline;
+}
+
+.centercol {
+ margin-top: 120px;
+ margin-left: 210px;
+ margin-right:210px;
+ max-width: 800px;
+}
+
+.leftcol {
+ position: absolute;
+ left: 10px;
+ top: 130px;
+ width: 190px;
+}
+
+.banner {
+ position: absolute;
+ left: 10px;
+ top: 10px;
+ height: 130px;
+ width: 1000px;
+}
+
+.menu_header, .menu_item {
+/* width: 190px; */
+ font-family: "trebuchet MS", Arial, Helvetica, sans-serif;
+ font-size: smaller;
+}
+
+.menu_header {
+ border:1px solid #AAAAAA;
+ background: #CCCCCC;
+ padding-left: 1ex;
+}
+
+.menu_item:hover {
+ background: #DDD;
+}
+
+.menu_item {
+ background: #EEEEEE;
+ padding-left: 2ex;
+ border-top: 0px solid #AAAAAA;
+ border-right: 1px solid #AAAAAA;
+ border-bottom:1px solid #AAAAAA;
+ border-left: 1px solid #AAAAAA;
+}
+
+.source {
+ border-top: 1px solid #DDDDDD;
+ border-bottom: 1px solid #DDDDDD;
+ background:#eee;
+ font-family: Courier, "MS Courier New", Prestige, Everson Monocourrier,
monospace;
+ font-size: smaller;
+ padding-bottom: 0.5ex;
+ padding-top: 0.5ex;
+ padding-left: 2ex;
+}
+
+table.ls {
+ background: #FFFFFF;
+}
+table.ls td {
+ background: #f4f4f4;
+ vertical-align: top;
+ padding-bottom: 1ex;
+}
+
+table.ls th {
+ background: #E4E4E4;
+}
+
+.index-faqSection {
+ font-size: larger;
+ padding-left: 0em;
+ font-weight: bolder;
+}
+.index-question {
+ padding-left: 1em;
+}
+
+.faqSection {
+ font-size: larger;
+ font-weight: bolder;
+}
+
+.question {
+ font-weight: bolder;
+}
+
+/* this class is used for screen output placed in <pre></pre> tags */
+.screen_output {
+ padding-left: 1em;
+ padding-right: 1em;
+ border-top: 1px solid #AAAAAA;
+ border-right: 1px solid #AAAAAA;
+ border-bottom:1px solid #AAAAAA;
+ border-left: 1px solid #AAAAAA;
+}
+
+
+.big {
+ font-size: larger;
+ font-weight: bold;
+}
+
+.small {
+ font-size: smaller;
+}
+
+.red {
+ color: #AA0000;
+}
+
+.msg_title {
+ padding-left: 1ex;
+ padding-right: 1ex;
+ font-family: Courier, "MS Courier New", Prestige, Everson Monocourrier,
monospace;
+ border: 1px solid #AAAAAA;
+ background: #DDDDFF;
+
+}
+
+.msg_meaning {
+ padding-left: 1em;
+ padding-right: 1em;
+}
