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/08/12 22:09:38 UTC

[1/2] git commit: [flex-sdk] [refs/heads/develop] - ant script to generate release candidates for the sdk

Repository: flex-sdk
Updated Branches:
  refs/heads/develop af1749fa4 -> 96c064e6b


ant script to generate release candidates for the sdk


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

Branch: refs/heads/develop
Commit: b88b3452a1029b7966d1f91f9f0b4942423ac529
Parents: af1749f
Author: Alex Harui <ah...@apache.org>
Authored: Tue Aug 12 12:52:05 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Aug 12 12:52:05 2014 -0700

----------------------------------------------------------------------
 releasecandidate.xml | 463 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 463 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b88b3452/releasecandidate.xml
----------------------------------------------------------------------
diff --git a/releasecandidate.xml b/releasecandidate.xml
new file mode 100644
index 0000000..10ac156
--- /dev/null
+++ b/releasecandidate.xml
@@ -0,0 +1,463 @@
+<?xml version="1.0"?>
+<!--
+
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+-->
+
+<project name="CreateFlexSDKReleaseCandidate" default="main" basedir=".">
+
+
+    <!-- Required for OSX 10.6 / Snow Leopard Performance. -->
+    <!-- Java 7 on Mac requires OSX 10.7.3 or higher and is 64-bit only -->
+    <!-- local.d32 is set/used in build.properties so this needs to be done first. -->
+    <condition property="local.d32" value="-d32">
+        <and>
+            <os family="windows"/>
+            <equals arg1="${sun.arch.data.model}" arg2="64"/>
+            <equals arg1="${os.arch}" arg2="x86_64"/>
+            <equals arg1="${ant.java.version}" arg2="1.6"/>
+        </and>
+    </condition>
+
+    <condition property="isMac" value="mac">
+        <os family="mac" />
+    </condition>
+    <condition property="isWindows" value="windows">
+        <os family="windows" />
+    </condition>
+    <condition property="isLinux" value="linux">
+		<and>
+			<os family="unix" />
+			<not>
+				<isset property="isMac" />
+			</not>
+		</and>
+    </condition>
+	
+	<property name="rat.report" value="${basedir}/rat-report.txt"/>
+	<property name="apache.rat.jar" value="apache-rat-0.8.jar" />
+	<property name="apache.rat.tasks.jar" value="apache-rat-tasks-0.8.jar" />
+	<property name="apache.rat.url" value="http://people.apache.org/~aharui/rat" />
+    
+	<property file="${basedir}/local.properties" />
+	<property file="${basedir}/build.properties" />
+	   
+    <property environment="env"/>
+    
+	<condition property="do.copy.downloads" >
+		<isset property="download.cache.dir" /> 
+	</condition>
+	
+    <condition property="CRLF" value="%0D%0A">
+        <isset property="isWindows" />
+    </condition>
+    <property name="CRLF" value="%0A" />
+    
+    <fail message="The my.name property is not set to the RM's name"
+    unless="my.name"/>
+    
+    <fail message="The ANT_HOME environment variable is not set."
+        unless="env.ANT_HOME"/>
+		
+	<available file="${svn.dist.dev}"
+		type="dir" 
+		property="dist.dev" value="${svn.dist.dev}" />
+    
+	<fail message="The svn.dist.dev property is not set to the working copy for https://dist.apache.org/repos/dist/dev."
+        unless="dist.dev"/>
+				
+	<available file="${svn.site}"
+		type="dir" 
+		property="site" value="${svn.site}" />
+    
+	<fail message="The svn.site property is not set to the working copy for https://flex.apache.org."
+        unless="site"/>
+				
+	<available file="${env.AIR_HOME}"
+		type="dir" 
+		property="AIR_HOME" value="${env.AIR_HOME}" />
+
+    <fail message="The AIR_HOME property is not set in environment or command-line."
+        unless="AIR_HOME"/>
+		
+    <available file="${env.PLAYERGLOBAL_HOME}"
+        type="dir"
+        property="PLAYERGLOBAL_HOME" value="${env.PLAYERGLOBAL_HOME}" />
+    
+    <fail message="The PLAYERGLOBAL_HOME property is not set in environment or command-line."
+        unless="PLAYERGLOBAL_HOME"/>
+    
+    <available file="${env.FLASHPLAYER_DEBUGGER}"
+        type="dir"
+        property="FLASHPLAYER_DEBUGGER" value="${env.FLASHPLAYER_DEBUGGER}" />
+    
+    <available file="${env.FLASHPLAYER_DEBUGGER}"
+        type="file"
+        property="FLASHPLAYER_DEBUGGER" value="${env.FLASHPLAYER_DEBUGGER}" />
+    
+    <fail message="The FLASHPLAYER_DEBUGGER property is not set in environment or command-line."
+        unless="FLASHPLAYER_DEBUGGER"/>
+        
+    <available file="${env.ProgramFiles}/Mozilla Firefox/firefox.exe"
+		type="file"
+		property="browser" value="${env.ProgramFiles}/Mozilla Firefox/firefox.exe" />
+    <available file="${env.ProgramFiles(x86)}/Mozilla Firefox/firefox.exe"
+		type="file"
+		property="browser" value="${env.ProgramFiles}/Mozilla Firefox/firefox.exe" />
+    <available file="/Applications/Firefox.app/Contents/MacOS/firefox"
+		type="file"
+		property="browser" value="/Applications/Firefox.app/Contents/MacOS/firefox" />
+        
+    <available file="${env.ANT_HOME}/lib/${apache.rat.jar}"
+        type="file"
+        property="apache.rat.found"/>
+    <available file="${env.ANT_HOME}/lib/${apache.rat.tasks.jar}"
+        type="file"
+        property="apache.rat.tasks.found"/>
+		
+    <fail message="Could not locate Firefox.  Please specify a browser with
+    -Dbrowser=&lt;path-to-browser&gt;"
+        unless="browser"/>
+        
+    <available file="${env.ProgramFiles}/SlikSVN/bin/svn.exe"
+		type="file"
+		property="svn" value="${env.ProgramFiles}/SlikSVN/bin/svn.exe" />
+    <available file="${env.ProgramFiles(x86)}/SlikSVN/bin/svn.exe"
+		type="file"
+		property="svn" value="${env.ProgramFiles}/SlikSVN/bin/svn.exe" />
+    <available file="/opt/subversion/bin/svn"
+		type="file"
+		property="svn" value="/opt/subversion/bin/svn" />
+    <fail message="Could not locate SVN command-line.  Please specify the path to SVN with
+    -Dsvn=&lt;path-to-svn&gt;"
+        unless="svn"/>
+                
+    <available file="${env.ProgramFiles}/Git/bin/git.exe"
+		type="file"
+		property="git" value="${env.ProgramFiles}/Git/bin/git.exe" />
+    <available file="${env.ProgramFiles(x86)}/Git/bin/git.exe"
+		type="file"
+		property="git" value="${env.ProgramFiles}/Git/bin/git.exe" />
+    <available file="/usr/local/git/bin/git"
+		type="file"
+		property="git" value="/usr/local/git/bin/git" />
+    <fail message="Could not locate Git command-line.  Please specify the path to Git with
+    -Dgit=&lt;path-to-git&gt;"
+        unless="git"/>
+        
+    <available file="${env.ANT_HOME}/lib/${apache.rat.jar}"
+        type="file"
+        property="apache.rat.found"/>
+    <available file="${env.ANT_HOME}/lib/${apache.rat.tasks.jar}"
+        type="file"
+        property="apache.rat.tasks.found"/>
+		
+    <fail message="Could not locate Firefox.  Please specify a browser with
+    -Dbrowser=&lt;path-to-browser&gt;"
+        unless="browser"/>
+    <fail message="The release candidate number is not set.  Specify -Drc=&lt;rc number (e.g. 1, 2, 3, etc)&gt;"
+    unless="rc"/>
+	
+	<xmlproperty file="${site}/trunk/content/installer/sdk-installer-config-4.0.xml" semanticAttributes="true" collapseAttributes="true"/>
+	<property name="release.installer" value="${config.version.latest}" />
+	<!-- clip build number from version -->
+	<echo file="${basedir}/installerv.properties">latest.installer=${release.installer}</echo>
+	<replaceregexp byline="true">
+		<regexp pattern="\.[0-9]*$"/>
+		<substitution expression=""/>
+		<fileset dir="${basedir}">
+			<include name="installerv.properties"/>
+		</fileset>
+	</replaceregexp>
+	<property file="installerv.properties" />
+	<echo>latest installer is ${latest.installer}</echo>
+	<delete file="installerv.properties" />
+	
+	<target name="install-rat" depends="install-rat.jar,install-rat.tasks.jar" />
+	<target name="install-rat.jar" unless="apache.rat.found">
+		<get src="${apache.rat.url}/${apache.rat.jar}" dest="${env.ANT_HOME}/lib/${apache.rat.jar}" />
+	</target>
+	<target name="install-rat.tasks.jar" unless="apache.rat.tasks.found">
+		<get src="${apache.rat.url}/${apache.rat.tasks.jar}" dest="${env.ANT_HOME}/lib/${apache.rat.tasks.jar}" />
+	</target>
+	
+    <target name="rat-taskdef" description="Rat taskdef">
+        <typedef resource="org/apache/rat/anttasks/antlib.xml"
+        uri="antlib:org.apache.rat.anttasks"
+        classpathref="anttask.classpath"/>
+    </target>
+
+    <target name="main" depends="install-rat,credentials" description="Perform required release approval steps">
+		<antcall target="check-new-version" />
+		<exec executable="${git}" dir="${basedir}" failonerror="true" >
+			<arg value="pull" />
+			<arg value="--rebase" />
+		</exec>
+		<antcall target="stage.rc" />
+		<antcall target="push.rc" />
+	</target>
+	
+	<target name="stage.rc" >
+		<ant antfile="build.xml" target="release" />
+		<ant antfile="build.xml" target="asdoc-package" />
+		<ant antfile="build.xml" target="create-md5" />
+		<ant antfile="build.xml" target="sign" />
+		<ant antfile="build.xml" target="doc-create-md5" />
+		<ant antfile="build.xml" target="doc-sign" />
+		<mkdir dir="${dist.dev}/flex/sdk/${release.version}/rc${rc}/binaries" />
+		<mkdir dir="${dist.dev}/flex/sdk/${release.version}/rc${rc}/doc" />
+		<copy todir="${dist.dev}/flex/sdk/${release.version}/rc${rc}" >
+			<fileset dir="${basedir}/out" >
+				<include name="apache-flex-sdk-${release.version}-src*" />
+			</fileset>
+		</copy>
+		<copy todir="${dist.dev}/flex/sdk/${release.version}/rc${rc}/binaries" >
+			<fileset dir="${basedir}/out" >
+				<include name="apache-flex-sdk-${release.version}-bin*" />
+			</fileset>
+		</copy>
+		<copy todir="${dist.dev}/flex/sdk/${release.version}/rc${rc}/doc" >
+			<fileset dir="${basedir}/out" >
+				<include name="apache-flex-sdk-${release.version}-asdoc*" />
+			</fileset>
+		</copy>
+		<copy file="${basedir}/README" tofile="${dist.dev}/flex/sdk/${release.version}/rc${rc}/READme" />
+		<copy file="${basedir}/ApproveSDK.xml" tofile="${dist.dev}/flex/sdk/${release.version}/rc${rc}/ApproveSDK.xml" />
+		<copy file="${basedir}/apache-flex-sdk-installer-config.xml" tofile="${dist.dev}/flex/sdk/${release.version}/rc${rc}/binaries/apache-flex-sdk-installer-config.xml" />
+	</target>
+	
+	<target name="push.rc" >
+		<exec executable="${svn}" dir="${dist.dev}/flex/sdk" failonerror="true" >
+			<arg value="add" />
+			<arg value="${dist.dev}/flex/sdk/${release.version}/rc${rc}" />
+		</exec>
+		<exec executable="${svn}" dir="${dist.dev}/flex/sdk" failonerror="true" >
+			<arg value="commit" />
+			<arg value="--username" />
+			<arg value="${apache.username}" />
+			<arg value="--password" />
+			<arg value="${apache.password}" />
+			<arg value="-m" />
+			<arg value="rc${rc} of Apache Flex SDK ${release.version}" />
+		</exec>
+		<exec executable="${git}" dir="${basedir}" failonerror="true" >
+			<arg value="tag" />
+			<arg value="-a" />
+			<arg value="apache-flex-sdk-${release.version}-rc${rc}" />
+			<arg value="-m" />
+			<arg value="&quot;rc${rc} of apache-flex-sdk-${release.version}&quot;" />
+		</exec>
+		<exec executable="${git}" dir="${basedir}" failonerror="true" >
+			<arg value="push" />
+			<arg value="--tags" />
+		</exec>
+		<antcall target="update-installer-config" />
+		<antcall target="mail" />
+    </target>
+
+	<target name="credentials" depends="get-username,get-password">
+		<echo>${apache.username}</echo>
+		<echo>${apache.password}</echo>
+	</target>
+	<target name="get-username" unless="apache.username" >
+        <input
+        message="Enter Apache account username:"
+        addproperty="apache.username"/>
+        <condition property="have.username">
+			<not>
+				<equals trim="true" arg1="" arg2="${apache.username}"/>
+			</not>
+        </condition>
+		<fail message="The apache.username property is not set.  It should be the username for Apache SVN and Git."
+			unless="have.username"/>
+	</target>
+	<target name="get-password" unless="apache.password" >
+        <input
+        message="Enter Apache account password:"
+        addproperty="apache.password"/>
+        <condition property="have.password">
+			<not>
+				<equals trim="true" arg1="" arg2="${apache.password}"/>
+			</not>
+        </condition>
+		<fail message="The apache.password property is not set.  It should be the password for Apache SVN and Git."
+			unless="have.password"/>
+	</target>
+	
+	<target name="update-installer-config" >
+		<exec executable="${svn}" dir="${site}" failonerror="true" >
+			<arg value="update" />
+			<arg value="trunk/content/installer/sdk-installer-config-4.0.xml" />
+		</exec>
+        <replaceregexp byline="true">
+            <regexp pattern="rc id=&quot;FlexSDKRC&quot; version=&quot;.*&quot; path=&quot;https://dist.apache.org/repos/dist/dev/flex/sdk/.*/binaries/&quot; file=&quot;apache-flex-sdk-.*-bin&quot; dev=&quot;true&quot;"/>
+            <substitution expression="rc id=&quot;FlexSDKRC&quot; version=&quot;${release.version} RC${rc}&quot; path=&quot;https://dist.apache.org/repos/dist/dev/flex/sdk/${release.version}/rc${rc}/binaries/&quot; file=&quot;apache-flex-sdk-${release.version}-bin&quot; dev=&quot;true&quot;"/>
+            <fileset dir="${site}/trunk/content/installer">
+                <include name="sdk-installer-config-4.0.xml"/>
+            </fileset>
+        </replaceregexp>
+		<!-- un-comment if needed -->
+        <replaceregexp byline="true">
+            <regexp pattern="&lt;!--&lt;rc id=&quot;FlexSDKRC&quot;(.*)&gt;--&gt;"/>
+            <substitution expression="&lt;rc id=&quot;FlexSDKRC&quot;\1&gt;"/>
+            <fileset dir="${site}/trunk/content/installer">
+                <include name="sdk-installer-config-4.0.xml"/>
+            </fileset>
+        </replaceregexp>
+	</target>
+	<target name="temp" >
+		<exec executable="${svn}" dir="${site}" failonerror="true" >
+			<arg value="commit" />
+			<arg value="--username" />
+			<arg value="${apache.username}" />
+			<arg value="--password" />
+			<arg value="${apache.password}" />
+			<arg value="-m" />
+			<arg value="&quot;update sdk-installer-config-4.0 for flex sdk ${release.version} rc${rc}&quot;" />
+		</exec>
+		<!-- pause to give buildbot chance to react -->
+		<sleep seconds="5" />
+		<get src="https://cms.apache.org/flex/publish" username="${apache.username}" password="${apache.password}" dest="${basedir}/getresult.txt" />
+		<delete file="${basedir}/getresult.txt" />
+	</target>
+	
+	<target name="check-new-version" description="check if svn folder needs to be added" >
+		<condition property="version.folder" value="${dist.dev}/flex/sdk/${release.version}" >
+			<not>
+				<available file="${dist.dev}/flex/sdk/${release.version}" />
+			</not>
+		</condition>
+		<antcall target="add-version-folder" />
+	</target>
+    
+	<target name="add-version-folder" description="adds svn folder if needed" if="version.folder" >
+		<mkdir dir="${version.folder}" />
+		<exec executable="${svn}" dir="${dist.dev}/flex/sdk" failonerror="true" >
+			<arg value="add" />
+			<arg value="${version.folder}" />
+		</exec>
+	</target>
+		
+    <target name="mail" >
+        <!-- try to set line breaks before the vertical line            | -->
+        <echo file="${basedir}/discussthread.properties">discuss.thread.body=This is the discussion thread.\n\
+\n\
+Changes in this RC include:\n\
+\n\
+\n\
+Thanks,\n\
+${my.name}
+</echo>
+        <replace file="${basedir}/discussthread.properties">
+            <replacefilter token=" " value="%20" />
+            <replacefilter token="\n" value="${CRLF}" />
+        </replace>
+        <property file="${basedir}/discussthread.properties" />
+
+        <!-- try to set line breaks before the vertical line            | -->
+        <echo file="${basedir}/votethread.properties">vote.thread.body=Hi,\n\
+\n\
+\n\
+This is a Apache Flex SDK ${release.version} release candidate ${rc}.\n\
+Please see the RELEASE_NOTES and the README.\n\
+\n\
+There is a known bug in Adobe Flash Builder 4.6 and 4.7 that causes an issue when creating new applications. Adobe has provided a workaround for FB 4.7 but not for 4.6.\n\
+\n\
+The release candidate can be found here;\n\
+    https://dist.apache.org/repos/dist/dev/flex/sdk/${release.version}/rc${rc}/\n\
+\n\
+The binary distributions as a convenience for the respective platforms, are available here:\n\
+    https://dist.apache.org/repos/dist/dev/flex/sdk/${release.version}/rc${rc}/binaries\n\
+\n\
+\n\
+The most convenient way to use the binary package is to install it via Ant or the Installer. To use an Installer you must use InstallApacheFlex version 3.1 or later.   You can get the latest InstallApacheFlex here:\n\
+    http://www.apache.org/dyn/closer.cgi?path=/flex/installer/${latest.installer}/binaries/\n\
+\n\
+\n\
+Before voting please review the section, 'What are the ASF requirements on approving a release?', at:\n\
+    http://www.apache.org/dev/release.html#approving-a-release\n\
+\n\
+At a minimum you would be expected to check that:\n\
+    - MD5 and signed packages are correct\n\
+    - README, RELEASE_NOTES, NOTICE and LICENSE files are all fine\n\
+    - That you can compile from source package\n\
+    - That the SDK can be used in your IDE of choice\n\
+    - That the SDK can be used to make a mobile, desktop and browser application\n\
+\n\
+When testing please check the md5 and asc files and make sure that the source can be compiled.\n\
+\n\
+Please vote to approve this release:\n\
+    +1 Approve the release\n\
+    -1 Veto the release (please provide specific comments to why)\n\
+\n\
+This vote will be open for 72 hours or until a result can be called.\n\
+\n\
+The vote passes if there is:\n\
+    - At least 3 +1 votes from the PMC\n\
+    - More positive votes than negative votes\n\
+\n\
+If you find an issue with the release that's a 'show stopper' please don't hold off voting -1. If someone votes -1 please continue testing as we want to try and catch as many issues as we can and cut down on the number of release candidates. Remember existing voters can change their vote during the voting process.\n\
+\n\
+People who are not in PMC are also encouraged to test out the release and vote, although their votes will not be binding, they can influence how the PMC votes.\n\
+\n\
+When voting please indicate what OS, IDE, Flash Player version and AIR version you tested the SDK with.\n\
+\n\
+Please put all discussion about this release in the DISCUSSION thread not this VOTE thread.\n\
+\n\
+For your convenience, there issues an Ant script in the RC folder that automates the checks a voter should perform on the RC.  It will:\n\
+    - download the default source package for your OS (use -Dpackage.suffix to override)\n\
+    - run md5 and gpg checks (this assumes you have gpg installed in your path)\n\
+    - uncompress the source package\n\
+    - install and run rat\n\
+    - display the rat report and ask you to verify\n\
+    - display the rat report without the AL files and ask you to verify the non-AL files\n\
+    - display the README and ask you to verify\n\
+    - display the RELEASE_NOTES and ask you to verify\n\
+    - display the NOTICE and ask you to verify\n\
+    - display the LICENSE and ask you to verify\n\
+    - run the build and any tests run by the build.\n\
+\n\
+\n\
+You should be able to go away for a while during the build.  When it is finished, it will display information to be copied into the vote thread.\n\
+You are not required to use this script, and more testing of the packages and build results are always encouraged.\n\
+\n\
+To use this script (assuming you have Ant installed), it should be as simple as:\n\
+    - Create an empty folder\n\
+    - Download ApproveSDK.xml into that folder from:\n\
+        https://dist.apache.org/repos/dist/dev/flex/sdk/${release.version}/rc${rc}/ApproveSDK.xml\n\
+    - Run: ant -e -f ApproveSDK.xml -Drelease.version=${release.version} -Drc=${rc}\n\
+\n\
+\n\
+Thanks,\n\
+${my.name}
+</echo>
+        <replace file="${basedir}/votethread.properties">
+            <replacefilter token=" " value="%20" />
+            <replacefilter token="\n" value="${CRLF}" />
+        </replace>
+        <property file="${basedir}/votethread.properties" />
+        <echo file="${basedir}/votethread.html">&lt;html&gt;&lt;body&gt;&lt;a href=&quot;mailto:dev@flex.apache.org?subject=[DISCUSS]%20Discuss%20Release%20Apache%20Flex%20SDK%20${release.version}%20RC${rc}&amp;body=${discuss.thread.body}&quot;&gt;Click here to review discuss thread&lt;/a&gt;&lt;br/&gt;&lt;a href=&quot;mailto:dev@flex.apache.org?subject=[VOTE]%20Release%20Apache%20Flex%20SDK%20${release.version}%20RC${rc}&amp;body=${vote.thread.body}&quot;&gt;Click here to review vote thread&lt;/a&gt;&lt;/body&gt;&lt;/html&gt;</echo>
+        <makeurl file="${basedir}/votethread.html" property="vote.thread.url" />
+        <exec executable="${browser}">
+            <arg value="${vote.thread.url}" />
+        </exec>
+		<delete file="${basedir}/votethread.properties" />
+		<delete file="${basedir}/votethread.html" />
+		<delete file="${basedir}/discussthread.properties" />
+    </target>
+	
+</project>

