svn commit: r1736644 - /incubator/log4cxx/trunk/build.xml

[tschoening]

Author: tschoening
Date: Fri Mar 25 19:00:36 2016
New Revision: 1736644

URL: http://svn.apache.org/viewvc?rev=1736644&view=rev
Log:
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.

Modified:
    incubator/log4cxx/trunk/build.xml

Modified: incubator/log4cxx/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/incubator/log4cxx/trunk/build.xml?rev=1736644&r1=1736643&r2=1736644&view=diff
==============================================================================
--- incubator/log4cxx/trunk/build.xml (original)
+++ incubator/log4cxx/trunk/build.xml Fri Mar 25 19:00:36 2016
@@ -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>