Repository: flex-asjs Updated Branches: refs/heads/develop 941c7630e -> 055a4bb4e
Updated asdoc build and config to work again using new packages/project structure. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/055a4bb4 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/055a4bb4 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/055a4bb4 Branch: refs/heads/develop Commit: 055a4bb4e86227dd5cbb9e6e70f6f4c58f5cf489 Parents: 941c763 Author: Michael Schmalle <[email protected]> Authored: Tue May 26 15:52:00 2015 -0400 Committer: Michael Schmalle <[email protected]> Committed: Tue May 26 15:52:00 2015 -0400 ---------------------------------------------------------------------- .gitignore | 1 + asdoc/build.xml | 86 +++++++++++++++++++++++++++++++++------- frameworks/asdoc-config.xml | 18 ++------- 3 files changed, 76 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/055a4bb4/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index a21209c..4f4e613 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,7 @@ examples/FlexJSTest_again/html-template examples/FlexJSTest_again/bin rat.report mustella/tests/bin +asdoc-output #Apache Flex Projects lib/ http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/055a4bb4/asdoc/build.xml ---------------------------------------------------------------------- diff --git a/asdoc/build.xml b/asdoc/build.xml index eac41cb..17cc44e 100644 --- a/asdoc/build.xml +++ b/asdoc/build.xml @@ -24,7 +24,7 @@ <property name="flexlib" location="${basedir}/../frameworks"/> <property name="doc_output" location="${basedir}/../asdoc-output" /> - <property name="project_home" location="${basedir}/../frameworks/as/projects"/> + <property name="project_home" location="${basedir}/../frameworks/projects"/> <property file="${FLEX_HOME}/env.properties"/> <property file="${FLEX_HOME}/build.properties"/> @@ -32,8 +32,8 @@ <echo message="FLEX_HOME = ${FLEX_HOME}" /> <echo message="flexlib = ${flexlib}" /> <echo message="doc_output = ${doc_output}" /> - <echo message="compiler.source-path = ${project_home}/FlexJSUI/src" /> - <echo message="compiler.source-path = ${project_home}/FlexJSJX/src" /> + <echo message="compiler.source-path = ${project_home}/*/as/src" /> + <echo message="compiler.source-path = ${project_home}/*/asjs/src" /> <target name="main" depends="clean,doc" description="Clean build of all ASDocs"/> @@ -72,23 +72,79 @@ <load-config filename="${flexlib}/asdoc-config.xml" /> <!-- source path for asdoc --> - <compiler.source-path path-element="${project_home}/FlexJSUI/src"/> - <compiler.source-path path-element="${project_home}/FlexJSJX/src"/> - <compiler.source-path path-element="${project_home}/MXMLCClasses/src"/> + <compiler.source-path path-element="${project_home}/Binding/as/src"/> + <compiler.source-path path-element="${project_home}/Binding/asjs/src"/> + <compiler.source-path path-element="${project_home}/Charts/as/src"/> + <compiler.source-path path-element="${project_home}/Charts/asjs/src"/> + <compiler.source-path path-element="${project_home}/Collections/as/src"/> + <compiler.source-path path-element="${project_home}/Core/as/src"/> + <compiler.source-path path-element="${project_home}/Core/asjs/src"/> + <compiler.source-path path-element="${project_home}/CreateJS/as/src"/> + <compiler.source-path path-element="${project_home}/DragDrop/as/src"/> + <compiler.source-path path-element="${project_home}/DragDrop/asjs/src"/> + <compiler.source-path path-element="${project_home}/Effects/as/src"/> + <compiler.source-path path-element="${project_home}/Effects/asjs/src"/> + <compiler.source-path path-element="${project_home}/Formatters/as/src"/> + <compiler.source-path path-element="${project_home}/Formatters/asjs/src"/> + <compiler.source-path path-element="${project_home}/GoogleMaps/as/src"/> + <compiler.source-path path-element="${project_home}/Graphics/as/src"/> + <compiler.source-path path-element="${project_home}/HTML/as/src"/> + <compiler.source-path path-element="${project_home}/HTML/asjs/src"/> + <compiler.source-path path-element="${project_home}/HTML5/as/src"/> + <compiler.source-path path-element="${project_home}/JQuery/as/src"/> + <compiler.source-path path-element="${project_home}/Mobile/as/src"/> + <compiler.source-path path-element="${project_home}/Mobile/asjs/src"/> + <compiler.source-path path-element="${project_home}/Network/as/src"/> <!-- namespaces to include in asdoc --> <doc-namespaces uri="library://ns.apache.org/flexjs/basic"/> - <doc-namespaces uri="library://ns.apache.org/flexjs/mx"/> - + <doc-namespaces uri="library://ns.apache.org/flexjs/createjs"/> + <doc-namespaces uri="library://ns.apache.org/flexjs/google"/> + <doc-namespaces uri="library://ns.apache.org/flexjs/html5"/> + <doc-namespaces uri="library://ns.apache.org/flexjs/jquery"/> + <!-- classes to include in asdoc --> - <doc-sources path-element="${project_home}/FlexJSUI/src"/> - <doc-sources path-element="${project_home}/FlexJSJX/src"/> - + <doc-sources path-element="${project_home}/Binding/as/src"/> + <doc-sources path-element="${project_home}/Binding/asjs/src"/> + <doc-sources path-element="${project_home}/Charts/as/src"/> + <doc-sources path-element="${project_home}/Charts/asjs/src"/> + <doc-sources path-element="${project_home}/Collections/as/src"/> + <doc-sources path-element="${project_home}/Core/as/src"/> + <doc-sources path-element="${project_home}/Core/asjs/src"/> + <doc-sources path-element="${project_home}/CreateJS/as/src"/> + <doc-sources path-element="${project_home}/DragDrop/as/src"/> + <doc-sources path-element="${project_home}/DragDrop/asjs/src"/> + <doc-sources path-element="${project_home}/Effects/as/src"/> + <doc-sources path-element="${project_home}/Effects/asjs/src"/> + <doc-sources path-element="${project_home}/Formatters/as/src"/> + <doc-sources path-element="${project_home}/Formatters/asjs/src"/> + <doc-sources path-element="${project_home}/GoogleMaps/as/src"/> + <doc-sources path-element="${project_home}/Graphics/as/src"/> + <doc-sources path-element="${project_home}/HTML/as/src"/> + <doc-sources path-element="${project_home}/HTML/asjs/src"/> + <doc-sources path-element="${project_home}/HTML5/as/src"/> + <doc-sources path-element="${project_home}/JQuery/as/src"/> + <doc-sources path-element="${project_home}/Mobile/as/src"/> + <doc-sources path-element="${project_home}/Mobile/asjs/src"/> + <doc-sources path-element="${project_home}/Network/as/src"/> + <!-- namespace declaration for asdoc --> - <namespace uri="library://ns.apache.org/flexjs/basic" manifest="${project_home}/FlexJSUI/basic-manifest.xml" /> - <namespace uri="library://ns.apache.org/flexjs/basic" manifest="${project_home}/FlexJSJX/basic-manifest.xml" /> - <namespace uri="library://ns.apache.org/flexjs/mx" manifest="${project_home}/FlexJSUI/mx-manifest.xml" /> - + <namespace uri="library://ns.apache.org/flexjs/basic" manifest="${project_home}/Binding/basic-manifest.xml" /> + <namespace uri="library://ns.apache.org/flexjs/basic" manifest="${project_home}/Charts/basic-manifest.xml" /> + <namespace uri="library://ns.apache.org/flexjs/basic" manifest="${project_home}/Collections/basic-manifest.xml" /> + <namespace uri="library://ns.apache.org/flexjs/basic" manifest="${project_home}/Core/basic-manifest.xml" /> + <namespace uri="library://ns.apache.org/flexjs/createjs" manifest="${project_home}/CreateJS/createjs-manifest.xml" /> + <namespace uri="library://ns.apache.org/flexjs/basic" manifest="${project_home}/DragDrop/basic-manifest.xml" /> + <namespace uri="library://ns.apache.org/flexjs/basic" manifest="${project_home}/Effects/basic-manifest.xml" /> + <namespace uri="library://ns.apache.org/flexjs/basic" manifest="${project_home}/Formatters/basic-manifest.xml" /> + <namespace uri="library://ns.apache.org/flexjs/google" manifest="${project_home}/GoogleMaps/google-manifest.xml" /> + <namespace uri="library://ns.apache.org/flexjs/basic" manifest="${project_home}/Graphics/basic-manifest.xml" /> + <namespace uri="library://ns.apache.org/flexjs/basic" manifest="${project_home}/HTML/basic-manifest.xml" /> + <namespace uri="library://ns.apache.org/flexjs/html5" manifest="${project_home}/HTML5/html5-manifest.xml" /> + <namespace uri="library://ns.apache.org/flexjs/jquery" manifest="${project_home}/JQuery/jquery-manifest.xml" /> + <namespace uri="library://ns.apache.org/flexjs/basic" manifest="${project_home}/Mobile/basic-manifest.xml" /> + <namespace uri="library://ns.apache.org/flexjs/basic" manifest="${project_home}/Network/basic-manifest.xml" /> + <library-path/> <external-library-path dir="${env.AIR_HOME}/frameworks/libs/air"> <include name="airglobal.swc"/> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/055a4bb4/frameworks/asdoc-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/asdoc-config.xml b/frameworks/asdoc-config.xml index 0e31f3f..c004984 100644 --- a/frameworks/asdoc-config.xml +++ b/frameworks/asdoc-config.xml @@ -87,26 +87,16 @@ <!-- elements. --> <namespace> <uri>library://ns.apache.org/flexjs/basic</uri> - - <manifest>as/projects/FlexJSUI/basic-manifest.xml</manifest> - - </namespace> + <manifest>projects/Core/basic-manifest.xml</manifest> + </namespace> <namespace> <uri>library://ns.apache.org/flexjs/html5</uri> - - <manifest>as/projects/FlexJSUI/html5-manifest.xml</manifest> - + <manifest>projects/HTML5/html5-manifest.xml</manifest> </namespace> <namespace> <uri>library://ns.apache.org/flexjs/svg</uri> - <manifest>as/projects/FlexJSUI/svg-manifest.xml</manifest> - </namespace> - - <namespace> - <uri>library://ns.apache.org/flexjs/mx</uri> - <manifest>as/projects/FlexJSUI/mx-manifest.xml</manifest> + <manifest>projects/HTML/svg-manifest.xml</manifest> </namespace> - </namespaces> <!-- Enable post-link SWF optimization. -->
