Repository: flex-asjs Updated Branches: refs/heads/core_js_to_as 1e82c6e0f -> 3f77eec61
clean build after removing airglobal from js builds Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e04974e2 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e04974e2 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e04974e2 Branch: refs/heads/core_js_to_as Commit: e04974e2e86122014cee05c08f955d2c168aab85 Parents: 1e82c6e Author: Alex Harui <[email protected]> Authored: Mon Dec 14 14:49:41 2015 -0800 Committer: Alex Harui <[email protected]> Committed: Mon Dec 14 14:49:41 2015 -0800 ---------------------------------------------------------------------- frameworks/projects/Charts/compile-asjs-config.xml | 7 +++---- frameworks/projects/Collections/compile-asjs-config.xml | 3 +-- .../projects/Formatters/as/src/FormattersClasses.as | 7 +++++-- .../Formatters/as/src/org/apache/flex/core/FormatBase.as | 2 -- frameworks/projects/Formatters/compile-asjs-config.xml | 11 +++++------ frameworks/projects/HTML5/compile-asjs-config.xml | 5 ++--- frameworks/projects/JQuery/compile-asjs-config.xml | 1 - 7 files changed, 16 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e04974e2/frameworks/projects/Charts/compile-asjs-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Charts/compile-asjs-config.xml b/frameworks/projects/Charts/compile-asjs-config.xml index a55ee3f..38cbcf3 100644 --- a/frameworks/projects/Charts/compile-asjs-config.xml +++ b/frameworks/projects/Charts/compile-asjs-config.xml @@ -22,7 +22,6 @@ <accessible>false</accessible> <external-library-path> - <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element> </external-library-path> <mxml> @@ -46,9 +45,9 @@ <!-- asjscompc won't 'link' these classes in, but will list their requires if these swcs are on the external-library-path then their requires will not be listed --> - <path-element>../../libs/Core.swc</path-element> - <path-element>../../libs/Graphics.swc</path-element> - <path-element>../../libs/HTML.swc</path-element> + <path-element>../../externs/Core.swc</path-element> + <path-element>../../externs/Graphics.swc</path-element> + <path-element>../../externs/HTML.swc</path-element> </library-path> <source-path> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e04974e2/frameworks/projects/Collections/compile-asjs-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Collections/compile-asjs-config.xml b/frameworks/projects/Collections/compile-asjs-config.xml index 89305a6..f5e728e 100644 --- a/frameworks/projects/Collections/compile-asjs-config.xml +++ b/frameworks/projects/Collections/compile-asjs-config.xml @@ -22,7 +22,6 @@ <accessible>false</accessible> <external-library-path> - <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element> </external-library-path> <mxml> @@ -46,7 +45,7 @@ <!-- asjscompc won't 'link' these classes in, but will list their requires if these swcs are on the external-library-path then their requires will not be listed --> - <path-element>../../libs/Core.swc</path-element> + <path-element>../../externs/Core.swc</path-element> </library-path> <source-path> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e04974e2/frameworks/projects/Formatters/as/src/FormattersClasses.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Formatters/as/src/FormattersClasses.as b/frameworks/projects/Formatters/as/src/FormattersClasses.as index 4c3646a..bbf43ce 100644 --- a/frameworks/projects/Formatters/as/src/FormattersClasses.as +++ b/frameworks/projects/Formatters/as/src/FormattersClasses.as @@ -30,8 +30,11 @@ internal class FormattersClasses import org.apache.flex.core.FormatBase; FormatBase; import org.apache.flex.html.accessories.DateFormatMMDDYYYYBead; DateFormatMMDDYYYYBead; - import org.apache.flex.html.beads.FormatableLabelView; FormatableLabelView; - import org.apache.flex.html.beads.FormatableTextInputView; FormatableTextInputView; + COMPILE::AS3 + { + import org.apache.flex.html.beads.FormatableLabelView; FormatableLabelView; + import org.apache.flex.html.beads.FormatableTextInputView; FormatableTextInputView; + } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e04974e2/frameworks/projects/Formatters/as/src/org/apache/flex/core/FormatBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Formatters/as/src/org/apache/flex/core/FormatBase.as b/frameworks/projects/Formatters/as/src/org/apache/flex/core/FormatBase.as index 1056978..b1fa1af 100644 --- a/frameworks/projects/Formatters/as/src/org/apache/flex/core/FormatBase.as +++ b/frameworks/projects/Formatters/as/src/org/apache/flex/core/FormatBase.as @@ -18,8 +18,6 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.core { - import flash.events.Event; - import org.apache.flex.events.Event; import org.apache.flex.events.EventDispatcher; import org.apache.flex.events.IEventDispatcher; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e04974e2/frameworks/projects/Formatters/compile-asjs-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Formatters/compile-asjs-config.xml b/frameworks/projects/Formatters/compile-asjs-config.xml index 4632bc2..7626601 100644 --- a/frameworks/projects/Formatters/compile-asjs-config.xml +++ b/frameworks/projects/Formatters/compile-asjs-config.xml @@ -22,7 +22,6 @@ <accessible>false</accessible> <external-library-path> - <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element> </external-library-path> <mxml> @@ -46,8 +45,8 @@ <!-- asjscompc won't 'link' these classes in, but will list their requires if these swcs are on the external-library-path then their requires will not be listed --> - <path-element>../../libs/Core.swc</path-element> - <path-element>../../libs/HTML.swc</path-element> + <path-element>../../externs/Core.swc</path-element> + <path-element>../../externs/HTML.swc</path-element> </library-path> <source-path> @@ -60,9 +59,9 @@ <include-file> </include-file> - <include-sources> - <path-element>as/src</path-element> - </include-sources> + <include-classes> + <class>FormattersClasses</class> + </include-classes> <include-namespaces> <uri>library://ns.apache.org/flexjs/basic</uri> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e04974e2/frameworks/projects/HTML5/compile-asjs-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML5/compile-asjs-config.xml b/frameworks/projects/HTML5/compile-asjs-config.xml index e67c744..0e2439c 100644 --- a/frameworks/projects/HTML5/compile-asjs-config.xml +++ b/frameworks/projects/HTML5/compile-asjs-config.xml @@ -22,7 +22,6 @@ <accessible>false</accessible> <external-library-path> - <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element> </external-library-path> <mxml> @@ -46,8 +45,8 @@ <!-- asjscompc won't 'link' these classes in, but will list their requires if these swcs are on the external-library-path then their requires will not be listed --> - <path-element>../../libs/Core.swc</path-element> - <path-element>../../libs/HTML.swc</path-element> + <path-element>../../externs/Core.swc</path-element> + <path-element>../../externs/HTML.swc</path-element> </library-path> <source-path> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e04974e2/frameworks/projects/JQuery/compile-asjs-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/JQuery/compile-asjs-config.xml b/frameworks/projects/JQuery/compile-asjs-config.xml index 3f88534..c5c53a5 100644 --- a/frameworks/projects/JQuery/compile-asjs-config.xml +++ b/frameworks/projects/JQuery/compile-asjs-config.xml @@ -22,7 +22,6 @@ <accessible>false</accessible> <external-library-path> - <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element> </external-library-path> <mxml>
