flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [41/50] git commit: [flex-sdk] [refs/heads/master] - switch to 4.12.1
Date Sat, 03 May 2014 14:34:55 GMT
switch to 4.12.1


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/f3bcf014
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/f3bcf014
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/f3bcf014

Branch: refs/heads/master
Commit: f3bcf01420dc3ae3b84a996b9bbd0487a0f20466
Parents: 495fb30
Author: Alex Harui <aharui@apache.org>
Authored: Thu Apr 24 21:19:12 2014 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Thu Apr 24 21:19:12 2014 -0700

----------------------------------------------------------------------
 README                                                       | 8 ++++----
 build.properties                                             | 4 ++--
 frameworks/projects/framework/src/mx/core/FlexVersion.as     | 2 +-
 .../src/java/flex2/compiler/common/MxmlConfiguration.java    | 5 +++--
 modules/compiler/src/java/flex2/tools/VersionInfo.java       | 2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f3bcf014/README
----------------------------------------------------------------------
diff --git a/README b/README
index 182b461..ab764fd 100644
--- a/README
+++ b/README
@@ -4,7 +4,7 @@ Apache Flex (Flex)
     Apache Flex SDK is an application development framework for easily building
     Flash-based applications for mobile devices, web browsers, and desktops.
 
-    Apache Flex 4.12 is a follow up release to Apache Flex 4.11. This version
+    Apache Flex 4.12.1 is a follow up release to Apache Flex 4.12.0. This version
     adds new features and implements bug fixes that were unavailable in previous
     versions.  It is compatible with most code written to target Adobe Flex 4.6.
 
@@ -90,7 +90,7 @@ Getting the latest sources via git
 
     For further information visit http://flex.apache.org/download-source.html
 
-Building Apache Flex 4.12
+Building Apache Flex 4.12.1
 =========================
 
     Apache Flex is a large project. It requires some build tools which must be
@@ -490,7 +490,7 @@ Using the Binary Distribution
 		/ide/constructFlexForIDE.sh (on Mac and Linux)
 		/ide/constructFlexForIDE.bat (on Windows)
 
-	This will create an Apache Flex 4.12 SDK that can be used with Flash
+	This will create an Apache Flex 4.12.1 SDK that can be used with Flash
         Builder by copying the required files from the Adobe Flex 4.6 SDK.
 
 	To create an SDK for other IDE or if you want to use Adobe AIR 4.0
@@ -499,7 +499,7 @@ Using the Binary Distribution
 		/ide/flashbuilder/makeApacheFlexForIDE.sh (on Mac and Linux)
 		/ide/flashbuilder/makeApacheFlexForIDE.bat (on Windows)
 
-	This will create an Apache Flex 4.12 SDK that can be used by an IDE by
+	This will create an Apache Flex 4.12.1 SDK that can be used by an IDE by
         downloading Adobe Flex 4.6 SDK and Adobe AIR 4.0.
 
 Building the Framework in a Binary Distribution

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f3bcf014/build.properties
----------------------------------------------------------------------
diff --git a/build.properties b/build.properties
index 59977fb..6c22e48 100644
--- a/build.properties
+++ b/build.properties
@@ -18,8 +18,8 @@
 ################################################################################
 
 # flex-sdk-description values
-release = Apache Flex 4.13.0
-release.version = 4.13.0
+release = Apache Flex 4.12.1
+release.version = 4.12.1
 
 # 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/f3bcf014/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 41c63fc..31732fa 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 = 0x040D0000;
+    public static const CURRENT_VERSION:uint = 0x040C0000;
 	
 	/** 
 	 *  The <code>compatibilityVersion</code> value of Flex 4.13,

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f3bcf014/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 d496c32..4ce326b 100644
--- a/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java
+++ b/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java
@@ -49,6 +49,7 @@ public class MxmlConfiguration
     // 'compiler.mxml.compatibility-version' option
     //
 	public static final int VERSION_4_13 = 0x040d0000;
+	public static final int VERSION_4_12_1 = 0x040c0001;
 	public static final int VERSION_4_12 = 0x040c0000;
 	public static final int VERSION_4_11 = 0x040b0000;
 	public static final int VERSION_4_10 = 0x040a0000;
@@ -61,10 +62,10 @@ 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_13;
+    public static final int CURRENT_VERSION = VERSION_4_12_1;
     public static final int EARLIEST_MAJOR_VERSION = 3;
     public static final int LATEST_MAJOR_VERSION = 4;
-    public static final int LATEST_MINOR_VERSION = 13;
+    public static final int LATEST_MINOR_VERSION = 12;
 
 	private int major = LATEST_MAJOR_VERSION;
 	private int minor = LATEST_MINOR_VERSION;

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f3bcf014/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 09a9974..0574f50 100644
--- a/modules/compiler/src/java/flex2/tools/VersionInfo.java
+++ b/modules/compiler/src/java/flex2/tools/VersionInfo.java
@@ -33,7 +33,7 @@ public class VersionInfo
 {
     public static String FLEX_MAJOR_VERSION = "4";
     public static String FLEX_MINOR_VERSION = "12";
-    public static String FLEX_NANO_VERSION  = "0";
+    public static String FLEX_NANO_VERSION  = "1";
     
 	/**
 	 * Lib version is the "version" of the SWC format. Major number changes represent big (although
not


Mime
View raw message