You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2016/11/10 08:11:16 UTC
[1/4] git commit: [flex-asjs]
[refs/heads/feature-autobuild/example-maven-dirs] - FLEX-35144 fix panel.
Also requires flex-falcon d889f1182104be4f69b3564c6feeb4ffacf5e213
Repository: flex-asjs
Updated Branches:
refs/heads/feature-autobuild/example-maven-dirs ef3aaaec8 -> 1cb8e192b
FLEX-35144 fix panel. Also requires flex-falcon d889f1182104be4f69b3564c6feeb4ffacf5e213
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a7d484d3
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a7d484d3
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a7d484d3
Branch: refs/heads/feature-autobuild/example-maven-dirs
Commit: a7d484d373620fcb3fcdc88aa833bf2329dd37c5
Parents: 8af90ac
Author: Alex Harui <ah...@apache.org>
Authored: Wed Nov 9 21:52:21 2016 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Nov 9 21:52:32 2016 -0800
----------------------------------------------------------------------
.../projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a7d484d3/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as
index 5dbea38..0b0dbb5 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as
@@ -981,9 +981,10 @@ package org.apache.flex.core
*/
override public function addBead(bead:IBead):void
{
- super.addBead(bead);
if (bead is IBeadView)
_view = bead as IBeadView;
+
+ super.addBead(bead);
if (bead is IBeadView) {
IEventDispatcher(this).dispatchEvent(new Event("viewChanged"));
[3/4] git commit: [flex-asjs]
[refs/heads/feature-autobuild/example-maven-dirs] - need typedefs for this
app
Posted by cd...@apache.org.
need typedefs for this app
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8e29ae46
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8e29ae46
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8e29ae46
Branch: refs/heads/feature-autobuild/example-maven-dirs
Commit: 8e29ae46c2265b9f51086eb98ddc40a1441cd17c
Parents: 9e6e093
Author: Alex Harui <ah...@apache.org>
Authored: Sun Nov 6 21:00:25 2016 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Nov 9 21:52:32 2016 -0800
----------------------------------------------------------------------
examples/flexjs/DesktopMap/build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8e29ae46/examples/flexjs/DesktopMap/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DesktopMap/build.xml b/examples/flexjs/DesktopMap/build.xml
index 647d496..7430444 100644
--- a/examples/flexjs/DesktopMap/build.xml
+++ b/examples/flexjs/DesktopMap/build.xml
@@ -51,7 +51,7 @@
<include file="${basedir}/../../build_example.xml" />
- <!--property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/google_maps/out/bin/google_maps.swc"/-->
+ <property name="extlib_arg" value="-external-library-path=${FLEXJS_HOME}/js/libs/google_maps.swc"/>
<property name="opt1_arg" value="-remove-circulars" />
<target name="main" depends="clean,build_example.compileair,build_example.compilejsair" description="Clean build of ${example}">
[2/4] git commit: [flex-asjs]
[refs/heads/feature-autobuild/example-maven-dirs] - add some targets to build
apps from the repos
Posted by cd...@apache.org.
add some targets to build apps from the repos
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8af90ac4
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8af90ac4
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8af90ac4
Branch: refs/heads/feature-autobuild/example-maven-dirs
Commit: 8af90ac4a0dc006c295614017d5582be2432815a
Parents: 8e29ae4
Author: Alex Harui <ah...@apache.org>
Authored: Wed Nov 9 21:51:13 2016 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Nov 9 21:52:32 2016 -0800
----------------------------------------------------------------------
build.xml | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8af90ac4/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 18a583b..15af666 100644
--- a/build.xml
+++ b/build.xml
@@ -1863,4 +1863,43 @@
<echo>Please change directory to ${base.folder.name}/flex-asjs and run ant to complete build</echo>
</target>
+ <target name="compile" depends="check-flex-home,check-falcon-home,load-task" description="compile for SWF">
+
+ <property name="FLEX_HOME" value="${basedir}" />
+ <mxmlc fork="true" debug="true"
+ file="${file}">
+ <jvmarg line="${mxmlc.jvm.args}"/>
+ </mxmlc>
+ </target>
+
+ <target name="compile-js" depends="check-flex-home,check-falcon-home,check-falconjx-home,check-goog-home" description="compile for JS">
+ <property name="FLEX_HOME" value="${basedir}" />
+ <java jar="${FALCONJX_HOME}/lib/mxmlc.jar"
+ fork="true">
+ <jvmarg line="${mxmlc.jvm.args}"/>
+ <jvmarg line="-Dflexlib=${FLEXJS_HOME}/frameworks}"/>
+ <arg value="+flexlib=${FLEXJS_HOME}/frameworks" />
+ <arg value="-debug" />
+ <arg value="+playerglobal.version=${playerglobal.version}" />
+ <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="-js-output-type=FLEXJS" />
+ <arg value="-closure-lib=${GOOG_HOME}" />
+ <arg value="${file}" />
+ </java>
+ </target>
+
+ <target name="compile-js-release" depends="check-flex-home,check-falcon-home,check-falconjx-home,check-goog-home" description="compile for JS">
+ <property name="FLEX_HOME" value="${basedir}" />
+ <java jar="${FALCONJX_HOME}/lib/mxmlc.jar"
+ fork="true">
+ <jvmarg line="${mxmlc.jvm.args}"/>
+ <jvmarg line="-Dflexlib=${FLEXJS_HOME}/frameworks}"/>
+ <arg value="+flexlib=${FLEXJS_HOME}/frameworks" />
+ <arg value="+playerglobal.version=${playerglobal.version}" />
+ <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="-js-output-type=FLEXJS" />
+ <arg value="-closure-lib=${GOOG_HOME}" />
+ <arg value="${file}" />
+ </java>
+ </target>
</project>
[4/4] git commit: [flex-asjs]
[refs/heads/feature-autobuild/example-maven-dirs] - Merge branches 'develop'
and 'feature-autobuild/example-maven-dirs' of
https://git-wip-us.apache.org/repos/asf/flex-asjs into
feature-autobuild/example-maven-dirs
Posted by cd...@apache.org.
Merge branches 'develop' and 'feature-autobuild/example-maven-dirs' of https://git-wip-us.apache.org/repos/asf/flex-asjs into feature-autobuild/example-maven-dirs
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1cb8e192
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1cb8e192
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1cb8e192
Branch: refs/heads/feature-autobuild/example-maven-dirs
Commit: 1cb8e192b8b93d687dd0191a5f4674668142a28a
Parents: ef3aaae a7d484d
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Thu Nov 10 09:09:42 2016 +0100
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Thu Nov 10 09:09:42 2016 +0100
----------------------------------------------------------------------
build.xml | 39 ++++++++++++++++++++
examples/flexjs/DesktopMap/build.xml | 2 +-
.../main/flex/org/apache/flex/core/UIBase.as | 3 +-
3 files changed, 42 insertions(+), 2 deletions(-)
----------------------------------------------------------------------