You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2018/10/05 02:16:35 UTC
[royale-asjs] branch develop updated (1a5900c -> 7dcb10a)
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.
from 1a5900c try to cut down on failures on CI server
new c985bcd comment out resource bundles for now
new b7badaa fix override for SWF
new 7dcb10a try to use variables so repos don't have to be siblings
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.xml | 14 +++++++-------
.../src/main/royale/mx/messaging/channels/AMFChannel.as | 2 +-
.../MXRoyale/src/main/royale/mx/rpc/AbstractInvoker.as | 2 +-
.../MXRoyale/src/main/royale/mx/rpc/AbstractService.as | 1 +
.../src/main/royale/mx/rpc/remoting/mxml/Operation.as | 2 +-
5 files changed, 11 insertions(+), 10 deletions(-)
[royale-asjs] 01/03: comment out resource bundles for now
Posted by ah...@apache.org.
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 c985bcdf6d69540acbf03fe39caebab525d0c370
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Oct 4 15:06:38 2018 -0700
comment out resource bundles for now
---
.../MXRoyale/src/main/royale/mx/messaging/channels/AMFChannel.as | 2 +-
frameworks/projects/MXRoyale/src/main/royale/mx/rpc/AbstractInvoker.as | 2 +-
.../projects/MXRoyale/src/main/royale/mx/rpc/remoting/mxml/Operation.as | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/channels/AMFChannel.as b/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/channels/AMFChannel.as
index b998da0..8803f6b 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/channels/AMFChannel.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/channels/AMFChannel.as
@@ -51,7 +51,7 @@ import mx.resources.ResourceManager;
use namespace mx_internal;
-[ResourceBundle("messaging")]
+//[ResourceBundle("messaging")]
/**
* The AMFChannel class provides the AMF support for messaging.
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/rpc/AbstractInvoker.as b/frameworks/projects/MXRoyale/src/main/royale/mx/rpc/AbstractInvoker.as
index f072e6b..1729580 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/rpc/AbstractInvoker.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/rpc/AbstractInvoker.as
@@ -44,7 +44,7 @@ import mx.netmon.NetworkMonitor;
use namespace mx_internal;
-[ResourceBundle("rpc")]
+//[ResourceBundle("rpc")]
/**
* An invoker is an object that actually executes a remote procedure call (RPC).
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/rpc/remoting/mxml/Operation.as b/frameworks/projects/MXRoyale/src/main/royale/mx/rpc/remoting/mxml/Operation.as
index f1eea6c..498cb2d 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/rpc/remoting/mxml/Operation.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/rpc/remoting/mxml/Operation.as
@@ -32,7 +32,7 @@ import mx.validators.Validator;
use namespace mx_internal;
-[ResourceBundle("rpc")]
+//[ResourceBundle("rpc")]
/**
* The Operation used for RemoteObject when created in an MXML document.
[royale-asjs] 03/03: try to use variables so repos don't have to be
siblings
Posted by ah...@apache.org.
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 7dcb10aa023d7612ca56006672fc1f5d69bdd523
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Oct 4 19:16:04 2018 -0700
try to use variables so repos don't have to be siblings
---
build.xml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/build.xml b/build.xml
index f82c26a..79bf9ec 100644
--- a/build.xml
+++ b/build.xml
@@ -150,7 +150,7 @@
</target>
<target name="release"
- depends="block-flat-fonts,source-release,binary-release,rat-check"
+ depends="block-flat-fonts,check-compiler-home,check-typedefs-home,source-release,binary-release,rat-check"
description="Creates source and binary kits for Apache Royale."/>
<target name="release-jenkins"
@@ -780,20 +780,20 @@ limitations under the License.
</target>
<target name="stage-compiler" >
- <echo file="${basedir}/../royale-compiler/env.properties">env.ASJS_HOME=${basedir}</echo>
+ <echo file="${ROYALE_COMPILER_REPO}/env.properties">env.ASJS_HOME=${basedir}</echo>
<!-- windows needs backslashes escaped -->
- <replaceregexp file="${basedir}/../royale-compiler/env.properties" match="\\" replace="\\\\\\\\" flags="g" />
- <ant dir="${basedir}/../royale-compiler" target="wipe-all" />
- <ant dir="${basedir}/../royale-compiler" target="stage-all" >
+ <replaceregexp file="${ROYALE_COMPILER_REPO}/env.properties" match="\\" replace="\\\\\\\\" flags="g" />
+ <ant dir="${ROYALE_COMPILER_REPO}" target="wipe-all" />
+ <ant dir="${ROYALE_COMPILER_REPO}" target="stage-all" >
<property name="staging-dir" value="${basedir}/temp/royale-compiler" />
</ant>
</target>
<target name="stage-typedefs" >
- <ant dir="${basedir}/../royale-typedefs" target="wipe" />
+ <ant dir="${ROYALE_TYPEDEFS_HOME}" target="wipe" />
<mkdir dir="${staging-dir}/../royale-typedefs"/>
<copy todir="${staging-dir}/../royale-typedefs" includeEmptyDirs="false" >
- <fileset dir="${basedir}/../royale-typedefs" includes="**" />
+ <fileset dir="${ROYALE_TYPEDEFS_HOME}" includes="**" />
</copy>
</target>
[royale-asjs] 02/03: fix override for SWF
Posted by ah...@apache.org.
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 b7badaaa2f91710092590cfd7eea01a817128ce1
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Oct 4 15:07:15 2018 -0700
fix override for SWF
---
frameworks/projects/MXRoyale/src/main/royale/mx/rpc/AbstractService.as | 1 +
1 file changed, 1 insertion(+)
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/rpc/AbstractService.as b/frameworks/projects/MXRoyale/src/main/royale/mx/rpc/AbstractService.as
index a568e59..6227ebf 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/rpc/AbstractService.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/rpc/AbstractService.as
@@ -371,6 +371,7 @@ public dynamic class AbstractService extends Proxy implements IEventDispatcher
/**
* @private
*/
+ [SWFOverride(params="flash.events.Event", altparams="org.apache.royale.events.Event")]
COMPILE::SWF
public function dispatchEvent(event:Event):Boolean
{