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:07 UTC
[28/50] [abbrv] logging-log4cxx git commit: Target "site" generates
project files currently,
which makes it hard on Windows to generate only the web site and current
apidocs,
because one needs a full compile environment. I e.g. use an unsupported
compile
Target "site" generates project files currently, which makes it hard on Windows to generate only the web site and current apidocs, because one needs a full compile environment. I e.g. use an unsupported compiler and generating xcode project files requires a unix shell, so one would need MSYS, Cygwin or such, which is a lot of overhead for just generating the website. So as a first step I moved the project generation into its own target and depend on it in site. But in a second step I'm looking for some way to remove project file generation under some circumstances.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/590e2ce2
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/590e2ce2
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/590e2ce2
Branch: refs/heads/master
Commit: 590e2ce2c13aa666921068b85d1eb1d012898ad9
Parents: 0547176
Author: Thorsten Sch�ning <ts...@apache.org>
Authored: Fri Mar 25 19:00:36 2016 +0000
Committer: Thorsten Sch�ning <ts...@apache.org>
Committed: Fri Mar 25 19:00:36 2016 +0000
----------------------------------------------------------------------
build.xml | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/590e2ce2/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 8267cf3..cd0e755 100644
--- a/build.xml
+++ b/build.xml
@@ -1942,9 +1942,7 @@
</replaceregexp>
</target>
- <target name="site"
- depends="apidocs">
- <!-- generate Visual Studio and XCode project files -->
+ <target name="gen-release-projects">
<antcall target="build-projects-vc6">
<param name="find" value="false" />
</antcall>
@@ -1959,6 +1957,7 @@
includes="**/*.dsp"
/>
</replaceregexp>
+
<replaceregexp flags="g"
match=".\\apr.dsp"
replace="..\\\\..\\\\apr\\\\apr.dsp">
@@ -1966,6 +1965,7 @@
includes="**/*.dsw"
/>
</replaceregexp>
+
<replaceregexp flags="g"
match=".\\aprutil.dsp"
replace="..\\\\..\\\\apr-util\\\\aprutil.dsp">
@@ -1973,6 +1973,7 @@
includes="**/*.dsw"
/>
</replaceregexp>
+
<replaceregexp flags="g"
match=".\\xml.dsp"
replace="..\\\\..\\\\apr-util\\\\xml\\\\expat\\\\lib\\\\xml.dsp">
@@ -1980,6 +1981,7 @@
includes="**/*.dsw"
/>
</replaceregexp>
+
<!-- drop library search path -->
<replaceregexp flags="g"
match="<string>[\./]*/usr/lib</string>"
@@ -1998,6 +2000,10 @@
token="MacOSX10.4u.sdk"
value="MacOSX10.5.sdk"
/>
+ </target>
+
+ <target name="site"
+ depends="apidocs, gen-release-projects">
<replace dir="${target.dir}/site"
includes="**/*.html">
<replacetoken><html</replacetoken>