You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2014/05/07 08:00:44 UTC
[1/9] git commit: [flex-sdk] [refs/heads/release4.12.0] - merge
release4.12.0 branch to develop branch
Repository: flex-sdk
Updated Branches:
refs/heads/release4.12.0 ac55c8b52 -> 6fc0cfaa4
merge release4.12.0 branch to develop branch
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/7a3a280e
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/7a3a280e
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/7a3a280e
Branch: refs/heads/release4.12.0
Commit: 7a3a280ed661f5ee670f1c701478b3e0adc5d2e1
Parents: 4a13999 ac55c8b
Author: Alex Harui <ah...@apache.org>
Authored: Thu May 1 10:58:56 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu May 1 10:58:56 2014 -0700
----------------------------------------------------------------------
CONTRIBUTING | 26 ++++++++--------
README | 31 ++++++++++++--------
RELEASE_NOTES | 29 +++++++++++-------
build.properties | 4 +--
.../framework/src/mx/core/FlexVersion.as | 2 +-
.../framework/src/mx/styles/CSSDimension.as | 3 +-
ide/flashbuilder/makeApacheFlexForIDE.bat | 16 +++++-----
ide/flashbuilder/makeApacheFlexForIDE.sh | 10 +++----
.../compiler/common/MxmlConfiguration.java | 5 ++--
.../src/java/flex2/tools/VersionInfo.java | 2 +-
10 files changed, 72 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
[3/9] git commit: [flex-sdk] [refs/heads/release4.12.0] - update AIR
/ FP to default to more recent version
Posted by ah...@apache.org.
update AIR / FP to default to more recent version
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/20cd5fb1
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/20cd5fb1
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/20cd5fb1
Branch: refs/heads/release4.12.0
Commit: 20cd5fb1eac2dea98619fbca58a23e5055f001fb
Parents: 0572ddf
Author: Justin Mclean <jm...@apache.org>
Authored: Mon May 5 09:02:26 2014 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon May 5 09:02:26 2014 +1000
----------------------------------------------------------------------
installer.xml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/20cd5fb1/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 118643c..9e4547f 100644
--- a/installer.xml
+++ b/installer.xml
@@ -43,8 +43,8 @@
<property file="${FLEX_HOME}/installer.properties/en_US.properties"/>
<property name="download.dir" value="${FLEX_HOME}/in"/>
- <property name="air.sdk.version" value="3.9"/>
- <property name="flash.sdk.version" value="11.9"/>
+ <property name="air.sdk.version" value="13.0"/>
+ <property name="flash.sdk.version" value="13.0"/>
<property name="xml.properties" value="http://flex.apache.org/installer/sdk-installer-config-4.0.xml" />
@@ -102,7 +102,7 @@
</not>
</condition>
- <condition property="java.home" value="${env.JAVA_HOME}" >
+ <condition property="java.home" value="${env.JAVA_HOME}">
<and>
<available file="${env.JAVA_HOME}" type="dir" />
<not>
@@ -111,7 +111,7 @@
</and>
</condition>
- <target name="get-data" >
+ <target name="get-data">
<property name="do-not-cache-next-get" value="true" />
<get src="${xml.properties}" dest="${basedir}/sdk-installer-config-4.0.xml" />
<xmlproperty file="${basedir}/sdk-installer-config-4.0.xml" semanticAttributes="true" collapseAttributes="true"/>
@@ -263,11 +263,11 @@
</target>
- <target name="air-get-check" >
+ <target name="air-get-check">
<available file="${download.dir}/${air.sdk.url.file}" property="air.downloaded" />
</target>
- <target name="air-get" depends="air-get-check" unless="air.downloaded" >
+ <target name="air-get" depends="air-get-check" unless="air.downloaded">
<echo>${AIRDownloadEcho} ${air.sdk.url.path}/${air.sdk.url.file}</echo>
<get src="${air.sdk.url.path}/${air.sdk.url.file}"
dest="${download.dir}/${air.sdk.url.file}"
@@ -307,13 +307,13 @@
<untar compression="bzip2" src="${download.dir}/${air.sdk.url.file}" dest="${download.dir}/airsdk" />-->
<mkdir dir="${download.dir}/airsdk" />
<move file="${download.dir}/${air.sdk.url.file}" todir="${download.dir}/airsdk" />
- <exec executable="bunzip2" dir="${download.dir}/airsdk" >
+ <exec executable="bunzip2" dir="${download.dir}/airsdk">
<arg value="${air.sdk.url.file}" />
</exec>
<echo file="${basedir}/airtar.properties">air.tar.name=${air.sdk.url.file}</echo>
<replace file="${basedir}/airtar.properties" token="tbz2" value="tar" />
<property file="${basedir}/airtar.properties" />
- <exec executable="tar" dir="${download.dir}/airsdk" >
+ <exec executable="tar" dir="${download.dir}/airsdk">
<arg value="-xvf" />
<arg value="${air.tar.name}" />
</exec>
[2/9] git commit: [flex-sdk] [refs/heads/release4.12.0] - change
version back to 4.13
Posted by ah...@apache.org.
change version back to 4.13
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/0572ddf1
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/0572ddf1
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/0572ddf1
Branch: refs/heads/release4.12.0
Commit: 0572ddf137e42f86305261ac9ab7861cac49b542
Parents: 7a3a280
Author: Alex Harui <ah...@apache.org>
Authored: Sat May 3 09:31:52 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sat May 3 09:31:52 2014 -0700
----------------------------------------------------------------------
build.properties | 4 ++--
frameworks/projects/advancedgrids/src/mx/core/Version.as | 2 +-
frameworks/projects/airframework/src/mx/core/Version.as | 2 +-
frameworks/projects/airspark/src/spark/core/Version.as | 2 +-
frameworks/projects/apache/src/core/Version.as | 2 +-
frameworks/projects/automation/src/mx/core/Version.as | 2 +-
frameworks/projects/automation_agent/src/mx/core/Version.as | 2 +-
frameworks/projects/automation_air/src/mx/core/Version.as | 2 +-
frameworks/projects/automation_dmv/src/mx/core/Version.as | 2 +-
.../projects/automation_flashflexkit/src/mx/core/Version.as | 2 +-
frameworks/projects/automation_spark/src/mx/core/Version.as | 2 +-
frameworks/projects/automation_spark/src/spark/core/Version.as | 2 +-
frameworks/projects/charts/src/mx/core/Version.as | 2 +-
frameworks/projects/framework/src/mx/core/FlexVersion.as | 2 +-
frameworks/projects/framework/src/mx/core/Version.as | 2 +-
frameworks/projects/mx/src/mx/core/Version.as | 2 +-
frameworks/projects/rpc/src/mx/core/Version.as | 2 +-
frameworks/projects/spark/src/spark/core/Version.as | 2 +-
frameworks/projects/spark_dmv/src/spark/core/Version.as | 2 +-
frameworks/projects/tool/src/mx/core/Version.as | 2 +-
frameworks/projects/tool_air/src/mx/core/Version.as | 2 +-
.../src/java/flex2/compiler/common/MxmlConfiguration.java | 2 +-
modules/compiler/src/java/flex2/tools/VersionInfo.java | 4 ++--
23 files changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0572ddf1/build.properties
----------------------------------------------------------------------
diff --git a/build.properties b/build.properties
index 6c22e48..59977fb 100644
--- a/build.properties
+++ b/build.properties
@@ -18,8 +18,8 @@
################################################################################
# flex-sdk-description values
-release = Apache Flex 4.12.1
-release.version = 4.12.1
+release = Apache Flex 4.13.0
+release.version = 4.13.0
# override on command line with -Dbuild.number=999 or in local.properties
build.number = 0
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0572ddf1/frameworks/projects/advancedgrids/src/mx/core/Version.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/advancedgrids/src/mx/core/Version.as b/frameworks/projects/advancedgrids/src/mx/core/Version.as
index 533c8b5..90b75ca 100644
--- a/frameworks/projects/advancedgrids/src/mx/core/Version.as
+++ b/frameworks/projects/advancedgrids/src/mx/core/Version.as
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
* @private
* Version string for this class.
*/
-mx_internal static const VERSION:String = "4.12.0.0";
+mx_internal static const VERSION:String = "4.13.0.0";
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0572ddf1/frameworks/projects/airframework/src/mx/core/Version.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/airframework/src/mx/core/Version.as b/frameworks/projects/airframework/src/mx/core/Version.as
index 533c8b5..90b75ca 100644
--- a/frameworks/projects/airframework/src/mx/core/Version.as
+++ b/frameworks/projects/airframework/src/mx/core/Version.as
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
* @private
* Version string for this class.
*/
-mx_internal static const VERSION:String = "4.12.0.0";
+mx_internal static const VERSION:String = "4.13.0.0";
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0572ddf1/frameworks/projects/airspark/src/spark/core/Version.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/airspark/src/spark/core/Version.as b/frameworks/projects/airspark/src/spark/core/Version.as
index 533c8b5..90b75ca 100644
--- a/frameworks/projects/airspark/src/spark/core/Version.as
+++ b/frameworks/projects/airspark/src/spark/core/Version.as
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
* @private
* Version string for this class.
*/
-mx_internal static const VERSION:String = "4.12.0.0";
+mx_internal static const VERSION:String = "4.13.0.0";
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0572ddf1/frameworks/projects/apache/src/core/Version.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/apache/src/core/Version.as b/frameworks/projects/apache/src/core/Version.as
index 533c8b5..90b75ca 100644
--- a/frameworks/projects/apache/src/core/Version.as
+++ b/frameworks/projects/apache/src/core/Version.as
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
* @private
* Version string for this class.
*/
-mx_internal static const VERSION:String = "4.12.0.0";
+mx_internal static const VERSION:String = "4.13.0.0";
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0572ddf1/frameworks/projects/automation/src/mx/core/Version.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/automation/src/mx/core/Version.as b/frameworks/projects/automation/src/mx/core/Version.as
index 533c8b5..90b75ca 100644
--- a/frameworks/projects/automation/src/mx/core/Version.as
+++ b/frameworks/projects/automation/src/mx/core/Version.as
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
* @private
* Version string for this class.
*/
-mx_internal static const VERSION:String = "4.12.0.0";
+mx_internal static const VERSION:String = "4.13.0.0";
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0572ddf1/frameworks/projects/automation_agent/src/mx/core/Version.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/automation_agent/src/mx/core/Version.as b/frameworks/projects/automation_agent/src/mx/core/Version.as
index 533c8b5..90b75ca 100644
--- a/frameworks/projects/automation_agent/src/mx/core/Version.as
+++ b/frameworks/projects/automation_agent/src/mx/core/Version.as
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
* @private
* Version string for this class.
*/
-mx_internal static const VERSION:String = "4.12.0.0";
+mx_internal static const VERSION:String = "4.13.0.0";
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0572ddf1/frameworks/projects/automation_air/src/mx/core/Version.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/automation_air/src/mx/core/Version.as b/frameworks/projects/automation_air/src/mx/core/Version.as
index 533c8b5..90b75ca 100644
--- a/frameworks/projects/automation_air/src/mx/core/Version.as
+++ b/frameworks/projects/automation_air/src/mx/core/Version.as
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
* @private
* Version string for this class.
*/
-mx_internal static const VERSION:String = "4.12.0.0";
+mx_internal static const VERSION:String = "4.13.0.0";
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0572ddf1/frameworks/projects/automation_dmv/src/mx/core/Version.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/automation_dmv/src/mx/core/Version.as b/frameworks/projects/automation_dmv/src/mx/core/Version.as
index 533c8b5..90b75ca 100644
--- a/frameworks/projects/automation_dmv/src/mx/core/Version.as
+++ b/frameworks/projects/automation_dmv/src/mx/core/Version.as
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
* @private
* Version string for this class.
*/
-mx_internal static const VERSION:String = "4.12.0.0";
+mx_internal static const VERSION:String = "4.13.0.0";
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0572ddf1/frameworks/projects/automation_flashflexkit/src/mx/core/Version.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/automation_flashflexkit/src/mx/core/Version.as b/frameworks/projects/automation_flashflexkit/src/mx/core/Version.as
index 5dc0b6c..f261fc5 100644
--- a/frameworks/projects/automation_flashflexkit/src/mx/core/Version.as
+++ b/frameworks/projects/automation_flashflexkit/src/mx/core/Version.as
@@ -24,4 +24,4 @@ import mx.core.mx_internal;
* @private
* Version string for this class.
*/
-mx_internal static const VERSION:String = "4.12.0.0";
+mx_internal static const VERSION:String = "4.13.0.0";
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0572ddf1/frameworks/projects/automation_spark/src/mx/core/Version.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/automation_spark/src/mx/core/Version.as b/frameworks/projects/automation_spark/src/mx/core/Version.as
index 533c8b5..90b75ca 100644
--- a/frameworks/projects/automation_spark/src/mx/core/Version.as
+++ b/frameworks/projects/automation_spark/src/mx/core/Version.as
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
* @private
* Version string for this class.
*/
-mx_internal static const VERSION:String = "4.12.0.0";
+mx_internal static const VERSION:String = "4.13.0.0";
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0572ddf1/frameworks/projects/automation_spark/src/spark/core/Version.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/automation_spark/src/spark/core/Version.as b/frameworks/projects/automation_spark/src/spark/core/Version.as
index 533c8b5..90b75ca 100644
--- a/frameworks/projects/automation_spark/src/spark/core/Version.as
+++ b/frameworks/projects/automation_spark/src/spark/core/Version.as
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
* @private
* Version string for this class.
*/
-mx_internal static const VERSION:String = "4.12.0.0";
+mx_internal static const VERSION:String = "4.13.0.0";
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0572ddf1/frameworks/projects/charts/src/mx/core/Version.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/charts/src/mx/core/Version.as b/frameworks/projects/charts/src/mx/core/Version.as
index 533c8b5..90b75ca 100644
--- a/frameworks/projects/charts/src/mx/core/Version.as
+++ b/frameworks/projects/charts/src/mx/core/Version.as
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
* @private
* Version string for this class.
*/
-mx_internal static const VERSION:String = "4.12.0.0";
+mx_internal static const VERSION:String = "4.13.0.0";
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0572ddf1/frameworks/projects/framework/src/mx/core/FlexVersion.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/mx/core/FlexVersion.as b/frameworks/projects/framework/src/mx/core/FlexVersion.as
index 31732fa..41c63fc 100644
--- a/frameworks/projects/framework/src/mx/core/FlexVersion.as
+++ b/frameworks/projects/framework/src/mx/core/FlexVersion.as
@@ -56,7 +56,7 @@ public class FlexVersion
* @playerversion AIR 1.1
* @productversion Flex 3
*/
- public static const CURRENT_VERSION:uint = 0x040C0000;
+ public static const CURRENT_VERSION:uint = 0x040D0000;
/**
* The <code>compatibilityVersion</code> value of Flex 4.13,
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0572ddf1/frameworks/projects/framework/src/mx/core/Version.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/mx/core/Version.as b/frameworks/projects/framework/src/mx/core/Version.as
index 533c8b5..90b75ca 100644
--- a/frameworks/projects/framework/src/mx/core/Version.as
+++ b/frameworks/projects/framework/src/mx/core/Version.as
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
* @private
* Version string for this class.
*/
-mx_internal static const VERSION:String = "4.12.0.0";
+mx_internal static const VERSION:String = "4.13.0.0";
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0572ddf1/frameworks/projects/mx/src/mx/core/Version.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mx/src/mx/core/Version.as b/frameworks/projects/mx/src/mx/core/Version.as
index 533c8b5..90b75ca 100644
--- a/frameworks/projects/mx/src/mx/core/Version.as
+++ b/frameworks/projects/mx/src/mx/core/Version.as
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
* @private
* Version string for this class.
*/
-mx_internal static const VERSION:String = "4.12.0.0";
+mx_internal static const VERSION:String = "4.13.0.0";
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0572ddf1/frameworks/projects/rpc/src/mx/core/Version.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/rpc/src/mx/core/Version.as b/frameworks/projects/rpc/src/mx/core/Version.as
index 946ed7e..9191675 100644
--- a/frameworks/projects/rpc/src/mx/core/Version.as
+++ b/frameworks/projects/rpc/src/mx/core/Version.as
@@ -22,4 +22,4 @@ import mx.core.mx_internal;
* @private
* Version string for this class.
*/
-mx_internal static const VERSION:String = "4.12.0.0";
+mx_internal static const VERSION:String = "4.13.0.0";
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0572ddf1/frameworks/projects/spark/src/spark/core/Version.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/core/Version.as b/frameworks/projects/spark/src/spark/core/Version.as
index 533c8b5..90b75ca 100644
--- a/frameworks/projects/spark/src/spark/core/Version.as
+++ b/frameworks/projects/spark/src/spark/core/Version.as
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
* @private
* Version string for this class.
*/
-mx_internal static const VERSION:String = "4.12.0.0";
+mx_internal static const VERSION:String = "4.13.0.0";
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0572ddf1/frameworks/projects/spark_dmv/src/spark/core/Version.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark_dmv/src/spark/core/Version.as b/frameworks/projects/spark_dmv/src/spark/core/Version.as
index 533c8b5..90b75ca 100644
--- a/frameworks/projects/spark_dmv/src/spark/core/Version.as
+++ b/frameworks/projects/spark_dmv/src/spark/core/Version.as
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
* @private
* Version string for this class.
*/
-mx_internal static const VERSION:String = "4.12.0.0";
+mx_internal static const VERSION:String = "4.13.0.0";
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0572ddf1/frameworks/projects/tool/src/mx/core/Version.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/tool/src/mx/core/Version.as b/frameworks/projects/tool/src/mx/core/Version.as
index 533c8b5..90b75ca 100644
--- a/frameworks/projects/tool/src/mx/core/Version.as
+++ b/frameworks/projects/tool/src/mx/core/Version.as
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
* @private
* Version string for this class.
*/
-mx_internal static const VERSION:String = "4.12.0.0";
+mx_internal static const VERSION:String = "4.13.0.0";
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0572ddf1/frameworks/projects/tool_air/src/mx/core/Version.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/tool_air/src/mx/core/Version.as b/frameworks/projects/tool_air/src/mx/core/Version.as
index 533c8b5..90b75ca 100644
--- a/frameworks/projects/tool_air/src/mx/core/Version.as
+++ b/frameworks/projects/tool_air/src/mx/core/Version.as
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
* @private
* Version string for this class.
*/
-mx_internal static const VERSION:String = "4.12.0.0";
+mx_internal static const VERSION:String = "4.13.0.0";
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0572ddf1/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java b/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java
index 4ce326b..44af2d6 100644
--- a/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java
+++ b/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java
@@ -62,7 +62,7 @@ public class MxmlConfiguration
public static final int VERSION_3_0 = 0x03000000;
public static final int VERSION_2_0_1 = 0x02000001;
public static final int VERSION_2_0 = 0x02000000;
- public static final int CURRENT_VERSION = VERSION_4_12_1;
+ public static final int CURRENT_VERSION = VERSION_4_13;
public static final int EARLIEST_MAJOR_VERSION = 3;
public static final int LATEST_MAJOR_VERSION = 4;
public static final int LATEST_MINOR_VERSION = 12;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0572ddf1/modules/compiler/src/java/flex2/tools/VersionInfo.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flex2/tools/VersionInfo.java b/modules/compiler/src/java/flex2/tools/VersionInfo.java
index 0574f50..fe87538 100644
--- a/modules/compiler/src/java/flex2/tools/VersionInfo.java
+++ b/modules/compiler/src/java/flex2/tools/VersionInfo.java
@@ -32,8 +32,8 @@ import java.util.Properties;
public class VersionInfo
{
public static String FLEX_MAJOR_VERSION = "4";
- public static String FLEX_MINOR_VERSION = "12";
- public static String FLEX_NANO_VERSION = "1";
+ public static String FLEX_MINOR_VERSION = "13";
+ public static String FLEX_NANO_VERSION = "0";
/**
* Lib version is the "version" of the SWC format. Major number changes represent big (although not
[7/9] git commit: [flex-sdk] [refs/heads/release4.12.0] - this file
shows up in rat
Posted by ah...@apache.org.
this file shows up in rat
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/6f4c21e6
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/6f4c21e6
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/6f4c21e6
Branch: refs/heads/release4.12.0
Commit: 6f4c21e6e736a37278c9e74ffed575ee956d155f
Parents: 82dcfde
Author: Alex Harui <ah...@apache.org>
Authored: Sun May 4 22:33:05 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sun May 4 22:33:05 2014 -0700
----------------------------------------------------------------------
build.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/6f4c21e6/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 9e9a3a8..40dfcb8 100644
--- a/build.xml
+++ b/build.xml
@@ -1799,6 +1799,7 @@ There are no known issues.
<!-- exclude batik manifests -->
<exclude name="modules/thirdparty/batik/sources/*.mf"/>
<!-- exclude text files -->
+ <exclude name="CONTRIBUTING"/>
<exclude name="modules/thirdparty/batik/lib/**/LICENSE*.txt"/>
<exclude name="modules/thirdparty/batik/lib/**/README*.txt"/>
<!-- exclude w3c sources -->
[5/9] git commit: [flex-sdk] [refs/heads/release4.12.0] - fix some
bugs in the air install and clean up 'in' folder if success
Posted by ah...@apache.org.
fix some bugs in the air install and clean up 'in' folder if success
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/5fe5608b
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/5fe5608b
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/5fe5608b
Branch: refs/heads/release4.12.0
Commit: 5fe5608b665ad773e86f19f57742de3309295669
Parents: 8350eb5
Author: Alex Harui <ah...@apache.org>
Authored: Sun May 4 21:33:53 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sun May 4 21:35:35 2014 -0700
----------------------------------------------------------------------
installer.xml | 28 +++++++++++++++++++++++++++-
1 file changed, 27 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5fe5608b/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 9e4547f..98c341d 100644
--- a/installer.xml
+++ b/installer.xml
@@ -115,6 +115,7 @@
<property name="do-not-cache-next-get" value="true" />
<get src="${xml.properties}" dest="${basedir}/sdk-installer-config-4.0.xml" />
<xmlproperty file="${basedir}/sdk-installer-config-4.0.xml" semanticAttributes="true" collapseAttributes="true"/>
+ <xmlproperty file="${basedir}/flex-sdk-description.xml" semanticAttributes="true" collapseAttributes="true"/>
<property name="air.sdk.url.path.ref" value="air.sdk.path.${platform}.${air.sdk.version}" />
<property name="air.sdk.url.path" refid="${air.sdk.url.path.ref}" />
<property name="air.sdk.url.file.ref" value="air.sdk.file.${platform}.${air.sdk.version}" />
@@ -135,6 +136,7 @@
</target>
<target name="install" depends="get-data,check-binary,ask-licenses,get-third-party-files,fixup-config-files" description="Converts binary package to IDE compatible folder">
+ <delete dir="${download.dir}" />
<echo>${install.complete.echo}</echo>
</target>
@@ -330,11 +332,21 @@
<param name="destdir" value="${FLEX_HOME}" />
</antcall>
<antcall target="mac-copy-file">
+ <param name="srcdir" value="." />
+ <param name="filename" value="airsdk.xml"/>
+ <param name="destdir" value="${FLEX_HOME}" />
+ </antcall>
+ <antcall target="mac-copy-file">
<param name="srcdir" value="bin" />
<param name="filename" value="adl"/>
<param name="destdir" value="${FLEX_HOME}/bin" />
</antcall>
<antcall target="mac-copy-file">
+ <param name="srcdir" value="bin" />
+ <param name="filename" value="adt"/>
+ <param name="destdir" value="${FLEX_HOME}/bin" />
+ </antcall>
+ <antcall target="mac-copy-file">
<param name="srcdir" value="lib" />
<param name="filename" value="adt.jar"/>
<param name="destdir" value="${FLEX_HOME}/lib" />
@@ -388,6 +400,14 @@
<param name="srcdir" value="templates/air" />
<param name="destdir" value="${FLEX_HOME}/templates" />
</antcall>
+ <antcall target="mac-copy-dir">
+ <param name="srcdir" value="templates/extensions" />
+ <param name="destdir" value="${FLEX_HOME}/templates" />
+ </antcall>
+ <antcall target="mac-copy-dir">
+ <param name="srcdir" value="templates/sdk" />
+ <param name="destdir" value="${FLEX_HOME}/templates" />
+ </antcall>
</target>
<target name="mac-copy-file" description="copies a file">
@@ -494,9 +514,15 @@
<mkdir dir="${basedir}/frameworks/libs/"/>
<get src="http://downloads.sourceforge.net/project/osmf.adobe/OSMF%202.0%20Release%20%28final%20source%2C%20ASDocs%2C%20pdf%20guides%20and%20release%20notes%29/OSMF.swc"
- dest="${basedir}/frameworks/libs/OSMF.swc"
+ dest="${basedir}/frameworks/libs/osmf.swc"
verbose="false"/>
+ <unzip src="${basedir}/frameworks/libs/osmf.swc" dest="${download.dir}">
+ <patternset>
+ <include name="library.swf"/>
+ </patternset>
+ </unzip>
+ <copy file="${download.dir}/library.swf" tofile="${FLEX_HOME}/frameworks/rsls/osmf_${flex-sdk-description.version}.${flex-sdk-description.build}.swf" />
</target>
<!-- fontswf -->
[4/9] git commit: [flex-sdk] [refs/heads/release4.12.0] - fixed
incorrect references to FlexJS in license text
Posted by ah...@apache.org.
fixed incorrect references to FlexJS in license text
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/8350eb58
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/8350eb58
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/8350eb58
Branch: refs/heads/release4.12.0
Commit: 8350eb580f5cd3d98ba99704ccf9de8351dfe7c3
Parents: 20cd5fb
Author: Justin Mclean <jm...@apache.org>
Authored: Mon May 5 10:03:43 2014 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon May 5 10:03:43 2014 +1000
----------------------------------------------------------------------
installer.properties/de_DE.properties | 6 +++---
installer.properties/el_GR.properties | 6 +++---
installer.properties/en_US.properties | 6 +++---
installer.properties/es_ES.properties | 6 +++---
installer.properties/fr_FR.properties | 6 +++---
installer.properties/ko_KR.properties | 6 +++---
installer.properties/nl_NL.properties | 6 +++---
installer.properties/pt_BR.properties | 6 +++---
8 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/8350eb58/installer.properties/de_DE.properties
----------------------------------------------------------------------
diff --git a/installer.properties/de_DE.properties b/installer.properties/de_DE.properties
index f1f97aa..004ddd9 100644
--- a/installer.properties/de_DE.properties
+++ b/installer.properties/de_DE.properties
@@ -23,7 +23,7 @@ yes=j
no=n
flash.prompt.text=\
-Apache FlexJS uses the Adobe Flash Player's playerglobal.swc to build Adobe Flash applications.\n\
+Apache Flex SDK uses the Adobe Flash Player's playerglobal.swc to build Adobe Flash applications.\n\
\n\
Die Adobe Flash Player playerglobal.swc verwendet die Adobe SDK Lizenzvereinbarung.\n\
http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf,\n\
@@ -39,7 +39,7 @@ Möchten SIe jetzt die Adobe Flash Player playerglobal.swc installieren?
air.prompt.text=\
-Apache FlexJS uses the Adobe AIR SDK to build Adobe AIR applications.\n\
+Apache Flex SDK uses the Adobe AIR SDK to build Adobe AIR applications.\n\
Das Adobe AIR SDK verwendet die Adobe SDK Lizenzvereinbarung.\n\
http://www.adobe.com/products/air/sdk-eula.html.\n\
Diese Lizenz ist nicht mit der Apache V2 Lizenz vereinbar.\n\
@@ -60,7 +60,7 @@ you agree to the terms and conditions of the applicable license agreement.\n\
I have read the MPL1.1 license information above?"
swfobject.prompt.text=\
-Apache FlexJS uses SWFObject when building Adobe Flash applications.\n\
+Apache Flex SDK uses SWFObject when building Adobe Flash applications.\n\
Das SWFObject utility verwendet die MIT License (MIT).\n\
http://opensource.org/licenses/mit-license.php.\n\
Diese Lizenz ist mit der Apache V2 Lizenz vereinbar.\n\
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/8350eb58/installer.properties/el_GR.properties
----------------------------------------------------------------------
diff --git a/installer.properties/el_GR.properties b/installer.properties/el_GR.properties
index 2ec2130..9b72a97 100644
--- a/installer.properties/el_GR.properties
+++ b/installer.properties/el_GR.properties
@@ -23,7 +23,7 @@ yes=y
no=n
flash.prompt.text=\
-Apache FlexJS uses the Adobe Flash Player's playerglobal.swc to build Adobe Flash applications.\n\
+Apache Flex SDK uses the Adobe Flash Player's playerglobal.swc to build Adobe Flash applications.\n\
\n\
Για το Adobe Flash Player playerglobal.swc ισχύει η\n\
συμφωνία χρήσης του Adobe SDK License.\n\
@@ -39,7 +39,7 @@ Adobe recommends that you review these third-party terms.\n\
Θέλετε να εγκαταστήσετε το Adobe Flash Player playerglobal.swc;
air.prompt.text=\
-Apache FlexJS uses the Adobe AIR SDK to build Adobe AIR applications.\n\
+Apache Flex SDK uses the Adobe AIR SDK to build Adobe AIR applications.\n\
Για το Adobe AIR SDK ισχύει η συμφωνία χρήσης του Adobe SDK License.\n\
http://www.adobe.com/products/air/sdk-eula.html.\n\
Η άδεια αυτή δεν είναι συμβατή με την άδεια χρήσης Apache V2.\n\
@@ -60,7 +60,7 @@ you agree to the terms and conditions of the applicable license agreement.\n\
I have read the MPL1.1 license information above?"
swfobject.prompt.text=\
-Apache FlexJS uses the SWFObject when building Adobe Flash applications.\n\
+Apache Flex SDK uses the SWFObject when building Adobe Flash applications.\n\
Για το SWFObject ισχύει η συμφωνία χρήσης του MIT License (MIT).\n\
http://opensource.org/licenses/mit-license.php.\n\
This license is compatible with the Apache v2 license.\n\
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/8350eb58/installer.properties/en_US.properties
----------------------------------------------------------------------
diff --git a/installer.properties/en_US.properties b/installer.properties/en_US.properties
index 0a3bb39..60a6bad 100644
--- a/installer.properties/en_US.properties
+++ b/installer.properties/en_US.properties
@@ -23,7 +23,7 @@ yes=y
no=n
flash.prompt.text=\
-Apache FlexJS uses the Adobe Flash Player's playerglobal.swc to build Adobe Flash applications.\n\
+Apache Flex SDK uses the Adobe Flash Player's playerglobal.swc to build Adobe Flash applications.\n\
\n\
The playerglobal.swc file is subject to and governed by the\n\
Adobe Flex SDK License Agreement specified here:\n\
@@ -39,7 +39,7 @@ This license is not compatible with the Apache v2 license.\n\
Do you want to download and install the playerglobal.swc?
air.prompt.text=\
-Apache FlexJS uses the Adobe AIR SDK to build Adobe AIR applications.\n\
+Apache Flex SDK uses the Adobe AIR SDK to build Adobe AIR applications.\n\
The Adobe AIR SDK is subject to and governed by the\n\
Adobe AIR SDK License Agreement specified here:\n\
http://www.adobe.com/products/air/sdk-eula.html.\n\
@@ -61,7 +61,7 @@ you agree to the terms and conditions of the applicable license agreement.\n\
I have read the MPL1.1 license information above?"
swfobject.prompt.text=\
-Apache FlexJS uses the SWFObject when building Adobe Flash applications.\n\
+Apache Flex SDK uses the SWFObject when building Adobe Flash applications.\n\
SWFObject is subject to and governed by the\n\
MIT License Agreement specified here:\n\
http://opensource.org/licenses/mit-license.php.\n\
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/8350eb58/installer.properties/es_ES.properties
----------------------------------------------------------------------
diff --git a/installer.properties/es_ES.properties b/installer.properties/es_ES.properties
index 0f4ecd1..6505941 100644
--- a/installer.properties/es_ES.properties
+++ b/installer.properties/es_ES.properties
@@ -23,7 +23,7 @@ yes=s
no=n
flash.prompt.text=\
-Apache FlexJS utiliza el reproductor Flash de Adobe playerglobal.swc, para poder construir aplicaciones Flash.\n\
+Apache Flex SDK utiliza el reproductor Flash de Adobe playerglobal.swc, para poder construir aplicaciones Flash.\n\
\n\
Adobe Flash Player playerglobal.swc se ofrece bajo los términos y condiciones\n\
de la licencia de Adobe SDK, que puede encontrar aqui:\n\
@@ -39,7 +39,7 @@ Esta licencia no es compatible con la licencia Apache V2.\n\
¿Quiere instalar Adobe Flash Player playerglobal.swc?
air.prompt.text=\
-Apache FlexJS utiliza el SDK de Adobe AIR, para poder construir aplicaciones AIR.\n\
+Apache Flex SDK utiliza el SDK de Adobe AIR, para poder construir aplicaciones AIR.\n\
El SDK de Adobe AIR, se ofrece bajo los términos de la licencia de Adobe SDK, que puede encontrar aqui:\n\
http://www.adobe.com/products/air/sdk-eula.html.\n\
Esta licencia no es compatible con la licencia Apache V2.\n\
@@ -60,7 +60,7 @@ estará aceptando los términos y condiciones aplicables, de la correspondiente
¿Ha leido la MPL1.1 y está de acuerdo en instalar Open Source Media Framework (OSMF)?
swfobject.prompt.text=\
-Apache FlexJS utiliza SWFObject cuando construye aplicaciones Adobe Flash.\n\
+Apache Flex SDK utiliza SWFObject cuando construye aplicaciones Adobe Flash.\n\
SWFObject se ofrece bajo licencia MIT (MIT).\n\
http://opensource.org/licenses/mit-license.php.\n\
Esta licencia es compatible con la licencia Apache V2.\n\
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/8350eb58/installer.properties/fr_FR.properties
----------------------------------------------------------------------
diff --git a/installer.properties/fr_FR.properties b/installer.properties/fr_FR.properties
index df186a1..6ccba15 100644
--- a/installer.properties/fr_FR.properties
+++ b/installer.properties/fr_FR.properties
@@ -23,7 +23,7 @@ yes=o
no=n
flash.prompt.text=\
-Apache FlexJS nécessite Adobe Flash Player (playerglobal.swc) pour générer des applications Adobe Flash.\n\
+Apache Flex SDK nécessite Adobe Flash Player (playerglobal.swc) pour générer des applications Adobe Flash.\n\
\n\
Le fichier playerglobal.swc est soumis à l'accord de licence Adobe Flex SDK suivant :\n\
http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf,\n\
@@ -38,7 +38,7 @@ Cette licence n'est pas compatible avec la licence Apache V2.\n\
Voulez-vous installer le logiciel Adobe Flash Player playerglobal.swc?
air.prompt.text=\
-Apache FlexJS nécessite Adobe AIR SDK pour générer des applications Adobe AIR.\n\
+Apache Flex SDK nécessite Adobe AIR SDK pour générer des applications Adobe AIR.\n\
L'accord de licence SDK Adobe s'applique à Adobe AIR SDK.\n\
http://www.adobe.com/products/air/sdk-eula.html.\n\
Cette licence n'est pas incluse dans la licence Apache V2.\n\
@@ -59,7 +59,7 @@ avant de télécharger, modifier, distribuer, utiliser et/ou accéder à ces fic
J'ai bien lu les informations ci-dessus à propos de la licence MPL1.1 ?"
swfobject.prompt.text=\
-Apache FlexJS nécessite SWFObject pour générer des applications Adobe Flash.\n\
+Apache Flex SDK nécessite SWFObject pour générer des applications Adobe Flash.\n\
La licence MIT (MIT) s'applique à l'utilitaire SWFObject.\n\
http://opensource.org/licenses/mit-license.php.\n\
Cette licence n'est pas incluse dans la licence Apache V2.\n\
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/8350eb58/installer.properties/ko_KR.properties
----------------------------------------------------------------------
diff --git a/installer.properties/ko_KR.properties b/installer.properties/ko_KR.properties
index 7c7efdd..d784fcf 100644
--- a/installer.properties/ko_KR.properties
+++ b/installer.properties/ko_KR.properties
@@ -23,7 +23,7 @@ yes=y
no=n
flash.prompt.text=\
-Apache FlexJS는 플래시 어플리케이션을 빌드 하기위해 Adobe Flash Player's playerglobal.swc를 사용합니다.\n\
+Apache Flex SDK는 플래시 어플리케이션을 빌드 하기위해 Adobe Flash Player's playerglobal.swc를 사용합니다.\n\
\n\
playerglobal.swc 파일은 다음에 명시된 Adobe Flex SDK 라이센스 계약에 적용되어 있습니다:\n\
http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf,\n\
@@ -38,7 +38,7 @@ Adobe에서는 당신이 서브파티 약관을 살펴보는 것을 추천합니
playerglobal.swc를 다운로드 하고 설치하시겠습니까?
air.prompt.text=\
-Apache FlexJS는 Adobe AIR 어플리케이션을 빌드 하기위해 Adobe AIR SDK를 사용합니다.\n\
+Apache Flex SDK는 Adobe AIR 어플리케이션을 빌드 하기위해 Adobe AIR SDK를 사용합니다.\n\
Adobe AIR SDK 파일은 다음에 명시된 Adobe AIR SDK 라이센스 계약에 적용되어 있습니다:\n\
http://www.adobe.com/products/air/sdk-eula.html.\n\
이 라이센스는 Apache v2 라이센스와 호환되지 않습니다.\n\
@@ -60,7 +60,7 @@ http://www.mozilla.org/MPL/. \n\
나는 MPL1.1 라이센스 안내를 읽었습니까?"
swfobject.prompt.text=\
-Apache FlexJS에서는 Adobe 플래시 어플리케이션을 빌드할 때 SWFObject를 사용합니다.\n\
+Apache Flex SDK에서는 Adobe 플래시 어플리케이션을 빌드할 때 SWFObject를 사용합니다.\n\
SWFObject 유틸리티에는 다음에 명시된\n\
MIT License 라이센스 계약에 적용되어 있습니다:\n\
http://opensource.org/licenses/mit-license.php.\n\
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/8350eb58/installer.properties/nl_NL.properties
----------------------------------------------------------------------
diff --git a/installer.properties/nl_NL.properties b/installer.properties/nl_NL.properties
index 18342fc..f923c80 100644
--- a/installer.properties/nl_NL.properties
+++ b/installer.properties/nl_NL.properties
@@ -23,7 +23,7 @@ yes=j
no=n
flash.prompt.text=\
-Apache FlexJS gebruikt Adobe Flash Player's playerglobal.swc om Adobe Flash applicaties te maken.\n\
+Apache Flex SDK gebruikt Adobe Flash Player's playerglobal.swc om Adobe Flash applicaties te maken.\n\
\n\
De Adobe SDK licentie overeenkomst geldt voor Adobe Flash Player's playerglobal.swc.\n\
http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf,\n\
@@ -38,7 +38,7 @@ Deze licentie is niet compatibel met de Apache V2 licentie.\n\
Wilt u de Adobe Flash Player playerglobal.swc installeren?
air.prompt.text=\
-Apache FlexJS gebruikt de Adobe AIR SDK om Adobe AIR applicaties te maken.\n\
+Apache Flex SDK gebruikt de Adobe AIR SDK om Adobe AIR applicaties te maken.\n\
De Adobe SDK licentie overeenkomst geldt voor de Adobe AIR SDK.\n\
http://www.adobe.com/products/air/sdk-eula.html.\n\
Deze licentie is niet compatibel met de Apache V2 licentie.\n\
@@ -60,7 +60,7 @@ gaat u akkoord met de voorwaarden van de toepasselijke gebruikersovereenkomst.\n
Wilt u het OSMF installeren?
swfobject.prompt.text=\
-Apache FlexJS gebruikt de SWFObject utility om Adobe Flash applicaties te maken.\n\
+Apache Flex SDK gebruikt de SWFObject utility om Adobe Flash applicaties te maken.\n\
De MIT License (MIT) geldt voor de SWFObject utility.\n\
\n\
U kunt de MIT licentieovereenkomst hier vinden:\n\
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/8350eb58/installer.properties/pt_BR.properties
----------------------------------------------------------------------
diff --git a/installer.properties/pt_BR.properties b/installer.properties/pt_BR.properties
index 8e983fb..aa4a593 100644
--- a/installer.properties/pt_BR.properties
+++ b/installer.properties/pt_BR.properties
@@ -23,7 +23,7 @@ yes=s
no=n
flash.prompt.text=\
-Apache FlexJS uses the Adobe Flash Player's playerglobal.swc to build Adobe Flash applications.\n\
+Apache Flex SDK uses the Adobe Flash Player's playerglobal.swc to build Adobe Flash applications.\n\
\n\
The playerglobal.swc file is subject to and governed by the\n\
Adobe Flex SDK License Agreement specified here:\n\
@@ -39,7 +39,7 @@ This license is not compatible with the Apache v2 license.\n\
Do you want to download and install the playerglobal.swc?
air.prompt.text=\
-Apache FlexJS uses the Adobe AIR SDK to build Adobe AIR applications.\n\
+Apache Flex SDK uses the Adobe AIR SDK to build Adobe AIR applications.\n\
The Adobe AIR SDK is subject to and governed by the\n\
Adobe AIR SDK License Agreement specified here:\n\
http://www.adobe.com/products/air/sdk-eula.html.\n\
@@ -61,7 +61,7 @@ you agree to the terms and conditions of the applicable license agreement.\n\
I have read the MPL1.1 license information above?"
swfobject.prompt.text=\
-Apache FlexJS uses the SWFObject when building Adobe Flash applications.\n\
+Apache Flex SDK uses the SWFObject when building Adobe Flash applications.\n\
SWFObject is subject to and governed by the\n\
MIT License Agreement specified here:\n\
http://opensource.org/licenses/mit-license.php.\n\
[9/9] git commit: [flex-sdk] [refs/heads/release4.12.0] - more use
tofile instead of todir
Posted by ah...@apache.org.
more use tofile instead of todir
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/6fc0cfaa
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/6fc0cfaa
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/6fc0cfaa
Branch: refs/heads/release4.12.0
Commit: 6fc0cfaa4c477ac16f32418f4e611b9ba6a8348a
Parents: 6553ec9
Author: Alex Harui <ah...@apache.org>
Authored: Tue May 6 14:24:39 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue May 6 14:24:39 2014 -0700
----------------------------------------------------------------------
installer.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/6fc0cfaa/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 5929ac5..32bfa7a 100644
--- a/installer.xml
+++ b/installer.xml
@@ -638,9 +638,9 @@
<replacefilter token="{airHome}/frameworks/libs"
value="libs"/>
</replace>
- <copy file="${FLEX_HOME}/frameworks/flex-config.xml" todir="${FLEX_HOME}/ide/flashbuilder/config" overwrite="true" />
- <copy file="${FLEX_HOME}/frameworks/air-config.xml" todir="${FLEX_HOME}/ide/flashbuilder/config" overwrite="true" />
- <copy file="${FLEX_HOME}/frameworks/airmobile-config.xml" todir="${FLEX_HOME}/ide/flashbuilder/config" overwrite="true" />
+ <copy file="${FLEX_HOME}/frameworks/flex-config.xml" tofile="${FLEX_HOME}/ide/flashbuilder/config/flex-config.xml" overwrite="true" />
+ <copy file="${FLEX_HOME}/frameworks/air-config.xml" tofile="${FLEX_HOME}/ide/flashbuilder/config/air-config.xml" overwrite="true" />
+ <copy file="${FLEX_HOME}/frameworks/airmobile-config.xml" tofile="${FLEX_HOME}/ide/flashbuilder/config/airmobile-config.xml" overwrite="true" />
</target>
<target name="fixup-config-files-version" if="flash.version.changed">
[6/9] git commit: [flex-sdk] [refs/heads/release4.12.0] - more
installer fixes. swfobject now goes in the right javascript folder,
pick up default player and air versions from sdk-installer-config-4.0.xml
Posted by ah...@apache.org.
more installer fixes. swfobject now goes in the right javascript folder, pick up default player and air versions from sdk-installer-config-4.0.xml
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/82dcfdee
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/82dcfdee
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/82dcfdee
Branch: refs/heads/release4.12.0
Commit: 82dcfdee74d4d27bc48ee6a7bb573f0fdc8ca329
Parents: 5fe5608
Author: Alex Harui <ah...@apache.org>
Authored: Sun May 4 22:30:06 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sun May 4 22:30:06 2014 -0700
----------------------------------------------------------------------
installer.xml | 39 +++++++++++++++++++++++++--------------
1 file changed, 25 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/82dcfdee/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 98c341d..2b86c5c 100644
--- a/installer.xml
+++ b/installer.xml
@@ -43,9 +43,6 @@
<property file="${FLEX_HOME}/installer.properties/en_US.properties"/>
<property name="download.dir" value="${FLEX_HOME}/in"/>
- <property name="air.sdk.version" value="13.0"/>
- <property name="flash.sdk.version" value="13.0"/>
-
<property name="xml.properties" value="http://flex.apache.org/installer/sdk-installer-config-4.0.xml" />
<condition property="platform" value="mac">
@@ -91,17 +88,6 @@
<isset property="installer" />
</condition>
- <condition property="flash.version.changed" value="true">
- <not>
- <equals arg1="${playerglobal.version}" arg2="${flash.sdk.version}" />
- </not>
- </condition>
- <condition property="air.version.changed" value="true">
- <not>
- <equals arg1="${air.version}" arg2="${air.sdk.version}" />
- </not>
- </condition>
-
<condition property="java.home" value="${env.JAVA_HOME}">
<and>
<available file="${env.JAVA_HOME}" type="dir" />
@@ -116,6 +102,26 @@
<get src="${xml.properties}" dest="${basedir}/sdk-installer-config-4.0.xml" />
<xmlproperty file="${basedir}/sdk-installer-config-4.0.xml" semanticAttributes="true" collapseAttributes="true"/>
<xmlproperty file="${basedir}/flex-sdk-description.xml" semanticAttributes="true" collapseAttributes="true"/>
+ <condition property="air.sdk.version" value="${config.airsdk.linux.versions.default}">
+ <equals arg1="${platform}" arg2="linux" />
+ </condition>
+ <condition property="air.sdk.version" value="${config.airsdk.windows.versions.default}">
+ <equals arg1="${platform}" arg2="windows" />
+ </condition>
+ <condition property="air.sdk.version" value="${config.airsdk.mac.versions.default}">
+ <equals arg1="${platform}" arg2="mac" />
+ </condition>
+ <property name="flash.sdk.version" value="${config.flashsdk.versions.default}"/>
+ <condition property="flash.version.changed" value="true">
+ <not>
+ <equals arg1="${playerglobal.version}" arg2="${flash.sdk.version}" />
+ </not>
+ </condition>
+ <condition property="air.version.changed" value="true">
+ <not>
+ <equals arg1="${air.version}" arg2="${air.sdk.version}" />
+ </not>
+ </condition>
<property name="air.sdk.url.path.ref" value="air.sdk.path.${platform}.${air.sdk.version}" />
<property name="air.sdk.url.path" refid="${air.sdk.url.path.ref}" />
<property name="air.sdk.url.file.ref" value="air.sdk.file.${platform}.${air.sdk.version}" />
@@ -494,6 +500,8 @@
<include name="swfobject/swfobject.js"/>
</patternset>
</unzip>
+ <mkdir dir="${FLEX_HOME}/frameworks/javascript/fabridge/samples/fabridge/swfobject" />
+ <copy file="${FLEX_HOME}/templates/swfobject/swfobject.js" todir="${FLEX_HOME}/frameworks/javascript/fabridge/samples/fabridge/swfobject" />
</target>
<!-- osmf (Version 2.0) -->
@@ -630,6 +638,9 @@
<replacefilter token="{airHome}/frameworks/libs"
value="libs"/>
</replace>
+ <copy file="${FLEX_HOME}/frameworks/flex-config.xml" todir="${FLEX_HOME}/ide/flashbuilder/config" overwrite="true" />
+ <copy file="${FLEX_HOME}/frameworks/air-config.xml" todir="${FLEX_HOME}/ide/flashbuilder/config" overwrite="true" />
+ <copy file="${FLEX_HOME}/frameworks/airmobile-config.xml" todir="${FLEX_HOME}/ide/flashbuilder/config" overwrite="true" />
</target>
<target name="fixup-config-files-version" if="flash.version.changed">
[8/9] git commit: [flex-sdk] [refs/heads/release4.12.0] - use tofile
instead of todir
Posted by ah...@apache.org.
use tofile instead of todir
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/6553ec9e
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/6553ec9e
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/6553ec9e
Branch: refs/heads/release4.12.0
Commit: 6553ec9e0d31fb340dc8ce8401054947349a990f
Parents: 6f4c21e
Author: Alex Harui <ah...@apache.org>
Authored: Tue May 6 12:00:53 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue May 6 12:00:53 2014 -0700
----------------------------------------------------------------------
installer.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/6553ec9e/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 2b86c5c..5929ac5 100644
--- a/installer.xml
+++ b/installer.xml
@@ -501,7 +501,7 @@
</patternset>
</unzip>
<mkdir dir="${FLEX_HOME}/frameworks/javascript/fabridge/samples/fabridge/swfobject" />
- <copy file="${FLEX_HOME}/templates/swfobject/swfobject.js" todir="${FLEX_HOME}/frameworks/javascript/fabridge/samples/fabridge/swfobject" />
+ <copy file="${FLEX_HOME}/templates/swfobject/swfobject.js" tofile="${FLEX_HOME}/frameworks/javascript/fabridge/samples/fabridge/swfobject/swfobject.js" />
</target>
<!-- osmf (Version 2.0) -->