[jbosstools-commits] JBoss Tools SVN: r37877 - trunk/build/aggregate.

Author: nickboldt Date: 2012-01-16 15:00:53 -0500 (Mon, 16 Jan 2012) New Revision: 37877 Modified: trunk/build/aggregate/build.xml trunk/build/aggregate/site.properties.xsl trunk/build/aggregate/site.xsl Log: JBIDE-10640 link generated file from index.html; remove xsl files from target folder Modified: trunk/build/aggregate/build.xml =================================================================== --- trunk/build/aggregate/build.xml 2012-01-16 19:51:50 UTC (rev 37876) +++ trunk/build/aggregate/build.xml 2012-01-16 20:00:53 UTC (rev 37877) @@ -45,7 +45,7 @@ </condition> <property file="${associate.properties}" /> <echo level="verbose">Loaded associate sites from ${associate.properties}</echo> - <property name="web.content.files" value="index.html, web/*.css, README*, *directory.xml, site.*" /> + <property name="web.content.files" value="index.html, web/*.css, README*, *directory.xml, site.xml, site.properties" /> <target name="init"> <ant antfile="${build.xml}" target="init" /> @@ -501,6 +501,8 @@ <!-- get site.xml as HTML, then load into ${site.contents} in order to merge into index.html --> <antcallback target="transform.site.xml" return="site.contents" /> + <antcallback target="generate.site.properties" return="site.properties.html"/> + <antcallback target="generate.directory.xml" return="directory.xml.html"/> <copy todir="${output.dir}" overwrite="true"> @@ -510,6 +512,7 @@ <expandproperties /> <replacetokens> <token key="DIRECTORY.XML" value="${directory.xml.html}"/> + <token key="SITE.PROPERTIES" value="${site.properties.html}"/> </replacetokens> </filterchain> </copy> @@ -522,6 +525,15 @@ </copy> </target> + <target name="generate.site.properties"> + <!-- turn site.xml into site.properties --> + <delete quiet="true" file="${update.site.source.dir}/site.properties" /> + <xslt style="site.properties.xsl" in="${update.site.source.dir}/site.xml" out="${update.site.source.dir}/site.properties" force="true"> + <classpath location="${COMMON_TOOLS}/saxon.jar" /> + </xslt> + <var name="site.properties.html" value=":: &lt;a href=&quot;site.properties&quot; style=&quot;font-size:x-small&quot;&gt;site.properties&lt;/a&gt;"/> + </target> + <target name="generate.directory.xml"> <!-- get filename matching org.jboss.tools.central.discovery_1.0.0.v20111013-0511-M4.jar, then generate replacement directory.xml file --> <path id="central.discovery.jar.id"> @@ -558,13 +570,6 @@ <loadfile property="site.contents" srcfile="${update.site.source.dir}/site.html" failonerror="false" /> <property name="site.contents" value="" /> <delete file="${update.site.source.dir}/site.html" quiet="true" /> - - <!-- turn site.xml into site.properties --> - <delete quiet="true" file="${update.site.source.dir}/site.properties" /> - <xslt style="site.properties.xsl" in="${update.site.source.dir}/site.xml" out="${update.site.source.dir}/site.properties" force="true"> - <classpath location="${COMMON_TOOLS}/saxon.jar" /> - </xslt> - </target> <!-- look for http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.*/logs/z...; Modified: trunk/build/aggregate/site.properties.xsl =================================================================== --- trunk/build/aggregate/site.properties.xsl 2012-01-16 19:51:50 UTC (rev 37876) +++ trunk/build/aggregate/site.properties.xsl 2012-01-16 20:00:53 UTC (rev 37877) @@ -8,7 +8,7 @@ <xsl:sort select="@name" /> <xsl:variable name="catg"><xsl:value-of select="@name"/></xsl:variable> # -<xsl:value-of select="$catg" /> = \ +<xsl:value-of select="$catg" />.category.features = \ <xsl:for-each select="//feature"> <xsl:sort select="@id" /> <xsl:if test="count(./category[contains(@name,$catg)])>0"><xsl:value-of select="@id" />, Modified: trunk/build/aggregate/site.xsl =================================================================== --- trunk/build/aggregate/site.xsl 2012-01-16 19:51:50 UTC (rev 37876) +++ trunk/build/aggregate/site.xsl 2012-01-16 20:00:53 UTC (rev 37877) @@ -119,6 +119,7 @@ </td> <td class="rowLine" colspan="1"> @DIRECTORY.XML@ + @SITE.PROPERTIES@ </td> </tr> </table>