summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortschoening <tschoening@13f79535-47bb-0310-9956-ffa450edef68>2016-03-25 19:41:49 +0000
committertschoening <tschoening@13f79535-47bb-0310-9956-ffa450edef68>2016-03-25 19:41:49 +0000
commit2614cd49525e3b3c32c479981d53ced33031fc83 (patch)
tree265d3ddf33b17f9eb3ea8e261d64932514a73b6b
parentb19a950fafd6b3b2adcd036fd282e540b556e2bc (diff)
downloadlog4cxx-2614cd49525e3b3c32c479981d53ced33031fc83.tar.gz
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.
git-svn-id: http://svn.apache.org/repos/asf/incubator/log4cxx/trunk@1736647 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--build.xml10
-rw-r--r--src/site/apt/building/maven.apt2
2 files changed, 10 insertions, 2 deletions
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>
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. |
*--------------------------+---------------------------------------------------------------------------------------------+