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.

git-svn-id: http://svn.apache.org/repos/asf/incubator/log4cxx/trunk@1736561 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 16 insertions, 15 deletions

diff --git a/build.xml b/build.xml
index 65421ca..8267cf3 100644
--- a/build.xml
+++ b/build.xml
@@ -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>
+
diff --git a/src/ant/apr-build.xml b/src/ant/apr-build.xml
index 444cd51..6ddb282 100644
--- a/src/ant/apr-build.xml
+++ b/src/ant/apr-build.xml
@@ -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" />
diff --git a/src/ant/apr-util-build.xml b/src/ant/apr-util-build.xml
index e9dc810..70ba3b2 100644
--- a/src/ant/apr-util-build.xml
+++ b/src/ant/apr-util-build.xml
@@ -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"						/>
diff --git a/src/ant/esmtp-build.xml b/src/ant/esmtp-build.xml
index 53a2066..3e7e63a 100644
--- a/src/ant/esmtp-build.xml
+++ b/src/ant/esmtp-build.xml
@@ -141,7 +141,7 @@
 		/>
 
 		<project	type="${project.type}"
-					outfile="${projects.dir}/libesmtp"
+					outfile="${projects.dir}/projects/libesmtp"
 					if="project.if"
 		/>
 	</cc>
diff --git a/src/assembly/source.xml b/src/assembly/source.xml
index dac9320..22a5ecd 100644
--- a/src/assembly/source.xml
+++ b/src/assembly/source.xml
@@ -106,7 +106,7 @@
 		</fileSet>
 
 		<fileSet>
-			<directory>target</directory>
+			<directory>target/projects</directory>
 			<lineEnding>keep</lineEnding>
 			<outputDirectory>projects</outputDirectory>