summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortschoening <tschoening@13f79535-47bb-0310-9956-ffa450edef68>2016-03-25 19:00:36 +0000
committertschoening <tschoening@13f79535-47bb-0310-9956-ffa450edef68>2016-03-25 19:00:36 +0000
commit5bcbff8416e455092bb06e395de2ae82b038e349 (patch)
treef2e0ea3b42e9f67236d726f4a44b636710d92c31
parentb6da12f9af2200959e34a83ee127735a4a89b275 (diff)
downloadlog4cxx-5bcbff8416e455092bb06e395de2ae82b038e349.tar.gz
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.
git-svn-id: http://svn.apache.org/repos/asf/incubator/log4cxx/trunk@1736644 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--build.xml12
1 files changed, 9 insertions, 3 deletions
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="&lt;string&gt;[\./]*/usr/lib&lt;/string&gt;"
@@ -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>&lt;html</replacetoken>