Updated Branches: refs/heads/develop 27e299036 -> 949dd4e56
- FIXED https://issues.apache.org/jira/browse/FLEX-33801 - UPDATED https://issues.apache.org/jira/browse/FLEX-33801 - added verbose condition to log message Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/7db2ddcc Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/7db2ddcc Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/7db2ddcc Branch: refs/heads/develop Commit: 7db2ddccf025706938efe2caa949fe663857b8d3 Parents: b03d482 Author: mamsellem <maurice.amsel...@systar.com> Authored: Sun Oct 6 02:01:18 2013 +0200 Committer: mamsellem <maurice.amsel...@systar.com> Committed: Sun Oct 6 02:01:18 2013 +0200 ---------------------------------------------------------------------- asdoc/build.xml | 30 +++++++++++++++++--- .../asdoc/TopLevelClassesGenerator.java | 5 +++- 2 files changed, 30 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7db2ddcc/asdoc/build.xml ---------------------------------------------------------------------- diff --git a/asdoc/build.xml b/asdoc/build.xml index 0557b24..6aa41df 100644 --- a/asdoc/build.xml +++ b/asdoc/build.xml @@ -22,6 +22,9 @@ <property name="lenient" value="true"/> <property name="flexlib" location="${FLEX_HOME}/frameworks"/> + <property name="doc_output" location="${FLEX_HOME}/asdoc-output" /> + <property name="include_examples" location="${doc_output}/include_examples" /> + <property file="${FLEX_HOME}/env.properties"/> <property environment="env"/> <property file="${FLEX_HOME}/build.properties"/> @@ -41,12 +44,29 @@ property="TLF_HOME" value="${env.TLF_HOME}"/> - <target name="main" depends="clean,doc" description="Clean build of all ASDocs"/> + <target name="main" depends="clean,copyExamples,doc" description="Clean build of all ASDocs"/> <target name="clean" description="Cleans all ASDocs"> - <delete dir="${FLEX_HOME}/asdoc-output"/> + <delete dir="${doc_output}"/> </target> + <target name="copyExamples" description="Copy all projects asdocs subdir to singe location"> + <copy todir="${include_examples}"> + <fileset dir="${flexlib}/projects/advancedgrids/asdoc/en_US"/> + <fileset dir="${flexlib}/projects/airframework/asdoc/en_US"/> + <!-- <fileset dir="${flexlib}/projects/apache/asdoc/en_US"/>--> + <fileset dir="${flexlib}/projects/charts/asdoc/en_US"/> + <!-- <fileset dir="${flexlib}/projects/core/asdoc/en_US"/>--> + <!-- <fileset dir="${flexlib}/projects/experimental/asdoc/en_US"/>--> + <!-- <fileset dir="${flexlib}/projects/experimental_mobile/asdoc/en_US"/>--> + <fileset dir="${flexlib}/projects/framework/asdoc/en_US"/> + <fileset dir="${flexlib}/projects/mobilecomponents/asdoc/en_US"/> + <!-- <fileset dir="${flexlib}/projects/mx/asdoc/en_US"/>--> + <fileset dir="${flexlib}/projects/rpc/asdoc/en_US"/> + <fileset dir="${flexlib}/projects/spark/asdoc/en_US"/> + </copy> + </target> + <target name="doc"> <condition property="asdoc.jvm.args" value="-Xmx512m"> @@ -70,10 +90,12 @@ <taskdef resource="flexTasks.tasks" classpathref="flexTasks.path"/> <!-- Call asdoc to generate dita xml files --> - <asdoc output="${FLEX_HOME}/asdoc-output" lenient="true" failonerror="true" warnings="false" strict="false" locale="en_US" fork="true" + <asdoc output="${doc_output}" lenient="true" failonerror="true" warnings="false" strict="false" locale="en_US" fork="true" window-title="ApacheFlex API Reference" main-title="${release} API Reference " - footer="${manifest.Implementation-Vendor}" > + footer="${manifest.Implementation-Vendor}" + examples-path="${include_examples}" + > <!-- top level class to include in asdoc --> <doc-classes class="AIRFrameworkClasses"/> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7db2ddcc/modules/compiler/src/java/flex2/compiler/asdoc/TopLevelClassesGenerator.java ---------------------------------------------------------------------- diff --git a/modules/compiler/src/java/flex2/compiler/asdoc/TopLevelClassesGenerator.java b/modules/compiler/src/java/flex2/compiler/asdoc/TopLevelClassesGenerator.java index 6d3157a..48cdfd8 100644 --- a/modules/compiler/src/java/flex2/compiler/asdoc/TopLevelClassesGenerator.java +++ b/modules/compiler/src/java/flex2/compiler/asdoc/TopLevelClassesGenerator.java @@ -5005,7 +5005,10 @@ public class TopLevelClassesGenerator if (experimentalElement != null) { String fullName = experimentalElement.getAttribute("owner"); - System.out.println(" processing [Experimental] for " + fullName); + if (verbose) + { + System.out.println(" processing [Experimental] for " + fullName); + } AsClass myClass = classTable.get(fullName);
