This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit d17197ea5c8a9a6feacef52a929d12cfcb16f96f
Author: Alex Harui <aha...@apache.org>
AuthorDate: Tue Feb 6 11:56:37 2018 -0800
switch to using JS APIs instead of SWF
---
examples/royale/ASDoc/build.xml | 41 +++++++++++++-
.../{asdoc-config.xml => asdoc-js-config.xml} | 64 +++++++++++++++++++---
.../{asdoc-config.xml => asdoc-swf-config.xml} | 0
.../royale/ASDoc/src/main/resources/config.json | 4 ++
.../ASDoc/src/main/royale/models/ASDocModel.as | 10 ++--
5 files changed, 104 insertions(+), 15 deletions(-)
diff --git a/examples/royale/ASDoc/build.xml b/examples/royale/ASDoc/build.xml
index 463da13..249087a 100644
--- a/examples/royale/ASDoc/build.xml
+++ b/examples/royale/ASDoc/build.xml
@@ -32,7 +32,7 @@
<condition property="config.path" value="${windows_config}">
<os family="windows" />
</condition>
- <property name="config.path"
value="${basedir}/src/main/config/asdoc-config.xml"/>
+ <property name="config.path"
value="${basedir}/src/main/config/asdoc-js-config.xml"/>
<include file="${basedir}/../../build_example.xml" />
@@ -57,7 +57,10 @@
<jvmarg line="${mxmlc.jvm.args}"/>
<jvmarg line="-Droyalelib='${ROYALE_HOME}/frameworks'"/>
<arg value="+royalelib=${ROYALE_HOME}/frameworks" />
- <arg
value="-external-library-path=${env.AIR_HOME}/frameworks/libs/air/airglobal.swc"
/>
+ <arg value="-external-library-path=${ROYALE_HOME}/js/libs/js.swc"
/>
+ <arg value="-external-library-path=${ROYALE_HOME}/js/libs/GCL.swc"
/>
+ <arg
value="-external-library-path=${ROYALE_HOME}/js/libs/createjs.swc" />
+ <arg
value="-external-library-path=${ROYALE_HOME}/js/libs/jquery.swc" />
<arg
value="-external-library-path+=${ROYALE_HOME}/js/libs/google_maps.swc" />
<arg value="+frameworks_dir=${ROYALE_HOME}/frameworks" />
<arg value="-load-config=${config.path}" />
@@ -84,6 +87,40 @@
</target>
+ <target name="json.swf" unless="json.exists" >
+ <echo message="ROYALE_COMPILER_HOME: ${ROYALE_COMPILER_HOME}"/>
+ <java jar="${ROYALE_COMPILER_HOME}/lib/asdoc.jar"
resultProperty="errorCode"
+ fork="true">
+ <jvmarg line="${mxmlc.jvm.args}"/>
+ <jvmarg line="-Droyalelib='${ROYALE_HOME}/frameworks'"/>
+ <arg value="+royalelib=${ROYALE_HOME}/frameworks" />
+ <arg
value="-external-library-path=${env.AIR_HOME}/frameworks/libs/air/airglobal.swc"
/>
+ <arg
value="-external-library-path+=${ROYALE_HOME}/js/libs/google_maps.swc" />
+ <arg value="+frameworks_dir=${ROYALE_HOME}/frameworks" />
+ <arg value="-load-config=${config.path}" />
+ <arg value="-debug=true" />
+ <arg value="-output=${basedir}/bin-debug" />
+ <arg value="-window-title=Apache Royale API Reference" />
+ <arg value="-main-title=Apache Royale ${release.version} API
Reference " />
+ <arg value="-footer=The Apache Software Foundation" />
+ <arg value="+playerglobal.version=${playerglobal.version}" />
+ <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="-js-output-type=ROYALE" />
+ <arg value="-closure-lib=${GOOG_HOME}" />
+ </java>
+ <copy todir="${basedir}/bin/js-debug">
+ <fileset dir="${basedir}/bin-debug">
+ <include name="**/*.json" />
+ </fileset>
+ </copy>
+ <copy todir="${basedir}/bin/js-release">
+ <fileset dir="${basedir}/bin-debug">
+ <include name="**/*.json" />
+ </fileset>
+ </copy>
+
+ </target>
+
<target name="examine" depends="build_example.get.browser">
<property name="which" value="debug" />
<echo message="View ASDoc."/>
diff --git a/examples/royale/ASDoc/src/main/config/asdoc-config.xml
b/examples/royale/ASDoc/src/main/config/asdoc-js-config.xml
similarity index 76%
copy from examples/royale/ASDoc/src/main/config/asdoc-config.xml
copy to examples/royale/ASDoc/src/main/config/asdoc-js-config.xml
index eb185a3..c862a2a 100644
--- a/examples/royale/ASDoc/src/main/config/asdoc-config.xml
+++ b/examples/royale/ASDoc/src/main/config/asdoc-js-config.xml
@@ -29,8 +29,8 @@
<compiler>
- <define><name>COMPILE::SWF</name><value>true</value></define>
- <define><name>COMPILE::JS</name><value>false</value></define>
+ <define><name>COMPILE::SWF</name><value>false</value></define>
+ <define><name>COMPILE::JS</name><value>true</value></define>
<define><name>CONFIG::debug</name><value>false</value></define>
<define><name>CONFIG::release</name><value>true</value></define>
<define><name>CONFIG::LOGGING</name><value>false</value></define>
@@ -466,18 +466,64 @@
</metadata>
<exclude-classes>
- <class>org.apache.royale.utils.Language</class>
<class>org.apache.royale.core.IRoyaleElement</class>
- <class>org.apache.royale.core.WrappedHTMLElement</class>
- <class>org.apache.royale.events.BrowserEvent</class>
- <class>org.apache.royale.html.beads.CSSTextButtonView</class>
<class>org.apache.royale.maps.google.beads.MapView_original</class>
</exclude-classes>
<exclude-sources>
-
<path-element>${frameworks_dir}/projects/Language/src/main/royale/org/apache/royale/utils/Language.as</path-element>
-
<path-element>${frameworks_dir}/projects/Core/src/main/royale/org/apache/royale/core/WrappedHTMLElement.as</path-element>
-
<path-element>${frameworks_dir}/projects/Core/src/main/royale/org/apache/royale/events/BrowserEvent.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/core/IScrollingLayoutParent.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/EditableTextKeyboardController.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/ScrollBarMouseControllerBase.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/HScrollBarMouseController.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/VScrollBarMouseController.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/HScrollBarLayout.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/VScrollBarLayout.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ScrollBarModel.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/SingleLineBorderModel.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/SingleLineBorderBead.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/BackgroundImageBead.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/SingleLineBorderWithChangeListenerBead.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/DropDownListView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/ITextFieldView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/ImageAndTextButtonView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/CheckBoxView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/CSSButtonView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/CSSTextButtonView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/CSSToggleButtonView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/CSSTextToggleButtonView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/CSSImageAndTextButtonView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/RadioButtonView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/ScrollBarView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/HScrollBarView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/VScrollBarView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/SliderThumbView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/SliderTrackView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/DownArrowButtonView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/RightArrowButtonView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/LeftArrowButtonView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/UpArrowButtonView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/VScrollBarThumbView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/VScrollBarTrackView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/HScrollBarThumbView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/HScrollBarTrackView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/VRuleView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/HRuleView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextInputView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextInputWithBorderView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextAreaView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextButtonViewBase.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextFieldViewBase.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextFieldView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/MultilineTextFieldView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextButtonView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextButtonMeasurementBead.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextFieldLabelMeasurementBead.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextFieldItemRenderer.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/VScrollBar.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/HScrollBar.as</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ScrollBar.as</path-element>
+
<path-element>${frameworks_dir}/projects/Formatters/src/main/royale/org/apache/royale/html/beads/FormatableTextInputView.as</path-element>
+
<path-element>${frameworks_dir}/projects/Formatters/src/main/royale/org/apache/royale/html/beads/FormatableLabelView.as</path-element>
<path-element>${frameworks_dir}/projects/GoogleMaps/src/main/royale/org/apache/royale/maps/google/beads/MapView_original.as</path-element>
</exclude-sources>
diff --git a/examples/royale/ASDoc/src/main/config/asdoc-config.xml
b/examples/royale/ASDoc/src/main/config/asdoc-swf-config.xml
similarity index 100%
rename from examples/royale/ASDoc/src/main/config/asdoc-config.xml
rename to examples/royale/ASDoc/src/main/config/asdoc-swf-config.xml
diff --git a/examples/royale/ASDoc/src/main/resources/config.json
b/examples/royale/ASDoc/src/main/resources/config.json
index d48c478..165427b 100644
--- a/examples/royale/ASDoc/src/main/resources/config.json
+++ b/examples/royale/ASDoc/src/main/resources/config.json
@@ -2,6 +2,10 @@
"langversion": "Language version:",
"playerversion": "Runtime version:",
"productversion": "Product version:",
+ "flexdocurl": "Flex Documentation:",
+ "flexcomponent": "Flex Equivalent:",
+ "commentary": "Flex Migration Info:",
+ "example": "MXML Usage:",
"toplevel": "Top Level Component",
"bead": "Bead",
"viewbead": "View Bead",
diff --git a/examples/royale/ASDoc/src/main/royale/models/ASDocModel.as
b/examples/royale/ASDoc/src/main/royale/models/ASDocModel.as
index ecf68d5..f544d03 100644
--- a/examples/royale/ASDoc/src/main/royale/models/ASDocModel.as
+++ b/examples/royale/ASDoc/src/main/royale/models/ASDocModel.as
@@ -271,13 +271,15 @@ package models
}
}
- if (data.type == "class" && data.baseClassname &&
data.baseClassname.indexOf("flash.") != 0)
+ if (data.type == "class" && data.baseClassname &&
+ data.baseClassname.indexOf("flash.") != 0 &&
data.baseClassname.indexOf("goog.") != 0)
{
app.service.addEventListener("complete", completeClassHandler);
app.service.url = computeFileName(data.baseClassname);
app.service.send();
}
- else if (data.type == "interface" && data.baseInterfaceNames &&
data.baseInterfaceNames[0].indexOf("flash.") != 0)
+ else if (data.type == "interface" && data.baseInterfaceNames &&
+ data.baseInterfaceNames[0].indexOf("flash.") != 0 &&
data.baseInterfaceNames[0].indexOf("goog.") != 0)
{
app.service.addEventListener("complete",
completeInterfaceHandler);
extensions = data.baseInterfaceNames;
@@ -592,9 +594,9 @@ package models
var s:String = "";
var firstOne:Boolean = true;
var joiner:String = ", ";
- if (obj.name == "commentary")
+ if (p == "commentary")
joiner = " ";
- if (obj.name == "example")
+ if (p == "example")
{
joiner = "<br/>";
firstOne = false;
--
To stop receiving notification emails like this one, please contact
aha...@apache.org.
