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/02/06 19:23:51 UTC
svn commit: r619089 - in /logging/log4cxx/trunk: build.xml
src/ant/apr-build.xml src/ant/apr-util-build.xml
Author: carnold
Date: Wed Feb 6 10:23:32 2008
New Revision: 619089
URL: http://svn.apache.org/viewvc?rev=619089&view=rev
Log:
LOGCXX-230: Add comments to generated project files, requires rev 150 of cpptasks
Modified:
logging/log4cxx/trunk/build.xml
logging/log4cxx/trunk/src/ant/apr-build.xml
logging/log4cxx/trunk/src/ant/apr-util-build.xml
Modified: logging/log4cxx/trunk/build.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/build.xml?rev=619089&r1=619088&r2=619089&view=diff
==============================================================================
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Wed Feb 6 10:23:32 2008
@@ -1,4 +1,21 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+
+-->
<!DOCTYPE project [
<!ENTITY libsets '
<libset libs="${apr-util.lib.prefix}${apr-util.lib.name}${apr-util.lib.suffix}" dir="${apr-util.lib.dir}" if="apr-util.lib.dir"/>
@@ -13,12 +30,7 @@
<syslibset libs="stdc++" if="is-gcc"/>
<syslibset libs="cw32mt" if="is-bcc"/>
'>
-<!ENTITY common SYSTEM 'src/ant/common.xml'>
-<!ENTITY find-apr SYSTEM 'src/ant/find-apr.xml'>
-<!ENTITY find-apr-util SYSTEM 'src/ant/find-apr-util.xml'>
-<!ENTITY find-libesmtp SYSTEM 'src/ant/find-libesmtp.xml'>
-]>
-<!--
+<!ENTITY license '
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -33,8 +45,12 @@
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.
-
--->
+'>
+<!ENTITY common SYSTEM 'src/ant/common.xml'>
+<!ENTITY find-apr SYSTEM 'src/ant/find-apr.xml'>
+<!ENTITY find-apr-util SYSTEM 'src/ant/find-apr-util.xml'>
+<!ENTITY find-libesmtp SYSTEM 'src/ant/find-libesmtp.xml'>
+]>
<!--
This file builds log4cxx using Apache Ant (http://ant.apache.org)
@@ -116,7 +132,7 @@
> ant build-projects-vc6
Builds Microsoft Visual Studio 6 projects.
--vc8, -vc9 and -xcode for Visual Studio 2005, 2008 and Apple Xcode 2 and later.
+-vc7, -vc8, -vc9 and -xcode for Visual Studio .NET, 2005, 2008 and Apple Xcode 2 and later.
respectively.
Command line options:
@@ -516,6 +532,7 @@
<compilerarg value="${pic-option}" if="pic-option"/>
&libsets;
<project type="${project.type}" outfile="${projects.dir}/${lib.name}" if="project.if">
+ <comment>&license;</comment>
<dependency file="${projects.dir}/apr-1"/>
<dependency file="${projects.dir}/aprutil-1" depends="apr-1"/>
</project>
@@ -552,6 +569,7 @@
&libsets;
<project outfile="${projects.dir}/${example.name}" type="${project.type}" if="project.if">
+ <comment>&license;</comment>
<dependency file="${projects.dir}/apr-1"/>
<dependency name="${projects.dir}/aprutil-1"/>
<dependency file="${projects.dir}/log4cxx" depends="apr-1,aprutil-1"/>
@@ -654,6 +672,7 @@
&libsets;
<project outfile="${projects.dir}/testsuite" type="${project.type}" if="project.if">
+ <comment>&license;</comment>
<dependency file="${projects.dir}/apr-1"/>
<dependency file="${projects.dir}/aprutil-1" depends="apr-1"/>
<dependency file="${projects.dir}/log4cxx" depends="apr-1,aprutil-1"/>
@@ -703,6 +722,7 @@
<project outfile="${projects.dir}/testsuite-standalone"
type="${project.type}"
if="project.if">
+ <comment>&license;</comment>
<dependency file="${projects.dir}/apr-1"/>
<dependency file="${projects.dir}/aprutil-1" depends="apr-1"/>
</project>
@@ -914,6 +934,15 @@
description="Builds project files for Microsoft Visual C++ 6">
<antcall target="build-projects">
<param name="project.type" value="msvc6"/>
+ <param name="project.compiler" value="msvc"/>
+ <param name="os.family" value="windows"/>
+ </antcall>
+</target>
+
+<target name="build-projects-vc7" depends="init"
+ description="Builds project files for Microsoft Visual Studio .NET">
+ <antcall target="build-projects">
+ <param name="project.type" value="msvc7"/>
<param name="project.compiler" value="msvc"/>
<param name="os.family" value="windows"/>
</antcall>
Modified: logging/log4cxx/trunk/src/ant/apr-build.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/apr-build.xml?rev=619089&r1=619088&r2=619089&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/apr-build.xml (original)
+++ logging/log4cxx/trunk/src/ant/apr-build.xml Wed Feb 6 10:23:32 2008
@@ -18,6 +18,22 @@
-->
<!DOCTYPE project [
<!ENTITY common SYSTEM 'common.xml'>
+<!ENTITY license '
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+'>
]>
<!--
@@ -127,7 +143,10 @@
<libset libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
<libset libs="pthread dl" if="is-unix"/>
<libset libs="cw32mt" if="is-bcc"/>
- <project type="${project.type}" outfile="${projects.dir}/apr-1" if="project.if"/>
+ <project type="${project.type}" outfile="${projects.dir}/apr-1" if="project.if">
+ <comment>&license;</comment>
+ </project>
+
</cc>
<property name="apr.lib.dir" location="${executable.dir}"/>
</target>
@@ -157,7 +176,10 @@
<libset libs="cw32mt" if="is-bcc"/>
<libset libs="pthread dl" if="is-unix"/>
<libset libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
- <project type="${project.type}" outfile="${project.dir}/${test}" if="project.if"/>
+ <project type="${project.type}" outfile="${projects.dir}/${test}" if="project.if">
+ <comment>&license;</comment>
+ <dependency file="${projects.dir}/apr-1"/>
+ </project>
</cc>
</target>
@@ -293,7 +315,11 @@
<libset dir="${apr.lib.dir}" libs="${lib.prefix}${lib.name}${lib.suffix}"/>
<libset libs="cw32mt" if="is-bcc"/>
<libset libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
- <project type="${project.type}" outfile="${projects.dir}/mod_test" if="project.if"/>
+ <project type="${project.type}" outfile="${projects.dir}/mod_test" if="project.if">
+ <comment>&license;</comment>
+ <dependency file="${projects.dir}/apr-1"/>
+ </project>
+
</cc>
<copy file="${libmod_test.so}" tofile="${executable.dir}/.libs/mod_test.so"/>
</target>
@@ -341,7 +367,10 @@
<libset libs="cw32mt" if="is-bcc"/>
<libset libs="pthread dl" if="is-unix"/>
<libset libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
- <project type="${project.type}" outfile="${projects.dir}/testall" if="project.if"/>
+ <project type="${project.type}" outfile="${projects.dir}/testall" if="project.if">
+ <comment>&license;</comment>
+ <dependency file="${projects.dir}/apr-1"/>
+ </project>
</cc>
</target>
@@ -400,6 +429,16 @@
description="Builds project files for Microsoft Visual C++ 6">
<antcall target="build-projects">
<param name="project.type" value="msvc6"/>
+ <param name="project.compiler" value="msvc"/>
+ <param name="os.family" value="windows"/>
+ </antcall>
+</target>
+
+
+<target name="build-projects-vc7" depends="init"
+ description="Builds project files for Microsoft Visual Studio .NET">
+ <antcall target="build-projects">
+ <param name="project.type" value="msvc7"/>
<param name="project.compiler" value="msvc"/>
<param name="os.family" value="windows"/>
</antcall>
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=619089&r1=619088&r2=619089&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/apr-util-build.xml (original)
+++ logging/log4cxx/trunk/src/ant/apr-util-build.xml Wed Feb 6 10:23:32 2008
@@ -19,6 +19,22 @@
<!DOCTYPE project [
<!ENTITY common SYSTEM 'common.xml'>
<!ENTITY find-apr SYSTEM 'find-apr.xml'>
+<!ENTITY license '
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+'>
]>
<!--
@@ -165,6 +181,7 @@
<define name="EILSEQ" value="50"/>
</defineset>
<project type="${project.type}" outfile="${projects.dir}/aprutil-1" if="project.if">
+ <comment>&license;</comment>
<dependency file="${projects.dir}/apr-1"/>
</project>
</cc>
@@ -201,6 +218,7 @@
<libset libs="iconv" if="has-iconv"/>
<libset libs="sqlite3" if="has-sqlite3"/>
<project type="${project.type}" outfile="${projects.dir}/${test}" if="project.if">
+ <comment>&license;</comment>
<dependency file="${projects.dir}/apr-1"/>
<dependency file="${projects.dir}/aprutil-1" depends="apr-1"/>
</project>
@@ -312,6 +330,16 @@
<param name="project.compiler" value="msvc"/>
<param name="os.family" value="windows"/>
</antcall>
+ </target>
+
+ <target name="build-projects-vc7" depends="init"
+ description="Builds project files for Microsoft Visual Studio .NET">
+ <antcall target="build-projects">
+ <param name="projects.dir" value="${projects.dir}"/>
+ <param name="project.type" value="msvc7"/>
+ <param name="project.compiler" value="msvc"/>
+ <param name="os.family" value="windows"/>
+ </antcall>
</target>
<target name="build-projects-vc8" depends="init"