Repository: logging-log4cxx Updated Branches: refs/heads/master a7a773db2 -> bbceafe7e
site.deploy used some older SVN repo and the version can be accessed using maven. Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/bbceafe7 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/bbceafe7 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/bbceafe7 Branch: refs/heads/master Commit: bbceafe7e67adf17a5036d85d1a6f4238e8736c9 Parents: a7a773d Author: Thorsten Schöning <[email protected]> Authored: Fri Jul 7 10:53:32 2017 +0200 Committer: Thorsten Schöning <[email protected]> Committed: Fri Jul 7 10:53:32 2017 +0200 ---------------------------------------------------------------------- build.xml | 109 ++++++++++++++++++++++++++++++++------------------------- 1 file changed, 61 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/bbceafe7/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 6e47841..e8c2ab1 100644 --- a/build.xml +++ b/build.xml @@ -149,9 +149,6 @@ <property name="lib.prefix" value="" /> - <property name="version" - value="0.11.0" - /> <property name="enable-char" value="1" /> @@ -174,22 +171,22 @@ value="auto" /> <property name="svnsite.url" - value="https://svn.apache.org/repos/asf/logging/site/trunk/docs/log4cxx"; + value="https://svn.apache.org/repos/infra/websites/production/logging/content/log4cxx/${project.version}"; /> <propertyregex property="version.major" - input="${version}" + input="${project.version}" regexp="^(\d+)" select="\1" /> <propertyregex property="version.minor" - input="${version}" + input="${project.version}" regexp="\.(\d+)\." select="\1" /> <propertyregex property="version.rev" - input="${version}" - regexp="(\d+)$" + input="${project.version}" + regexp="(\d+)(?:-.+)?$" select="\1" /> @@ -1886,7 +1883,7 @@ /> <replace file="${target.dir}/Doxyfile"> <replacefilter token="@version@" - value="${version}" + value="${project.version}" /> <replacefilter token="@base_dir@" value="${base.dir}" @@ -2002,28 +1999,38 @@ /> </target> + <target name="site-text-file-cleanup"> + <fixcrlf srcDir="${base.dir}/target/${subDir}" + tab="asis" + tablength="4" + fixlast="false" + eof="asis" + eol="unix" + includes="**/*.css **/*.html" + /> + + <replaceregexp flags="mg" + match="(?: |\t)+$" + replace=""> + <fileset dir="${base.dir}/target/${subDir}" + includes="**/*.css, **/*.html" + /> + </replaceregexp> + </target> + <target name="site" depends="apidocs"> + <antcall target="site-text-file-cleanup"> + <param name="subDir" + value="site" + /> + </antcall> </target> <target name="gump" depends="check, header-check" /> - <target name="fixcrlf" - depends="init" - description="repair end-of-line sequences"> - <fixcrlf srcDir="${base.dir}" - tab="remove" - tablength="3" - eof="remove" - fixlast="true" - eol="unix" - includes="*.xml **/*.cpp **/*.h" - excludes="lib/**/*" - /> - </target> - <target name="prepare-changes" description="Prepares changes.xml from a JIRA issues list"> <xslt style="src/changes/changes.xslt" @@ -2032,17 +2039,16 @@ /> </target> - <target name="checkout-site" - unless="svn-available"> - <exec executable="svn"> - <arg value="co" /> - <arg value="${svnsite.url}" /> - <arg value="target/site-deploy" /> + <target name="checkout-site"> + <exec executable="svn" + failonerror="true"> + <arg value="co" /> + <arg value="${svnsite.url}" /> + <arg value="target/site-deploy" /> </exec> </target> - <target name="update-site" - if="svn-available"> + <target name="update-site"> <exec executable="svn" dir="target/site-deploy" failonerror="true"> @@ -2054,21 +2060,21 @@ depends="checkout-site, update-site" /> - <target name="mime=html"> + <target name="svn-mime=css"> <exec executable="svn"> - <arg value="propset" /> - <arg value="svn:mime-type" /> - <arg value="text/html" /> - <arg value="${src.html}" /> + <arg value="propset" /> + <arg value="svn:mime-type" /> + <arg value="text/css" /> + <arg value="${src.css}" /> </exec> </target> - <target name="mime=css"> + <target name="svn-mime=html"> <exec executable="svn"> - <arg value="propset" /> - <arg value="svn:mime-type" /> - <arg value="text/css" /> - <arg value="${src.css}" /> + <arg value="propset" /> + <arg value="svn:mime-type" /> + <arg value="text/html" /> + <arg value="${src.html}" /> </exec> </target> @@ -2084,28 +2090,35 @@ <taskdef name="foreach" classname="net.sf.antcontrib.logic.ForEach" /> - <foreach target="mime=html" - param="src.html"> + <foreach target="svn-mime=css" + param="src.css"> <path> <fileset dir="target/site-deploy" - includes="**/*.html" + includes="**/*.css" /> </path> </foreach> - <foreach target="mime=css" - param="src.css"> + <foreach target="svn-mime=html" + param="src.html"> <path> <fileset dir="target/site-deploy" - includes="**/*.css" + includes="**/*.html" /> </path> </foreach> + <antcall target="site-text-file-cleanup"> + <param name="subDir" + value="site-deploy" + /> + </antcall> + <!-- requires that SVN_EDITOR, VISUAL or EDITOR being set to edit commit description --> <exec executable="svn" dir="target/site-deploy" failonerror="true"> - <arg value="commit" /> + <arg value="commit" /> + <arg value="--force-interactive" /> </exec> </target>
