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 ts...@apache.org on 2016/03/25 12:31:44 UTC
svn commit: r1736561 - in /incubator/log4cxx/trunk: build.xml
src/ant/apr-build.xml src/ant/apr-util-build.xml src/ant/esmtp-build.xml
src/assembly/source.xml
Author: tschoening
Date: Fri Mar 25 11:31:44 2016
New Revision: 1736561
URL: http://svn.apache.org/viewvc?rev=1736561&view=rev
Log:
All the IDE project files are now generated in one directory in the target dir to improve its clarity. They are still in the generated release archives and a "mvn clear && mvn package" still passes. So it doesn't look I broke something.
Modified:
incubator/log4cxx/trunk/build.xml
incubator/log4cxx/trunk/src/ant/apr-build.xml
incubator/log4cxx/trunk/src/ant/apr-util-build.xml
incubator/log4cxx/trunk/src/ant/esmtp-build.xml
incubator/log4cxx/trunk/src/assembly/source.xml
Modified: incubator/log4cxx/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/build.xml?rev=1736561&r1=1736560&r2=1736561&view=diff
==============================================================================
--- incubator/log4cxx/trunk/build.xml (original)
+++ incubator/log4cxx/trunk/build.xml Fri Mar 25 11:31:44 2016
@@ -851,7 +851,7 @@
excludes="log4cxx/private/*.cpp **/aprinitializer.h.cpp"
/>
<includepath path="${include.dir}" />
- <project outfile="${projects.dir}/header-check"
+ <project outfile="${projects.dir}/projects/header-check"
type="${project.type}"
if="project.if"
/>
@@ -1033,7 +1033,7 @@
&libsets;
<project type="${project.type}"
- outfile="${projects.dir}/${lib.name}"
+ outfile="${projects.dir}/projects/${lib.name}"
if="project.if">
<comment>&license;</comment>
<dependency file="${projects.dir}/apr" />
@@ -1116,7 +1116,7 @@
/>
&libsets;
- <project outfile="${projects.dir}/${example.name}"
+ <project outfile="${projects.dir}/projects/${example.name}"
type="${project.type}"
if="project.if">
<comment>&license;</comment>
@@ -1276,7 +1276,7 @@
/>
&libsets;
- <project outfile="${projects.dir}/testsuite"
+ <project outfile="${projects.dir}/projects/testsuite"
type="${project.type}"
if="project.if">
<comment>&license;</comment>
@@ -1375,7 +1375,7 @@
<libset libs="cw32mt" if="is-bcc" />
- <project outfile="${projects.dir}/testsuite-standalone"
+ <project outfile="${projects.dir}/projects/testsuite-standalone"
type="${project.type}"
if="project.if">
<comment>&license;</comment>
@@ -1669,7 +1669,7 @@
</target>
<target name="build-projects">
- <mkdir dir="${projects.dir}" />
+ <mkdir dir="${projects.dir}/projects" />
<property name="project.type"
value="msvc6"
/>
@@ -2134,3 +2134,4 @@
</exec>
</target>
</project>
+
Modified: incubator/log4cxx/trunk/src/ant/apr-build.xml
URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/ant/apr-build.xml?rev=1736561&r1=1736560&r2=1736561&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/ant/apr-build.xml (original)
+++ incubator/log4cxx/trunk/src/ant/apr-build.xml Fri Mar 25 11:31:44 2016
@@ -263,7 +263,7 @@
/>
<project type="${project.type}"
- outfile="${projects.dir}/apr"
+ outfile="${projects.dir}/projects/apr"
if="project.if">
<comment>&license;</comment>
</project>
@@ -327,7 +327,7 @@
/>
<project type="${project.type}"
- outfile="${projects.dir}/${test}"
+ outfile="${projects.dir}/projects/${test}"
if="project.if">
<comment>&license;</comment>
<dependency file="${projects.dir}/apr" />
@@ -554,7 +554,7 @@
/>
<project type="${project.type}"
- outfile="${projects.dir}/mod_test"
+ outfile="${projects.dir}/projects/mod_test"
if="project.if">
<comment>&license;</comment>
<dependency file="${projects.dir}/apr-1" />
@@ -637,7 +637,7 @@
/>
<project type="${project.type}"
- outfile="${projects.dir}/testall"
+ outfile="${projects.dir}/projects/testall"
if="project.if">
<comment>&license;</comment>
<dependency file="${projects.dir}/apr-1" />
Modified: incubator/log4cxx/trunk/src/ant/apr-util-build.xml
URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/ant/apr-util-build.xml?rev=1736561&r1=1736560&r2=1736561&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/ant/apr-util-build.xml (original)
+++ incubator/log4cxx/trunk/src/ant/apr-util-build.xml Fri Mar 25 11:31:44 2016
@@ -252,7 +252,7 @@
<libset libs="cw32mt" if="is-bcc" />
<project type="${project.type}"
- outfile="${projects.dir}/xml"
+ outfile="${projects.dir}/projects/xml"
if="project.if">
<comment>&license;</comment>
</project>
@@ -354,7 +354,7 @@
/>
<project type="${project.type}"
- outfile="${projects.dir}/aprutil"
+ outfile="${projects.dir}/projects/aprutil"
if="project.if">
<comment>&license;</comment>
<dependency file="${projects.dir}/apr" />
@@ -432,7 +432,7 @@
/>
<project type="${project.type}"
- outfile="${projects.dir}/${test}"
+ outfile="${projects.dir}/projects/${test}"
if="project.if">
<comment>&license;</comment>
<dependency file="${projects.dir}/apr" />
Modified: incubator/log4cxx/trunk/src/ant/esmtp-build.xml
URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/ant/esmtp-build.xml?rev=1736561&r1=1736560&r2=1736561&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/ant/esmtp-build.xml (original)
+++ incubator/log4cxx/trunk/src/ant/esmtp-build.xml Fri Mar 25 11:31:44 2016
@@ -141,7 +141,7 @@
/>
<project type="${project.type}"
- outfile="${projects.dir}/libesmtp"
+ outfile="${projects.dir}/projects/libesmtp"
if="project.if"
/>
</cc>
Modified: incubator/log4cxx/trunk/src/assembly/source.xml
URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/assembly/source.xml?rev=1736561&r1=1736560&r2=1736561&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/assembly/source.xml (original)
+++ incubator/log4cxx/trunk/src/assembly/source.xml Fri Mar 25 11:31:44 2016
@@ -106,7 +106,7 @@
</fileSet>
<fileSet>
- <directory>target</directory>
+ <directory>target/projects</directory>
<lineEnding>keep</lineEnding>
<outputDirectory>projects</outputDirectory>