You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2014/02/13 02:31:23 UTC
[01/11] git commit: [flex-sdk] [refs/heads/release4.12.0] - changed
to only check screen dimensions when on an iPad
Updated Branches:
refs/heads/release4.12.0 86bbf0d7f -> 195b7a78c
changed to only check screen dimensions when on an iPad
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/5bbcb899
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/5bbcb899
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/5bbcb899
Branch: refs/heads/release4.12.0
Commit: 5bbcb899c139d731ea44c48f6a5f225f515589f5
Parents: d481fbc
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Feb 8 15:56:13 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Feb 8 15:56:13 2014 +1100
----------------------------------------------------------------------
.../framework/src/mx/core/RuntimeDPIProvider.as | 4 ++--
.../projects/framework/src/mx/utils/Platform.as | 17 +++++++++++++++++
2 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5bbcb899/frameworks/projects/framework/src/mx/core/RuntimeDPIProvider.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/mx/core/RuntimeDPIProvider.as b/frameworks/projects/framework/src/mx/core/RuntimeDPIProvider.as
index d9b7e50..48d9ee9 100644
--- a/frameworks/projects/framework/src/mx/core/RuntimeDPIProvider.as
+++ b/frameworks/projects/framework/src/mx/core/RuntimeDPIProvider.as
@@ -119,10 +119,10 @@ public class RuntimeDPIProvider
public function get runtimeDPI():Number
{
- var isIOS:Boolean = Platform.isIOS;
+ var isIPad:Boolean = Platform.isIPad;
var screenDPI:Number = Capabilities.screenDPI;
- if (isIOS)
+ if (isIPad)
{
var root:DisplayObject = SystemManager.getSWFRoot(this);
if (root != null ) {
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5bbcb899/frameworks/projects/framework/src/mx/utils/Platform.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/mx/utils/Platform.as b/frameworks/projects/framework/src/mx/utils/Platform.as
index 8c9d65f..6c89078 100644
--- a/frameworks/projects/framework/src/mx/utils/Platform.as
+++ b/frameworks/projects/framework/src/mx/utils/Platform.as
@@ -38,6 +38,7 @@ public class Platform
protected static var _initilised:Boolean;
protected static var _isAndroid:Boolean;
protected static var _isIOS:Boolean;
+ protected static var _isIPad:Boolean;
protected static var _isBlackBerry:Boolean;
protected static var _isMobile:Boolean;
protected static var _isMac:Boolean;
@@ -63,6 +64,21 @@ public class Platform
}
/**
+ * Returns true if the applciation is runing on an iPad.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 2.0
+ * @productversion Flex 4.12
+ */
+ public static function get isIPad():Boolean
+ {
+ getPlatforms();
+
+ return _isIPad;
+ }
+
+ /**
* Returns true if the applciation is runing on a BlackBerry.
*
* @langversion 3.0
@@ -208,6 +224,7 @@ public class Platform
_isMac = Capabilities.os.indexOf("Mac OS") != -1;
_isWindows = Capabilities.os.indexOf("Windows") != -1;
_isLinux = Capabilities.os.indexOf("Linux") != -1; // note that Android is also Linux
+ _isIPad = Capabilities.os.indexOf('iPad') > -1;
_isDesktop = !_isMobile;
_isAir = Capabilities.playerType == "Desktop";
[03/11] git commit: [flex-sdk] [refs/heads/release4.12.0] - Updated
to include current beta versions
Posted by jm...@apache.org.
Updated to include current beta versions
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/45ac3c7b
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/45ac3c7b
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/45ac3c7b
Branch: refs/heads/release4.12.0
Commit: 45ac3c7b249a96ac8b1e5cdfb6f60cf59454ca64
Parents: 8035c49
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Sun Feb 9 11:22:48 2014 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Sun Feb 9 11:22:48 2014 +0100
----------------------------------------------------------------------
mustella/jenkins.sh | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/45ac3c7b/mustella/jenkins.sh
----------------------------------------------------------------------
diff --git a/mustella/jenkins.sh b/mustella/jenkins.sh
index ff4264a..0a7cd91 100755
--- a/mustella/jenkins.sh
+++ b/mustella/jenkins.sh
@@ -57,20 +57,22 @@ fi
# Toggle between versions:
# 11.1 is the default version
# 11.7 is the "current long term support" version
-# 11.9 is the latest release
-# 12 is the current beta version
+# 12.0 is the latest release
+# 13 is the current beta version
+# Note: the previous release and current beta versions of AIR are both '4',
+# so to make the distinction, the beta version is '4.01' on the VM
if [ "$FLASH_VERSION" == "11.1" ]
then
FLASH_VERSION=11.7
AIR_VERSION=3.7
elif [ "$FLASH_VERSION" == "11.7" ]
then
- FLASH_VERSION=11.9
- AIR_VERSION=3.9
-elif [ "$FLASH_VERSION" == "11.9" ]
-then
FLASH_VERSION=12.0
AIR_VERSION=4
+elif [ "$FLASH_VERSION" == "12.0" ]
+then
+ FLASH_VERSION=13
+ AIR_VERSION=4.01
else
FLASH_VERSION=11.1
AIR_VERSION=3.7
@@ -99,12 +101,12 @@ case "$FLASH_VERSION" in
11.7)
export FLASHPLAYER_DEBUGGER="C:\\ApacheFlex\\dependencies\\FlashPlayer_Debug\\flashplayer11_7r700_232_win_sa_debug.exe"
;;
- 11.9)
- export FLASHPLAYER_DEBUGGER="C:\\ApacheFlex\\dependencies\\FlashPlayer_Debug\\flashplayer11-9_debugsa_win_32.exe"
- ;;
12.0)
export FLASHPLAYER_DEBUGGER="C:\\ApacheFlex\\dependencies\\FlashPlayer_Debug\\flashplayer12-0_debugsa_win_32.exe"
;;
+ 13.0)
+ export FLASHPLAYER_DEBUGGER="C:\\ApacheFlex\\dependencies\\FlashPlayer_Debug\\flashplayer13_debugsa_win_32.exe"
+ ;;
*)
echo "No valid Flash Player Debugger variable value could be parsed."
exit 1
[04/11] git commit: [flex-sdk] [refs/heads/release4.12.0] - - added
initial setting report for easier overview of type of run - added run
duration calculation to run report
Posted by jm...@apache.org.
- added initial setting report for easier overview of type of run
- added run duration calculation to run report
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/42ebf3c2
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/42ebf3c2
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/42ebf3c2
Branch: refs/heads/release4.12.0
Commit: 42ebf3c2747beef4b7c8f92a12e6ce3b4119b683
Parents: 45ac3c7
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Sun Feb 9 12:14:03 2014 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Sun Feb 9 12:14:03 2014 +0100
----------------------------------------------------------------------
mustella/jenkins.sh | 71 ++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 59 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/42ebf3c2/mustella/jenkins.sh
----------------------------------------------------------------------
diff --git a/mustella/jenkins.sh b/mustella/jenkins.sh
index 0a7cd91..adca869 100755
--- a/mustella/jenkins.sh
+++ b/mustella/jenkins.sh
@@ -124,15 +124,7 @@ END
-# ANT
-ant -f ../build.xml clean -Dbuild.noprompt=true
-ant -f ../build.xml main -Dbuild.noprompt=true
-ant -f ../build.xml other.locales -Dbuild.noprompt=true
-LOG=$LOG"- Ran 'clean', 'main' and 'other.locales' ant targets to prepare the SDK for testing"$'\n'
-
-
-
-# RUN
+# RUN SETTINGS
RUN_TYPE="main"
while [ "$1" != "" ]; do
@@ -168,6 +160,48 @@ END
TEST_SET=tests/mobile
fi
+
+
+# SETTINGS REPORT
+START=$(date +"%m-%d-%Y %H:%M")
+START_TIME=$(date +"%s")
+
+cat <<END
+
+
+
+============ JENKINS MUSTELLA SETTINGS REPORT ============
+
+Date/Time: $START
+
+Settings:
+player.version = $FLASH_VERSION
+air.version = $AIR_VERSION
+FLASHPLAYER_DEBUGGER = $FLASHPLAYER_DEBUGGER
+AIR_HOME = $AIR_HOME
+
+Build:
+ type = $RUN_TYPE
+ command = $TEST_COMMAND
+ set = $TEST_SET
+
+=====================================================
+
+
+
+END
+
+
+
+# ANT
+ant -f ../build.xml clean -Dbuild.noprompt=true
+ant -f ../build.xml main -Dbuild.noprompt=true
+ant -f ../build.xml other.locales -Dbuild.noprompt=true
+LOG=$LOG"- Ran 'clean', 'main' and 'other.locales' ant targets to prepare the SDK for testing"$'\n'
+
+
+
+# RUN
sh ./mini_run.sh $TEST_COMMAND $TEST_SET
LOG=$LOG"- Ran Mustella on the SDK with these parameters: '$TEST_COMMAND $TEST_SET'"$'\n'
@@ -193,15 +227,28 @@ fi
-# REPORT
-NOW=$(date +"%m-%d-%Y %H:%M")
+# RUN REPORT
+END=$(date +"%m-%d-%Y %H:%M")
+END_TIME=$(date +"%s")
+
+DURATION=$(($END_TIME - $START_TIME))
+
+DAYS=$(($DURATION / 60 / 60 / 24))
+HOURS=$((($DURATION / 60 / 60) - ($DAYS * 24)))
+MINUTES=$((($DURATION / 60) - (($DAYS * 24 + $HOURS) * 60)))
+SECONDS=$((($DURATION) - ((($DAYS * 24 + $HOURS) * 60 + $MINUTES) * 60)))
+
+DURATION_STR="$DAYS days $HOURS hours $MINUTES mins $SECONDS seconds"
+
cat <<END
============ JENKINS MUSTELLA RUN REPORT ============
-Date and time: $NOW
+Date/Time: $END
+
+Run duration: $DURATION_STR
Settings:
player.version = $FLASH_VERSION
[08/11] git commit: [flex-sdk] [refs/heads/release4.12.0] -
FLEX-34053 - MaskedTextInput - Implement windows exclusive 'Insert' key
behaviour in MaskedTextInput Component
Posted by jm...@apache.org.
FLEX-34053 - MaskedTextInput - Implement windows exclusive 'Insert' key behaviour in MaskedTextInput Component
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/7549aa18
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/7549aa18
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/7549aa18
Branch: refs/heads/release4.12.0
Commit: 7549aa18410511b008c985a58481cf127c0a4400
Parents: 96ba4bc
Author: Carlos Rovira <ca...@apache.org>
Authored: Mon Feb 10 18:33:46 2014 +0100
Committer: Carlos Rovira <ca...@apache.org>
Committed: Mon Feb 10 18:33:46 2014 +0100
----------------------------------------------------------------------
.../src/spark/components/MaskedTextInput.as | 21 ++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7549aa18/frameworks/projects/experimental/src/spark/components/MaskedTextInput.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental/src/spark/components/MaskedTextInput.as b/frameworks/projects/experimental/src/spark/components/MaskedTextInput.as
index 2bf3e94..510d3a6 100644
--- a/frameworks/projects/experimental/src/spark/components/MaskedTextInput.as
+++ b/frameworks/projects/experimental/src/spark/components/MaskedTextInput.as
@@ -20,6 +20,8 @@ package spark.components {
import flash.events.Event;
import flash.events.TextEvent;
+ import flashx.textLayout.edit.EditManager;
+
import flashx.textLayout.edit.SelectionState;
import flashx.textLayout.operations.CompositeOperation;
import flashx.textLayout.operations.CopyOperation;
@@ -375,7 +377,17 @@ package spark.components {
var insertOp:InsertTextOperation = event.operation as InsertTextOperation;
if (insertOp.deleteSelectionState != null && !insertOp.deleteSelectionState.tlf_internal::selectionManagerOperationState) {
//OVERRIDING INSERT
- if (isSeparator(ac)) {
+ if (EditManager.overwriteMode) {
+ //windows insert mode on (note that Flash Player does not track insertion mode state before running a SWF)
+ if (isSeparator(ac - 1)) {
+ outputText = super.text.substring(0, insertOp.originalSelectionState.anchorPosition + 1) + super.text.substring(insertOp.originalSelectionState.anchorPosition + 2);
+ } else {
+ outputText = super.text;
+ }
+ an -= 1;
+ ac -= 1;
+ }
+ else if (isSeparator(ac)) {
outputText = super.text.substring(0, insertOp.originalSelectionState.anchorPosition + 1) + insertOp.text + super.text.substring(insertOp.originalSelectionState.activePosition + 1);
} else {
outputText = super.text.substring(0, insertOp.originalSelectionState.anchorPosition) + insertOp.text + super.text.substring(insertOp.originalSelectionState.activePosition);
@@ -392,7 +404,7 @@ package spark.components {
ac = ac + 1;
}
} else {
-
+ //INSERT (TEXT NOT COMPLETE)
for (var i:int = 0; i < maskText.length; i++) {
if (stack.length == 0) {
break;
@@ -467,6 +479,11 @@ package spark.components {
* @param event the TextEvent
*/
protected function overrideText(event:TextEvent):void {
+ //windows insert mode on (note that Flash Player does not track insertion mode state before running a SWF)
+ if (EditManager.overwriteMode) {
+ return;
+ }
+
var an:int = selectionAnchorPosition;
var ac:int = selectionActivePosition;
[05/11] git commit: [flex-sdk] [refs/heads/release4.12.0] - Fixed
'typo' in version nr.
Posted by jm...@apache.org.
Fixed 'typo' in version nr.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/5d0b30c7
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/5d0b30c7
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/5d0b30c7
Branch: refs/heads/release4.12.0
Commit: 5d0b30c7935f2e4a21c85fe6e7d18f4fdd61b5aa
Parents: 42ebf3c
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Sun Feb 9 12:34:25 2014 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Sun Feb 9 12:34:25 2014 +0100
----------------------------------------------------------------------
mustella/jenkins.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5d0b30c7/mustella/jenkins.sh
----------------------------------------------------------------------
diff --git a/mustella/jenkins.sh b/mustella/jenkins.sh
index adca869..84530f4 100755
--- a/mustella/jenkins.sh
+++ b/mustella/jenkins.sh
@@ -104,7 +104,7 @@ case "$FLASH_VERSION" in
12.0)
export FLASHPLAYER_DEBUGGER="C:\\ApacheFlex\\dependencies\\FlashPlayer_Debug\\flashplayer12-0_debugsa_win_32.exe"
;;
- 13.0)
+ 13)
export FLASHPLAYER_DEBUGGER="C:\\ApacheFlex\\dependencies\\FlashPlayer_Debug\\flashplayer13_debugsa_win_32.exe"
;;
*)
[02/11] git commit: [flex-sdk] [refs/heads/release4.12.0] - Merge
branch 'release4.12.0' of https://git-wip-us.apache.org/repos/asf/flex-sdk
into develop
Posted by jm...@apache.org.
Merge branch 'release4.12.0' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/8035c492
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/8035c492
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/8035c492
Branch: refs/heads/release4.12.0
Commit: 8035c4927f03d8c792860c7a48fdeb6b868eae73
Parents: 5bbcb89 036df07
Author: Justin Mclean <jm...@apache.org>
Authored: Sun Feb 9 09:46:58 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Sun Feb 9 09:46:58 2014 +1100
----------------------------------------------------------------------
RELEASE_NOTES | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[11/11] git commit: [flex-sdk] [refs/heads/release4.12.0] -
FLEX-34053 - MaskedTextInput - update separators comment
Posted by jm...@apache.org.
FLEX-34053 - MaskedTextInput - update separators comment
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/195b7a78
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/195b7a78
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/195b7a78
Branch: refs/heads/release4.12.0
Commit: 195b7a78cbdf600cc6b52d6f29cce482386d692a
Parents: fd5320b
Author: Carlos Rovira <ca...@apache.org>
Authored: Wed Feb 12 11:46:27 2014 +0100
Committer: Carlos Rovira <ca...@apache.org>
Committed: Wed Feb 12 11:46:27 2014 +0100
----------------------------------------------------------------------
.../projects/experimental/src/spark/components/MaskedTextInput.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/195b7a78/frameworks/projects/experimental/src/spark/components/MaskedTextInput.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental/src/spark/components/MaskedTextInput.as b/frameworks/projects/experimental/src/spark/components/MaskedTextInput.as
index 510d3a6..eccf5b0 100644
--- a/frameworks/projects/experimental/src/spark/components/MaskedTextInput.as
+++ b/frameworks/projects/experimental/src/spark/components/MaskedTextInput.as
@@ -58,7 +58,7 @@ package spark.components {
* maskText : The mask base string for the component logic
* defaults to ""
* separators : The characters specified to act as separators that must be present in the maskText
- * defaults to "-+/|()[]{}."
+ * defaults to "- +/|()[]{}."
* textMaskPrompt : User defined prompt to override default behaviour.
* defaults to ""
* placeHolder : A character to show instead internal mask template characters (#, @ and ?)
[10/11] git commit: [flex-sdk] [refs/heads/release4.12.0] - merge
release4.12.0 into develop
Posted by jm...@apache.org.
merge release4.12.0 into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/fd5320be
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/fd5320be
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/fd5320be
Branch: refs/heads/release4.12.0
Commit: fd5320be3bc61f59607860407d3850fcb2de80f0
Parents: b20148e 86bbf0d
Author: Alex Harui <ah...@apache.org>
Authored: Wed Feb 12 00:08:13 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Feb 12 00:08:13 2014 -0800
----------------------------------------------------------------------
installer.properties/de_DE.properties | 9 +++++
installer.properties/el_GR.properties | 9 +++++
installer.properties/en_US.properties | 9 +++++
installer.properties/es_ES.properties | 9 +++++
installer.properties/fr_FR.properties | 9 +++++
installer.properties/nl_NL.properties | 10 +++++
installer.properties/pt_BR.properties | 9 +++++
installer.xml | 64 ++++++++++++++++++++++++++++++
8 files changed, 128 insertions(+)
----------------------------------------------------------------------
[09/11] git commit: [flex-sdk] [refs/heads/release4.12.0] - merge
release4.12.0 into develop
Posted by jm...@apache.org.
merge release4.12.0 into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/b20148e2
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/b20148e2
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/b20148e2
Branch: refs/heads/release4.12.0
Commit: b20148e22e13240e630e197bf2cad1a05c386043
Parents: 7549aa1 b35ddde
Author: Alex Harui <ah...@apache.org>
Authored: Tue Feb 11 15:51:34 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Feb 11 15:51:34 2014 -0800
----------------------------------------------------------------------
README | 30 +----
RELEASE_NOTES | 6 +-
apache-flex-sdk-installer-config.xml | 169 +++++++++++++++++++++++++++++
installer.properties/de_DE.properties | 113 +++++++++++++++++++
installer.properties/el_GR.properties | 115 ++++++++++++++++++++
installer.properties/es_ES.properties | 116 ++++++++++++++++++++
installer.properties/fr_FR.properties | 113 +++++++++++++++++++
installer.properties/nl_NL.properties | 115 ++++++++++++++++++++
installer.properties/pt_BR.properties | 116 ++++++++++++++++++++
9 files changed, 867 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
[07/11] git commit: [flex-sdk] [refs/heads/release4.12.0] - - use
'build.xml' compatible version numbering to make sure FP version is matched
correctly to 'swfversion' - split AIR 'version' and 'SDK location' to allow
for more descriptive SDK directory n
Posted by jm...@apache.org.
- use 'build.xml' compatible version numbering to make sure FP version is matched correctly to 'swfversion'
- split AIR 'version' and 'SDK location' to allow for more descriptive SDK directory naming
- correctly output AIR version to 'local.properties'
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/96ba4bc1
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/96ba4bc1
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/96ba4bc1
Branch: refs/heads/release4.12.0
Commit: 96ba4bc1d13f384e7e8ef603b67a27dc6eabb771
Parents: b0b5820
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Mon Feb 10 11:48:28 2014 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Mon Feb 10 11:48:43 2014 +0100
----------------------------------------------------------------------
mustella/jenkins.sh | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96ba4bc1/mustella/jenkins.sh
----------------------------------------------------------------------
diff --git a/mustella/jenkins.sh b/mustella/jenkins.sh
index 84530f4..3023763 100755
--- a/mustella/jenkins.sh
+++ b/mustella/jenkins.sh
@@ -65,17 +65,21 @@ if [ "$FLASH_VERSION" == "11.1" ]
then
FLASH_VERSION=11.7
AIR_VERSION=3.7
+ AIR_SDK_DIR=3.7
elif [ "$FLASH_VERSION" == "11.7" ]
then
FLASH_VERSION=12.0
- AIR_VERSION=4
+ AIR_VERSION=4.0
+ AIR_SDK_DIR=4.0
elif [ "$FLASH_VERSION" == "12.0" ]
then
- FLASH_VERSION=13
- AIR_VERSION=4.01
+ FLASH_VERSION=13.0
+ AIR_VERSION=4.0
+ AIR_SDK_DIR=4.0_beta
else
FLASH_VERSION=11.1
AIR_VERSION=3.7
+ AIR_SDK_DIR=3.7
fi
# write toggled values to 'versions' file
@@ -90,7 +94,7 @@ LOG=$LOG"- Set FLASH_VERSION to '$FLASH_VERSION' and AIR_VERSION to '$AIR_VERSIO
# LOCATIONS
#export AIR_HOME="/Users/erik/Documents/ApacheFlex/dependencies/AdobeAIRSDK"
-export AIR_HOME="C:\\ApacheFlex\\dependencies\\AdobeAIRSDK\\$AIR_VERSION"
+export AIR_HOME="C:\\ApacheFlex\\dependencies\\AdobeAIRSDK\\$AIR_SDK_DIR"
LOG=$LOG"- Set AIR_HOME to '$AIR_HOME'"$'\n'
case "$FLASH_VERSION" in
@@ -104,7 +108,7 @@ case "$FLASH_VERSION" in
12.0)
export FLASHPLAYER_DEBUGGER="C:\\ApacheFlex\\dependencies\\FlashPlayer_Debug\\flashplayer12-0_debugsa_win_32.exe"
;;
- 13)
+ 13.0)
export FLASHPLAYER_DEBUGGER="C:\\ApacheFlex\\dependencies\\FlashPlayer_Debug\\flashplayer13_debugsa_win_32.exe"
;;
*)
@@ -119,7 +123,7 @@ LOG=$LOG"- Set FLASHPLAYER_DEBUGGER to '$FLASHPLAYER_DEBUGGER'"$'\n'
# To build the SDK using the versions specified above, write '../local.properties'
cat > ../local.properties <<END
playerglobal.version = $FLASH_VERSION
-air.version = AIR_VERSION
+air.version = $AIR_VERSION
END
[06/11] git commit: [flex-sdk] [refs/heads/release4.12.0] - Merge
remote-tracking branch 'origin/release4.12.0' into develop
Posted by jm...@apache.org.
Merge remote-tracking branch 'origin/release4.12.0' into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/b0b5820d
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/b0b5820d
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/b0b5820d
Branch: refs/heads/release4.12.0
Commit: b0b5820d9ef86e075fffa25d4bb5ac0a83c51a67
Parents: 5d0b30c a5ff72a
Author: Justin Mclean <jm...@apache.org>
Authored: Mon Feb 10 19:08:51 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon Feb 10 19:08:51 2014 +1100
----------------------------------------------------------------------
.../src/mx/managers/systemClasses/ActiveWindowManager.as | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------