Re: [2/2] git commit: [flex-sdk] [refs/heads/develop] - switch version to 4.14

Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,

In the regexp I think "." needs to be escaped as "." mean any character not a decimal point. [0-9]* should also be [0-9]+ as there's a minimum of one digit.

Justin

On 13 Aug 2014, at 6:09 am, aharui@apache.org wrote:

> switch version to 4.14
> 
> 
> Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
> Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/96c064e6
> Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/96c064e6
> Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/96c064e6
> 
> Branch: refs/heads/develop
> Commit: 96c064e6b9ef591d6acff136f22182d3af868edf
> Parents: b88b345
> Author: Alex Harui <ah...@apache.org>
> Authored: Tue Aug 12 13:09:41 2014 -0700
> Committer: Alex Harui <ah...@apache.org>
> Committed: Tue Aug 12 13:09:41 2014 -0700
> 
> ----------------------------------------------------------------------
> build.properties                                    |  4 ++--
> build/set-version.xml                               | 10 +++++-----
> .../projects/advancedgrids/src/mx/core/Version.as   |  2 +-
> .../projects/airframework/src/mx/core/Version.as    |  2 +-
> .../projects/airspark/src/spark/core/Version.as     |  2 +-
> frameworks/projects/apache/src/core/Version.as      |  2 +-
> .../projects/automation/src/mx/core/Version.as      |  2 +-
> .../automation_agent/src/mx/core/Version.as         |  2 +-
> .../projects/automation_air/src/mx/core/Version.as  |  2 +-
> .../projects/automation_dmv/src/mx/core/Version.as  |  2 +-
> .../automation_flashflexkit/src/mx/core/Version.as  |  2 +-
> .../automation_spark/src/mx/core/Version.as         |  2 +-
> .../automation_spark/src/spark/core/Version.as      |  2 +-
> frameworks/projects/charts/src/mx/core/Version.as   |  2 +-
> .../projects/framework/src/mx/core/FlexVersion.as   | 16 +++++++++++++++-
> .../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 +-
> .../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 +-
> .../flex2/compiler/common/MxmlConfiguration.java    |  5 +++--
> .../compiler/src/java/flex2/tools/VersionInfo.java  |  2 +-
> 24 files changed, 45 insertions(+), 30 deletions(-)
> ----------------------------------------------------------------------
> 
> 
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/build.properties
> ----------------------------------------------------------------------
> diff --git a/build.properties b/build.properties
> index 4303f2a..35fd073 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.14.0
> +release.version = 4.14.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/96c064e6/build/set-version.xml
> ----------------------------------------------------------------------
> diff --git a/build/set-version.xml b/build/set-version.xml
> index 1841e0a..bbd83e3 100644
> --- a/build/set-version.xml
> +++ b/build/set-version.xml
> @@ -102,7 +102,7 @@ with latest version info ${major} ${minor} ${nano}
> 				group="3"
> 	            property="MAJOR"/>
> 			<grep in="${currVerInfo}"
> -				regex="(public static String FLEX_MINOR_VERSION =) (&quot;)([0-9])(&quot;+)"
> +				regex="(public static String FLEX_MINOR_VERSION =) (&quot;)([0-9]*)(&quot;+)"
> 				group="3"
> 	            property="MINOR"/>
> 			<grep in="${currVerInfo}"
> @@ -117,7 +117,7 @@ with latest version info ${major}.${minor}.${nano}.0
> 			
> 			<!-- Update all Version.as files in the frameworks directory-->
> 			<replaceregexp>
> -				<regexp pattern='"[0-9].[0-9].[0-9].[0-9]";'/>
> +				<regexp pattern='"[0-9].[0-9]*.[0-9].[0-9]";'/>
> 				<substitution expression='"${major}.${minor}.${nano}.0";'/>
> 				<fileset dir="${FLEX_HOME}/frameworks">
> 					<include name="**/Version.as"/>
> @@ -130,11 +130,11 @@ update ${FLEX_HOME}/build.properties release.version to ${major}.${minor}.${nano
> 			
> 			<!--update build.properties-->
> 			<replaceregexp file="${FLEX_HOME}/build.properties">
> -				<regexp pattern="release.version = [0-9].[0-9].[0-9]"/>
> +				<regexp pattern="release.version = [0-9].[0-9]*.[0-9]"/>
> 				<substitution expression="release.version = ${major}.${minor}.${nano}"/>
> 			</replaceregexp>
> 			<replaceregexp file="${FLEX_HOME}/build.properties">
> -				<regexp pattern="release = Apache Flex [0-9].[0-9]"/>
> +				<regexp pattern="release = Apache Flex [0-9].[0-9]*"/>
> 				<substitution expression="release = Apache Flex ${major}.${minor}"/>
> 			</replaceregexp>
> 
> @@ -148,7 +148,7 @@ update ${FLEX_HOME}/modules/compiler/src/java/flex2/tools/VersionInfo.java with
> 				<substitution expression='FLEX_MAJOR_VERSION = "${major}";'/>
> 			</replaceregexp>
> 			<replaceregexp file="${FLEX_HOME}/modules/compiler/src/java/flex2/tools/VersionInfo.java">
> -				<regexp pattern='FLEX_MINOR_VERSION = "[0-9]";'/>
> +				<regexp pattern='FLEX_MINOR_VERSION = "[0-9]*";'/>
> 				<substitution expression='FLEX_MINOR_VERSION = "${minor}";'/>
> 			</replaceregexp>
> 			<replaceregexp file="${FLEX_HOME}/modules/compiler/src/java/flex2/tools/VersionInfo.java">
> 
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
> +mx_internal static const VERSION:String = "4.14.0.0";
> 
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
> +mx_internal static const VERSION:String = "4.14.0.0";
> 
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
> +mx_internal static const VERSION:String = "4.14.0.0";
> 
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
> +mx_internal static const VERSION:String = "4.14.0.0";
> 
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
> +mx_internal static const VERSION:String = "4.14.0.0";
> 
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
> +mx_internal static const VERSION:String = "4.14.0.0";
> 
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
> +mx_internal static const VERSION:String = "4.14.0.0";
> 
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
> +mx_internal static const VERSION:String = "4.14.0.0";
> 
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 f261fc5..8d74c4e 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.13.0.0";
> +mx_internal static const VERSION:String = "4.14.0.0";
> 
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
> +mx_internal static const VERSION:String = "4.14.0.0";
> 
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
> +mx_internal static const VERSION:String = "4.14.0.0";
> 
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
> +mx_internal static const VERSION:String = "4.14.0.0";
> 
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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..f99b634 100644
> --- a/frameworks/projects/framework/src/mx/core/FlexVersion.as
> +++ b/frameworks/projects/framework/src/mx/core/FlexVersion.as
> @@ -56,8 +56,22 @@ public class FlexVersion
>      *  @playerversion AIR 1.1
>      *  @productversion Flex 3
>      */
> -    public static const CURRENT_VERSION:uint = 0x040D0000;
> +    public static const CURRENT_VERSION:uint = 0x040E0000;
> 	
> +    /** 
> +     *  The <code>compatibilityVersion</code> value of Flex 4.14,
> +     *  encoded numerically as a <code>uint</code>.
> +     *  Code can compare this constant against
> +     *  the <code>compatibilityVersion</code>
> +     *  to implement version-specific behavior.
> +     *  
> +     *  @langversion 3.0
> +     *  @playerversion Flash 11
> +     *  @playerversion AIR 3
> +     *  @productversion Apache Flex 4.14
> +     */
> +    public static const VERSION_4_14:uint = 0x040E0000;
> +    
> 	/** 
> 	 *  The <code>compatibilityVersion</code> value of Flex 4.13,
> 	 *  encoded numerically as a <code>uint</code>.
> 
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
> +mx_internal static const VERSION:String = "4.14.0.0";
> 
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
> +mx_internal static const VERSION:String = "4.14.0.0";
> 
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 9191675..496ab63 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.13.0.0";
> +mx_internal static const VERSION:String = "4.14.0.0";
> 
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
> +mx_internal static const VERSION:String = "4.14.0.0";
> 
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
> +mx_internal static const VERSION:String = "4.14.0.0";
> 
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
> +mx_internal static const VERSION:String = "4.14.0.0";
> 
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
> +mx_internal static const VERSION:String = "4.14.0.0";
> 
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 6705d7b..228a50b 100644
> --- a/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java
> +++ b/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java
> @@ -48,6 +48,7 @@ public class MxmlConfiguration
>     //
>     // 'compiler.mxml.compatibility-version' option
>     //
> +	public static final int VERSION_4_14 = 0x040e0000;
> 	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;
> @@ -62,10 +63,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_14;
>     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 = 14;
> 
> 	private int major = LATEST_MAJOR_VERSION;
> 	private int minor = LATEST_MINOR_VERSION;
> 
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 fe87538..8d7db5d 100644
> --- a/modules/compiler/src/java/flex2/tools/VersionInfo.java
> +++ b/modules/compiler/src/java/flex2/tools/VersionInfo.java
> @@ -32,7 +32,7 @@ import java.util.Properties;
> public class VersionInfo
> {
>     public static String FLEX_MAJOR_VERSION = "4";
> -    public static String FLEX_MINOR_VERSION = "13";
> +    public static String FLEX_MINOR_VERSION = "14";
>     public static String FLEX_NANO_VERSION  = "0";
> 
> 	/**
>

[2/2] git commit: [flex-sdk] [refs/heads/develop] - switch version to 4.14

Posted by ah...@apache.org.
switch version to 4.14


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

Branch: refs/heads/develop
Commit: 96c064e6b9ef591d6acff136f22182d3af868edf
Parents: b88b345
Author: Alex Harui <ah...@apache.org>
Authored: Tue Aug 12 13:09:41 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Aug 12 13:09:41 2014 -0700

----------------------------------------------------------------------
 build.properties                                    |  4 ++--
 build/set-version.xml                               | 10 +++++-----
 .../projects/advancedgrids/src/mx/core/Version.as   |  2 +-
 .../projects/airframework/src/mx/core/Version.as    |  2 +-
 .../projects/airspark/src/spark/core/Version.as     |  2 +-
 frameworks/projects/apache/src/core/Version.as      |  2 +-
 .../projects/automation/src/mx/core/Version.as      |  2 +-
 .../automation_agent/src/mx/core/Version.as         |  2 +-
 .../projects/automation_air/src/mx/core/Version.as  |  2 +-
 .../projects/automation_dmv/src/mx/core/Version.as  |  2 +-
 .../automation_flashflexkit/src/mx/core/Version.as  |  2 +-
 .../automation_spark/src/mx/core/Version.as         |  2 +-
 .../automation_spark/src/spark/core/Version.as      |  2 +-
 frameworks/projects/charts/src/mx/core/Version.as   |  2 +-
 .../projects/framework/src/mx/core/FlexVersion.as   | 16 +++++++++++++++-
 .../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 +-
 .../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 +-
 .../flex2/compiler/common/MxmlConfiguration.java    |  5 +++--
 .../compiler/src/java/flex2/tools/VersionInfo.java  |  2 +-
 24 files changed, 45 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/build.properties
----------------------------------------------------------------------
diff --git a/build.properties b/build.properties
index 4303f2a..35fd073 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.14.0
+release.version = 4.14.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/96c064e6/build/set-version.xml
----------------------------------------------------------------------
diff --git a/build/set-version.xml b/build/set-version.xml
index 1841e0a..bbd83e3 100644
--- a/build/set-version.xml
+++ b/build/set-version.xml
@@ -102,7 +102,7 @@ with latest version info ${major} ${minor} ${nano}
 				group="3"
 	            property="MAJOR"/>
 			<grep in="${currVerInfo}"
-				regex="(public static String FLEX_MINOR_VERSION =) (&quot;)([0-9])(&quot;+)"
+				regex="(public static String FLEX_MINOR_VERSION =) (&quot;)([0-9]*)(&quot;+)"
 				group="3"
 	            property="MINOR"/>
 			<grep in="${currVerInfo}"
@@ -117,7 +117,7 @@ with latest version info ${major}.${minor}.${nano}.0
 			
 			<!-- Update all Version.as files in the frameworks directory-->
 			<replaceregexp>
-				<regexp pattern='"[0-9].[0-9].[0-9].[0-9]";'/>
+				<regexp pattern='"[0-9].[0-9]*.[0-9].[0-9]";'/>
 				<substitution expression='"${major}.${minor}.${nano}.0";'/>
 				<fileset dir="${FLEX_HOME}/frameworks">
 					<include name="**/Version.as"/>
@@ -130,11 +130,11 @@ update ${FLEX_HOME}/build.properties release.version to ${major}.${minor}.${nano
 			
 			<!--update build.properties-->
 			<replaceregexp file="${FLEX_HOME}/build.properties">
-				<regexp pattern="release.version = [0-9].[0-9].[0-9]"/>
+				<regexp pattern="release.version = [0-9].[0-9]*.[0-9]"/>
 				<substitution expression="release.version = ${major}.${minor}.${nano}"/>
 			</replaceregexp>
 			<replaceregexp file="${FLEX_HOME}/build.properties">
-				<regexp pattern="release = Apache Flex [0-9].[0-9]"/>
+				<regexp pattern="release = Apache Flex [0-9].[0-9]*"/>
 				<substitution expression="release = Apache Flex ${major}.${minor}"/>
 			</replaceregexp>
 
@@ -148,7 +148,7 @@ update ${FLEX_HOME}/modules/compiler/src/java/flex2/tools/VersionInfo.java with
 				<substitution expression='FLEX_MAJOR_VERSION = "${major}";'/>
 			</replaceregexp>
 			<replaceregexp file="${FLEX_HOME}/modules/compiler/src/java/flex2/tools/VersionInfo.java">
-				<regexp pattern='FLEX_MINOR_VERSION = "[0-9]";'/>
+				<regexp pattern='FLEX_MINOR_VERSION = "[0-9]*";'/>
 				<substitution expression='FLEX_MINOR_VERSION = "${minor}";'/>
 			</replaceregexp>
 			<replaceregexp file="${FLEX_HOME}/modules/compiler/src/java/flex2/tools/VersionInfo.java">

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
+mx_internal static const VERSION:String = "4.14.0.0";

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
+mx_internal static const VERSION:String = "4.14.0.0";

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
+mx_internal static const VERSION:String = "4.14.0.0";

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
+mx_internal static const VERSION:String = "4.14.0.0";

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
+mx_internal static const VERSION:String = "4.14.0.0";

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
+mx_internal static const VERSION:String = "4.14.0.0";

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
+mx_internal static const VERSION:String = "4.14.0.0";

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
+mx_internal static const VERSION:String = "4.14.0.0";

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 f261fc5..8d74c4e 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.13.0.0";
+mx_internal static const VERSION:String = "4.14.0.0";

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
+mx_internal static const VERSION:String = "4.14.0.0";

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
+mx_internal static const VERSION:String = "4.14.0.0";

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
+mx_internal static const VERSION:String = "4.14.0.0";

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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..f99b634 100644
--- a/frameworks/projects/framework/src/mx/core/FlexVersion.as
+++ b/frameworks/projects/framework/src/mx/core/FlexVersion.as
@@ -56,8 +56,22 @@ public class FlexVersion
      *  @playerversion AIR 1.1
      *  @productversion Flex 3
      */
-    public static const CURRENT_VERSION:uint = 0x040D0000;
+    public static const CURRENT_VERSION:uint = 0x040E0000;
 	
+    /** 
+     *  The <code>compatibilityVersion</code> value of Flex 4.14,
+     *  encoded numerically as a <code>uint</code>.
+     *  Code can compare this constant against
+     *  the <code>compatibilityVersion</code>
+     *  to implement version-specific behavior.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 11
+     *  @playerversion AIR 3
+     *  @productversion Apache Flex 4.14
+     */
+    public static const VERSION_4_14:uint = 0x040E0000;
+    
 	/** 
 	 *  The <code>compatibilityVersion</code> value of Flex 4.13,
 	 *  encoded numerically as a <code>uint</code>.

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
+mx_internal static const VERSION:String = "4.14.0.0";

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
+mx_internal static const VERSION:String = "4.14.0.0";

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 9191675..496ab63 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.13.0.0";
+mx_internal static const VERSION:String = "4.14.0.0";

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
+mx_internal static const VERSION:String = "4.14.0.0";

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
+mx_internal static const VERSION:String = "4.14.0.0";

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
+mx_internal static const VERSION:String = "4.14.0.0";

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 90b75ca..647c056 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.13.0.0";
+mx_internal static const VERSION:String = "4.14.0.0";

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 6705d7b..228a50b 100644
--- a/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java
+++ b/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java
@@ -48,6 +48,7 @@ public class MxmlConfiguration
     //
     // 'compiler.mxml.compatibility-version' option
     //
+	public static final int VERSION_4_14 = 0x040e0000;
 	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;
@@ -62,10 +63,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_14;
     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 = 14;
 
 	private int major = LATEST_MAJOR_VERSION;
 	private int minor = LATEST_MINOR_VERSION;

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 fe87538..8d7db5d 100644
--- a/modules/compiler/src/java/flex2/tools/VersionInfo.java
+++ b/modules/compiler/src/java/flex2/tools/VersionInfo.java
@@ -32,7 +32,7 @@ import java.util.Properties;
 public class VersionInfo
 {
     public static String FLEX_MAJOR_VERSION = "4";
-    public static String FLEX_MINOR_VERSION = "13";
+    public static String FLEX_MINOR_VERSION = "14";
     public static String FLEX_NANO_VERSION  = "0";
     
 	/**