You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2017/04/09 06:50:09 UTC

[30/50] [abbrv] logging-log4cxx git commit: Project file generation moved to autogen, because this si called during a release and "site" itself doesn't use the generated project files anyway. They only need to exist for a release.

Project file generation moved to autogen, because this si called during a release and "site" itself doesn't use the generated project files anyway. They only need to exist for a release.



Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/1752fd5e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/1752fd5e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/1752fd5e

Branch: refs/heads/master
Commit: 1752fd5eda4f41da7e3f82f0ce45239e06d9f729
Parents: c446888
Author: Thorsten Sch�ning <ts...@apache.org>
Authored: Fri Mar 25 19:41:49 2016 +0000
Committer: Thorsten Sch�ning <ts...@apache.org>
Committed: Fri Mar 25 19:41:49 2016 +0000

----------------------------------------------------------------------
 build.xml                       | 10 +++++++++-
 src/site/apt/building/maven.apt |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/1752fd5e/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index cd0e755..54bd79a 100644
--- a/build.xml
+++ b/build.xml
@@ -2003,7 +2003,7 @@
 	</target>
 
 	<target	name="site"
-			depends="apidocs, gen-release-projects">
+			depends="apidocs">
 		<replace	dir="${target.dir}/site"
 					includes="**/*.html">
 			<replacetoken>&lt;html</replacetoken>
@@ -2138,6 +2138,14 @@
 		<exec executable="sh">
 			<arg value="autogen.sh" />
 		</exec>
+
+		<!--
+			This was coupled with "site" originally, but made building "site" itself on Windows unneccessary
+			hard and the projects are not even used on the website, but only in releases instead. This target
+			is called in that case and some part of project files generation is unix centered already, too.
+		 -->
+		<antcall target="gen-release-projects">
+		</antcall>
 	</target>
 </project>
 

http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/1752fd5e/src/site/apt/building/maven.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/building/maven.apt b/src/site/apt/building/maven.apt
index cbe3a80..ac33da7 100644
--- a/src/site/apt/building/maven.apt
+++ b/src/site/apt/building/maven.apt
@@ -62,7 +62,7 @@ $ mvn package
 *--------------------------+---------------------------------------------------------------------------------------------+
 | package                  | build logcxx library and build and run unit tests and examples.                             |
 *--------------------------+---------------------------------------------------------------------------------------------+
-| site                     | Generate documentation and IDE project files, requires doxygen.                             |
+| site                     | Generate website and apidoc files, requires doxygen.                                        |
 *--------------------------+---------------------------------------------------------------------------------------------+
 | site assembly:assembly   | Generate snapshot tarball and zip file.                                                     |
 *--------------------------+---------------------------------------------------------------------------------------------+