You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2015/12/18 08:35:19 UTC
[3/5] git commit: [flex-asjs] [refs/heads/develop] - fix some issues
with asdoc and conditional compilation
fix some issues with asdoc and conditional compilation
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/53e43804
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/53e43804
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/53e43804
Branch: refs/heads/develop
Commit: 53e4380419d1e759f46cf5ad8bc1333b4c0c6a92
Parents: 9d0d988
Author: Alex Harui <ah...@apache.org>
Authored: Thu Dec 17 13:52:04 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Dec 17 23:35:12 2015 -0800
----------------------------------------------------------------------
asdoc/build.xml | 31 ++++++++++++-------------------
1 file changed, 12 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/53e43804/asdoc/build.xml
----------------------------------------------------------------------
diff --git a/asdoc/build.xml b/asdoc/build.xml
index 94ad7a8..74b0651 100644
--- a/asdoc/build.xml
+++ b/asdoc/build.xml
@@ -37,7 +37,6 @@
<echo message="flexlib = ${flexlib}" />
<echo message="doc_output = ${doc_output}" />
<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"/>
@@ -74,31 +73,31 @@
footer="${manifest.Implementation-Vendor}" >
<load-config filename="${flexlib}/asdoc-config.xml" />
-
+
+ <exclude-classes>org.apache.flex.utils.Language</exclude-classes>
+ <exclude-classes>org.apache.flex.core.IFlexJSElement</exclude-classes>
+ <exclude-classes>org.apache.flex.core.WrappedHTMLElement</exclude-classes>
+ <exclude-classes>org.apache.flex.events.BrowserEvent</exclude-classes>
+ <exclude-sources path-element="${project_home}/Core/as/src/org/apache/flex/utils/Language.as" />
+ <exclude-sources path-element="${project_home}/Core/as/src/org/apache/flex/core/WrappedHTMLElement.as" />
+ <exclude-sources path-element="${project_home}/Core/as/src/org/apache/flex/events/BrowserEvent.as" />
+ <exclude-sources path-element="${project_home}/Core/as/src/org/apache/flex/core/IFlexJSElement.as" />
+
<!-- source path for asdoc -->
<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}/Collections/asjs/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 -->
@@ -110,27 +109,19 @@
<!-- classes to include in asdoc -->
<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 -->
@@ -157,6 +148,8 @@
<jvmarg line="${asdoc.jvm.args}"/>
+ <define name="COMPILE::AS3" value="true"/>
+ <define name="COMPILE::JS" value="false"/>
<define name="CONFIG::debug" value="false"/>
<define name="CONFIG::release" value="true"/>
<define name="CONFIG::LOGGING" value="false"/>