[jboss-cvs] JBossAS SVN: r110232 - in projects/jboss-jca/trunk: doc and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Dec 29 23:22:34 EST 2010
Author: jeff.zhang
Date: 2010-12-29 23:22:33 -0500 (Wed, 29 Dec 2010)
New Revision: 110232
Added:
projects/jboss-jca/trunk/doc/developerguide/build.xml
projects/jboss-jca/trunk/doc/userguide/build.xml
Removed:
projects/jboss-jca/trunk/doc/build.xml
Modified:
projects/jboss-jca/trunk/build.xml
projects/jboss-jca/trunk/sjc/build.xml
Log:
[JBJCA-473] seperate docant target for different formats
Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml 2010-12-30 01:18:29 UTC (rev 110231)
+++ projects/jboss-jca/trunk/build.xml 2010-12-30 04:22:33 UTC (rev 110232)
@@ -288,37 +288,11 @@
<!-- =================================
Target: manual
================================= -->
- <target name="manual" depends="manual-init">
- <antcall target="manual-support"/>
- <antcall target="manual-generate"/>
+ <target name="manual">
+ <ant dir="${doc.dir}/developerguide" inheritRefs="false" inheritAll="false"/>
+ <ant dir="${doc.dir}/userguide" inheritRefs="false" inheritAll="false"/>
</target>
- <target name="manual-init">
- <available file="${tools.dir}/docant/target/docbook/staging" type="dir" property="docant.support" value="true"/>
- <available file="${target.dir}/docbook" type="dir" property="docant.gen" value="true"/>
- </target>
-
- <target name="manual-support" unless="docant.support">
- <ant antfile="${tools.dir}/docant/build.xml" target="clean" inheritRefs="false" inheritAll="false">
- <property name="docant.dir" value="${tools.dir}/docant"/>
- </ant>
-
- <ant antfile="${tools.dir}/docant/build.xml" inheritRefs="false" inheritAll="false">
- <property name="docant.dir" value="${tools.dir}/docant"/>
- </ant>
- </target>
-
- <target name="manual-generate" unless="docant.gen">
- <copy todir="${build.dir}">
- <fileset dir="${tools.dir}/docant/target"/>
- </copy>
- <ant antfile="${doc.dir}/build.xml" inheritRefs="false" inheritAll="false">
- <property name="docant.dir" value="${tools.dir}/docant"/>
- <property name="docant.target.dir" value="${build.dir}"/>
- <property name="target.dir" value="${target.dir}"/>
- </ant>
- </target>
-
<!-- =================================
Target: prepare test
================================= -->
@@ -398,13 +372,14 @@
<mkdir dir="${build.dir}/${name}-${major}.${minor}.${patch}.${type}/doc" />
<mkdir dir="${build.dir}/${name}-${major}.${minor}.${patch}.${type}/doc/spec" />
- <antcall target="manual"/>
+ <ant dir="${doc.dir}/developerguide" target="pdf" inheritRefs="false" inheritAll="false"/>
+ <ant dir="${doc.dir}/userguide" target="pdf" inheritRefs="false" inheritAll="false"/>
+
<copy flatten="true" todir="${build.dir}/${name}-${major}.${minor}.${patch}.${type}/doc">
- <fileset dir="${target.dir}/docbook">
+ <fileset dir="${target.dir}/docs">
<include name="**/*.pdf"/>
</fileset>
</copy>
- <delete dir="${build.dir}/docbook"/>
<ant dir="sjc" inheritRefs="true" target="war"/>
<delete dir="${build.dir}/sjc"/>
Deleted: projects/jboss-jca/trunk/doc/build.xml
===================================================================
--- projects/jboss-jca/trunk/doc/build.xml 2010-12-30 01:18:29 UTC (rev 110231)
+++ projects/jboss-jca/trunk/doc/build.xml 2010-12-30 04:22:33 UTC (rev 110232)
@@ -1,62 +0,0 @@
-<project name="Docbook-Ironjacamar" default="process" basedir=".">
-
- <property name="docant.dir" value="${basedir}/../tools/docant"/>
- <property name="target.dir" value="${docant.dir}/target" />
- <property name="docant.target.dir" value="${docant.dir}/target" />
-
- <import file="${docant.dir}/support.xml"/>
-
- <macrodef name="transformer">
- <attribute name="srcDir"/>
- <attribute name="srcDocName"/>
- <attribute name="pdfName"/>
- <sequential>
- <delete dir="${docant.target.dir}/docbook/publish"/>
-
- <copy todir="${docant.target.dir}/docbook/staging/images/images">
- <fileset dir="${basedir}/@{srcDir}/en-US/images/"/>
- </copy>
-
- <docant sourceDirectory="@{srcDir}"
- sourceDocumentName="@{srcDocName}"
- baseOutputDirectory="${docant.target.dir}">
-
- <format name="html_single"
- stylesheetResource="classpath:/ironjacamar-style/xhtml-single.xsl"
- targetFinalName="index.html"/>
-
- <format name="html"
- stylesheetResource="classpath:/ironjacamar-style/xhtml.xsl"
- targetFinalName="index.html"/>
-
- <format name="pdf"
- stylesheetResource="classpath:/ironjacamar-style/pdf.xsl"
- targetFinalName="@{pdfName}"/>
-
- </docant>
-
- <mkdir dir="${target.dir}/docbook/@{srcDir}"/>
- <move file="${docant.target.dir}/docbook/publish" tofile="${target.dir}/docbook/@{srcDir}" failonerror="false"/>
-
- <delete>
- <fileset dir="${docant.target.dir}/docbook/staging/images/images">
- <exclude name="community/**"/>
- </fileset>
- </delete>
-
- </sequential>
- </macrodef>
-
- <target name="process">
-
- <transformer srcDir="developerguide"
- srcDocName="developerguide.xml"
- pdfName="IronJacamarDeveloperGuide.pdf"/>
-
- <transformer srcDir="userguide"
- srcDocName="userguide.xml"
- pdfName="IronJacamarUsersGuide.pdf"/>
-
- </target>
-
-</project>
Copied: projects/jboss-jca/trunk/doc/developerguide/build.xml (from rev 110231, projects/jboss-jca/trunk/doc/build.xml)
===================================================================
--- projects/jboss-jca/trunk/doc/developerguide/build.xml (rev 0)
+++ projects/jboss-jca/trunk/doc/developerguide/build.xml 2010-12-30 04:22:33 UTC (rev 110232)
@@ -0,0 +1,94 @@
+<project name="Docbook-Ironjacamar" default="all" basedir=".">
+
+ <property name="docant.dir" value="${basedir}/../../tools/docant"/>
+ <property name="target.dir" value="${basedir}/../../target" />
+ <property name="docant.target.dir" value="${basedir}/../../build" />
+
+ <import file="${docant.dir}/support.xml"/>
+
+ <property name="srcDir" value="." />
+ <property name="srcDocName" value="developerguide" />
+ <property name="srcDocNameFile" value="${srcDocName}.xml" />
+ <property name="pdfName" value="IronJacamarDeveloperGuide.pdf" />
+
+ <target name="docant-init" >
+ <available file="${docant.dir}/target/docbook/staging" type="dir" property="docant.support" value="true"/>
+ </target>
+
+ <target name="docant-support" unless="docant.support">
+ <ant antfile="${docant.dir}/build.xml" inheritRefs="false" inheritAll="false">
+ <property name="docant.dir" value="${docant.dir}"/>
+ </ant>
+ </target>
+
+ <target name="docant-prepare" depends="docant-init, docant-support">
+ <copy todir="${docant.target.dir}">
+ <fileset dir="${docant.dir}/target"/>
+ </copy>
+
+ <copy todir="${docant.target.dir}/docbook/staging/images/images">
+ <fileset dir="${basedir}/${srcDir}/en-US/images/"/>
+ </copy>
+ </target>
+
+ <target name="docant-post">
+ <mkdir dir="${target.dir}/docs/${srcDocName}"/>
+ <move file="${docant.target.dir}/docbook/publish" tofile="${target.dir}/docs/${srcDocName}" failonerror="false"/>
+ <delete dir="${docant.target.dir}/docbook/"/>
+ </target>
+
+ <target name="html">
+ <antcall target="docant-prepare"/>
+ <docant sourceDirectory="${srcDir}"
+ sourceDocumentName="${srcDocNameFile}"
+ baseOutputDirectory="${docant.target.dir}">
+ <format name="html"
+ stylesheetResource="classpath:/ironjacamar-style/xhtml.xsl"
+ targetFinalName="index.html"/>
+ </docant>
+ <antcall target="docant-post"/>
+ </target>
+
+ <target name="html-single">
+ <antcall target="docant-prepare"/>
+ <docant sourceDirectory="${srcDir}"
+ sourceDocumentName="${srcDocNameFile}"
+ baseOutputDirectory="${docant.target.dir}">
+ <format name="html_single"
+ stylesheetResource="classpath:/ironjacamar-style/xhtml-single.xsl"
+ targetFinalName="index.html"/>
+ </docant>
+ <antcall target="docant-post"/>
+ </target>
+
+ <target name="pdf">
+ <antcall target="docant-prepare"/>
+ <docant sourceDirectory="${srcDir}"
+ sourceDocumentName="${srcDocNameFile}"
+ baseOutputDirectory="${docant.target.dir}">
+ <format name="pdf"
+ stylesheetResource="classpath:/ironjacamar-style/pdf.xsl"
+ targetFinalName="${pdfName}"/>
+ </docant>
+ <antcall target="docant-post"/>
+ </target>
+
+ <target name="all">
+ <antcall target="docant-prepare"/>
+ <docant sourceDirectory="${srcDir}"
+ sourceDocumentName="${srcDocNameFile}"
+ baseOutputDirectory="${docant.target.dir}">
+ <format name="html"
+ stylesheetResource="classpath:/ironjacamar-style/xhtml.xsl"
+ targetFinalName="index.html"/>
+ <format name="html_single"
+ stylesheetResource="classpath:/ironjacamar-style/xhtml-single.xsl"
+ targetFinalName="index.html"/>
+ <format name="pdf"
+ stylesheetResource="classpath:/ironjacamar-style/pdf.xsl"
+ targetFinalName="${pdfName}"/>
+ </docant>
+ <antcall target="docant-post"/>
+ </target>
+
+</project>
Copied: projects/jboss-jca/trunk/doc/userguide/build.xml (from rev 110231, projects/jboss-jca/trunk/doc/build.xml)
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/build.xml (rev 0)
+++ projects/jboss-jca/trunk/doc/userguide/build.xml 2010-12-30 04:22:33 UTC (rev 110232)
@@ -0,0 +1,94 @@
+<project name="Docbook-Ironjacamar" default="all" basedir=".">
+
+ <property name="docant.dir" value="${basedir}/../../tools/docant"/>
+ <property name="target.dir" value="${basedir}/../../target" />
+ <property name="docant.target.dir" value="${basedir}/../../build" />
+
+ <import file="${docant.dir}/support.xml"/>
+
+ <property name="srcDir" value="." />
+ <property name="srcDocName" value="userguide" />
+ <property name="srcDocNameFile" value="${srcDocName}.xml" />
+ <property name="pdfName" value="IronJacamarUserGuide.pdf" />
+
+ <target name="docant-init" >
+ <available file="${docant.dir}/target/docbook/staging" type="dir" property="docant.support" value="true"/>
+ </target>
+
+ <target name="docant-support" unless="docant.support">
+ <ant antfile="${docant.dir}/build.xml" inheritRefs="false" inheritAll="false">
+ <property name="docant.dir" value="${docant.dir}"/>
+ </ant>
+ </target>
+
+ <target name="docant-prepare" depends="docant-init, docant-support">
+ <copy todir="${docant.target.dir}">
+ <fileset dir="${docant.dir}/target"/>
+ </copy>
+
+ <copy todir="${docant.target.dir}/docbook/staging/images/images">
+ <fileset dir="${basedir}/${srcDir}/en-US/images/"/>
+ </copy>
+ </target>
+
+ <target name="docant-post">
+ <mkdir dir="${target.dir}/docs/${srcDocName}"/>
+ <move file="${docant.target.dir}/docbook/publish" tofile="${target.dir}/docs/${srcDocName}" failonerror="false"/>
+ <delete dir="${docant.target.dir}/docbook/"/>
+ </target>
+
+ <target name="html">
+ <antcall target="docant-prepare"/>
+ <docant sourceDirectory="${srcDir}"
+ sourceDocumentName="${srcDocNameFile}"
+ baseOutputDirectory="${docant.target.dir}">
+ <format name="html"
+ stylesheetResource="classpath:/ironjacamar-style/xhtml.xsl"
+ targetFinalName="index.html"/>
+ </docant>
+ <antcall target="docant-post"/>
+ </target>
+
+ <target name="html-single">
+ <antcall target="docant-prepare"/>
+ <docant sourceDirectory="${srcDir}"
+ sourceDocumentName="${srcDocNameFile}"
+ baseOutputDirectory="${docant.target.dir}">
+ <format name="html_single"
+ stylesheetResource="classpath:/ironjacamar-style/xhtml-single.xsl"
+ targetFinalName="index.html"/>
+ </docant>
+ <antcall target="docant-post"/>
+ </target>
+
+ <target name="pdf">
+ <antcall target="docant-prepare"/>
+ <docant sourceDirectory="${srcDir}"
+ sourceDocumentName="${srcDocNameFile}"
+ baseOutputDirectory="${docant.target.dir}">
+ <format name="pdf"
+ stylesheetResource="classpath:/ironjacamar-style/pdf.xsl"
+ targetFinalName="${pdfName}"/>
+ </docant>
+ <antcall target="docant-post"/>
+ </target>
+
+ <target name="all">
+ <antcall target="docant-prepare"/>
+ <docant sourceDirectory="${srcDir}"
+ sourceDocumentName="${srcDocNameFile}"
+ baseOutputDirectory="${docant.target.dir}">
+ <format name="html"
+ stylesheetResource="classpath:/ironjacamar-style/xhtml.xsl"
+ targetFinalName="index.html"/>
+ <format name="html_single"
+ stylesheetResource="classpath:/ironjacamar-style/xhtml-single.xsl"
+ targetFinalName="index.html"/>
+ <format name="pdf"
+ stylesheetResource="classpath:/ironjacamar-style/pdf.xsl"
+ targetFinalName="${pdfName}"/>
+ </docant>
+ <antcall target="docant-post"/>
+ </target>
+
+</project>
Modified: projects/jboss-jca/trunk/sjc/build.xml
===================================================================
--- projects/jboss-jca/trunk/sjc/build.xml 2010-12-30 01:18:29 UTC (rev 110231)
+++ projects/jboss-jca/trunk/sjc/build.xml 2010-12-30 04:22:33 UTC (rev 110232)
@@ -305,14 +305,15 @@
</fileset>
</move>
- <ant dir="${doc.dir}/.." target="manual" inheritRefs="false" inheritAll="false"/>
+ <ant dir="${doc.dir}/developerguide" target="html" inheritRefs="false" inheritAll="false"/>
+ <ant dir="${doc.dir}/userguide" target="html" inheritRefs="false" inheritAll="false"/>
<copy todir="${build.dir}/sjc/war/userguide">
- <fileset dir="${target.dir}/docbook/userguide/en-US/html">
+ <fileset dir="${target.dir}/docs/userguide/en-US/html">
<include name="**/*"/>
</fileset>
</copy>
<copy todir="${build.dir}/sjc/war/developerguide">
- <fileset dir="${target.dir}/docbook/developerguide/en-US/html">
+ <fileset dir="${target.dir}/docs/developerguide/en-US/html">
<include name="**/*"/>
</fileset>
</copy>
More information about the jboss-cvs-commits
mailing list