You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2013/05/25 06:28:36 UTC

[1/5] git commit: [flex-utilities] [refs/heads/develop] - Added all the versions of AIR and Flash Player to the config file.

Updated Branches:
  refs/heads/develop 45aa3103e -> 8b9088d7d
Updated Tags:  refs/tags/apache-flex-sdk-installer-2.5.4-RC5 [created] 05f64f951


Added all the versions of AIR and Flash Player to the config file.


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

Branch: refs/heads/develop
Commit: 4e0bd04ef7c3ce3bb4161f3e9f95d56d67c01db3
Parents: 45aa310
Author: Justin Mclean <jm...@apache.org>
Authored: Sat May 25 14:24:43 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat May 25 14:24:43 2013 +1000

----------------------------------------------------------------------
 installer/src/sdk-installer-config-2.0.xml |   45 ++++++++++++++++++++++-
 1 files changed, 43 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/4e0bd04e/installer/src/sdk-installer-config-2.0.xml
----------------------------------------------------------------------
diff --git a/installer/src/sdk-installer-config-2.0.xml b/installer/src/sdk-installer-config-2.0.xml
index b57d452..f4d0127 100644
--- a/installer/src/sdk-installer-config-2.0.xml
+++ b/installer/src/sdk-installer-config-2.0.xml
@@ -21,11 +21,11 @@ limitations under the License.
 
 <config>
 	<version>
-		<latest>2.5.4</latest>
+		<latest>2.6.0</latest>
 	</version>
 	<files>
 
-		<!-- SDK Installer App binary distribution
+		<!-- SDK Installer Application binary distribution
 			 Notes:
 			 	- use full URL when binaries are NOT released yet, else use
 			 	  path relative to mirror
@@ -49,6 +49,47 @@ limitations under the License.
         <!-- Adobe Flash Player player global swc -->
         <file name="FlashPlayer" path="http://fpdownload.macromedia.com/get/flashplayer/updaters/11/" file="playerglobal11_1.swc" version="11.1"/>
 
+        <!-- All the versions! -->
+		<file name="Versions" airVersions="3.8,3.7,3.6,3.5,3.4,3.3,3.2,3.1,3.0,2.7,2.6" flashPlayerVersions="11.8,11.7,11.6,11.5,11.4,11.3,11.2,11.1,11.0,10.3,10.2" /> 
+
+		<file name="AdobeAIRSDKLin2.6" path="http://airdownload.adobe.com/air/lin/download/2.6" file="AdobeAIRSDK.zip" />
+		
+		<file name="AdobeAIRSDKWin2.6" path="http://airdownload.adobe.com/air/win/download/2.6/" file="AdobeAIRSDK.zip" /> 
+		<file name="AdobeAIRSDKWin2.7" path="http://airdownload.adobe.com/air/win/download/2.7/" file="AdobeAIRSDK.zip" />
+		<file name="AdobeAIRSDKWin3.0" path="http://airdownload.adobe.com/air/win/download/3.0/" file="AdobeAIRSDK.zip" />
+		<file name="AdobeAIRSDKWin3.1" path="http://airdownload.adobe.com/air/win/download/3.1/" file="AdobeAIRSDK.zip" />
+		<file name="AdobeAIRSDKWin3.2" path="http://airdownload.adobe.com/air/win/download/3.2/" file="AdobeAIRSDK.zip" />
+		<file name="AdobeAIRSDKWin3.3" path="http://airdownload.adobe.com/air/win/download/3.3/" file="AdobeAIRSDK.zip" />
+		<file name="AdobeAIRSDKWin3.4" path="http://airdownload.adobe.com/air/win/download/3.4/" file="AdobeAIRSDK.zip" />
+		<file name="AdobeAIRSDKWin3.5" path="http://airdownload.adobe.com/air/win/download/3.5/" file="AdobeAIRSDK.zip" />
+		<file name="AdobeAIRSDKWin3.6" path="http://airdownload.adobe.com/air/win/download/3.6/" file="AdobeAIRSDK.zip" />
+		<file name="AdobeAIRSDKWin3.7" path="http://airdownload.adobe.com/air/win/download/3.7/" file="AdobeAIRSDK.zip" />
+		<file name="AdobeAIRSDKWin3.8" path="http://labsdownload.adobe.com/pub/labs/flashruntimes/air" file="air3-8_sdk_sa_win.zip" />
+
+		<file name="AdobeAIRSDKMac2.6" path="http://airdownload.adobe.com/air/win/download/2.6/" file="AdobeAIRSDK.tbz2" /> 
+		<file name="AdobeAIRSDKMac2.7" path="http://airdownload.adobe.com/air/win/download/2.7/" file="AdobeAIRSDK.tbz2" />
+		<file name="AdobeAIRSDKMac3.0" path="http://airdownload.adobe.com/air/win/download/3.0/" file="AdobeAIRSDK.tbz2" />
+		<file name="AdobeAIRSDKMac3.1" path="http://airdownload.adobe.com/air/win/download/3.1/" file="AdobeAIRSDK.tbz2" />
+		<file name="AdobeAIRSDKMac3.2" path="http://airdownload.adobe.com/air/win/download/3.2/" file="AdobeAIRSDK.tbz2" />
+		<file name="AdobeAIRSDKMac3.3" path="http://airdownload.adobe.com/air/win/download/3.3/" file="AdobeAIRSDK.tbz2" />
+		<file name="AdobeAIRSDKMac3.4" path="http://airdownload.adobe.com/air/win/download/3.4/" file="AdobeAIRSDK.tbz2" />
+		<file name="AdobeAIRSDKMac3.5" path="http://airdownload.adobe.com/air/win/download/3.5/" file="AdobeAIRSDK.tbz2" />
+		<file name="AdobeAIRSDKMac3.6" path="http://airdownload.adobe.com/air/win/download/3.6/" file="AdobeAIRSDK.tbz2" />
+		<file name="AdobeAIRSDKMac3.7" path="http://airdownload.adobe.com/air/win/download/3.7/" file="AdobeAIRSDK.tbz2" />
+		<file name="AdobeAIRSDKMac3.8" path="http://labsdownload.adobe.com/pub/labs/flashruntimes/air" file="air3-8_sdk_sa_mac.tbz2" />
+		
+		<file name="FlashPlayer10.2" path="http://download.macromedia.com/get/flashplayer/installers/archive/playerglobal" file="playerglobal10_2.swc" version="10.2" swfversion="11"/>
+		<file name="FlashPlayer10.3" path="http://download.macromedia.com/get/flashplayer/installers/archive/playerglobal" file="playerglobal10_3.swc" version="10.3" swfversion="12"/>
+		<file name="FlashPlayer11.0" path="http://download.macromedia.com/get/flashplayer/updaters/" file="playerglobal11_0.swc" version="11.0" swfversion="13"/>
+		<file name="FlashPlayer11.1" path="http://download.macromedia.com/get/flashplayer/updaters/" file="playerglobal11_1.swc" version="11.1" swfversion="14"/>
+		<file name="FlashPlayer11.2" path="http://download.macromedia.com/get/flashplayer/updaters/" file="playerglobal11_2.swc" version="11.2" swfversion="15"/>
+		<file name="FlashPlayer11.3" path="http://download.macromedia.com/get/flashplayer/updaters/" file="playerglobal11_3.swc" version="11.3" swfversion="16"/>
+		<file name="FlashPlayer11.4" path="http://download.macromedia.com/get/flashplayer/updaters/" file="playerglobal11_4.swc" version="11.4" swfversion="17"/>
+		<file name="FlashPlayer11.5" path="http://download.macromedia.com/get/flashplayer/updaters/" file="playerglobal11_5.swc" version="11.5" swfversion="18"/>
+		<file name="FlashPlayer11.6" path="http://download.macromedia.com/get/flashplayer/updaters/" file="playerglobal11_6.swc" version="11.6" swfversion="19" />
+		<file name="FlashPlayer11.7" path="http://download.macromedia.com/get/flashplayer/updaters/" file="playerglobal11_7.swc" version="11.7" swfversion="20" />
+		<file name="FlashPlayer11.8" path="http://labsdownload.adobe.com/pub/labs/flashruntimes/flashplayer/" file="flashplayer11-8_playerglobal.swc" version="11.8" swfversion="21" />			
+        
         <!-- SWFObject.js -->
         <file name="swfobject" path="http://swfobject.googlecode.com/files/" file="swfobject_2_2.zip"/>
 


[2/5] git commit: [flex-utilities] [refs/heads/develop] - Update version to 2.6.0

Posted by jm...@apache.org.
Update version to 2.6.0


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

Branch: refs/heads/develop
Commit: a689694cc4841b54c1004b7148f578156d8732c0
Parents: 4e0bd04
Author: Justin Mclean <jm...@apache.org>
Authored: Sat May 25 14:25:50 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat May 25 14:25:50 2013 +1000

----------------------------------------------------------------------
 installer/src/InstallApacheFlex-app.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/a689694c/installer/src/InstallApacheFlex-app.xml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex-app.xml b/installer/src/InstallApacheFlex-app.xml
index 6a4fa9d..201bd1f 100644
--- a/installer/src/InstallApacheFlex-app.xml
+++ b/installer/src/InstallApacheFlex-app.xml
@@ -45,7 +45,7 @@
 	<!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade.
 	Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
 	An updated version of application must have a versionNumber value higher than the previous version. Required for namespace >= 2.5 . -->
-	<versionNumber>2.5.4</versionNumber>
+	<versionNumber>2.6.0</versionNumber>
 
 	<!-- A string value (such as "v1", "2.5", or "Alpha 1") that represents the version of the application, as it should be shown to users. Optional. -->
 	<!-- <versionLabel></versionLabel> -->


Re: [1/5] git commit: [flex-utilities] [refs/heads/develop] - Added all the versions of AIR and Flash Player to the config file.

Posted by OmPrakash Muppirala <bi...@gmail.com>.
On May 28, 2013 4:34 AM, "Nicholas Kwiatkowski" <ni...@spoon.as> wrote:
>
> Any thoughts about moving the config file to a subdirectory off our web
> site for future versions instead of the web root?  I'm imagining a future
> where we have to keep tons of these around for backwards compatibility
> which makes things a bit messier...
>
> -Nick
>
>

+1.  This would be the right time to do it.

Thanks,
Om

> On Mon, May 27, 2013 at 2:14 AM, OmPrakash Muppirala
> <bi...@gmail.com>wrote:
>
> > On Sun, May 26, 2013 at 11:01 PM, Justin Mclean <
justin@classsoftware.com
> > >wrote:
> >
> > > Hi,
> > >
> > > > I think we should create a config 3.0 with these changes.  Whenever
> > there
> > > > are structural changes to the config xml, we do that in a new
version.
> > >
> > > There's no real major structural changes just more data - it's
backward
> > > compatible with the old version - but no complaints if you want to
make
> > 3.0.
> > >
> > > Thanks,
> > > Justin
> >
> >
> > I am thinking of scenario where the older version of the 2.0 config is
> > cached by the AIR runtime.  That would be a pretty hard for end users to
> > fix.
> >
> > I will go ahead and make this change.
> >
> > Thanks,
> > Om
> >

Re: [1/5] git commit: [flex-utilities] [refs/heads/develop] - Added all the versions of AIR and Flash Player to the config file.

Posted by Nicholas Kwiatkowski <ni...@spoon.as>.
Any thoughts about moving the config file to a subdirectory off our web
site for future versions instead of the web root?  I'm imagining a future
where we have to keep tons of these around for backwards compatibility
which makes things a bit messier...

-Nick


On Mon, May 27, 2013 at 2:14 AM, OmPrakash Muppirala
<bi...@gmail.com>wrote:

> On Sun, May 26, 2013 at 11:01 PM, Justin Mclean <justin@classsoftware.com
> >wrote:
>
> > Hi,
> >
> > > I think we should create a config 3.0 with these changes.  Whenever
> there
> > > are structural changes to the config xml, we do that in a new version.
> >
> > There's no real major structural changes just more data - it's backward
> > compatible with the old version - but no complaints if you want to make
> 3.0.
> >
> > Thanks,
> > Justin
>
>
> I am thinking of scenario where the older version of the 2.0 config is
> cached by the AIR runtime.  That would be a pretty hard for end users to
> fix.
>
> I will go ahead and make this change.
>
> Thanks,
> Om
>

Re: [1/5] git commit: [flex-utilities] [refs/heads/develop] - Added all the versions of AIR and Flash Player to the config file.

Posted by OmPrakash Muppirala <bi...@gmail.com>.
On Sun, May 26, 2013 at 11:01 PM, Justin Mclean <ju...@classsoftware.com>wrote:

> Hi,
>
> > I think we should create a config 3.0 with these changes.  Whenever there
> > are structural changes to the config xml, we do that in a new version.
>
> There's no real major structural changes just more data - it's backward
> compatible with the old version - but no complaints if you want to make 3.0.
>
> Thanks,
> Justin


I am thinking of scenario where the older version of the 2.0 config is
cached by the AIR runtime.  That would be a pretty hard for end users to
fix.

I will go ahead and make this change.

Thanks,
Om

Re: [1/5] git commit: [flex-utilities] [refs/heads/develop] - Added all the versions of AIR and Flash Player to the config file.

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

> I think we should create a config 3.0 with these changes.  Whenever there
> are structural changes to the config xml, we do that in a new version.

There's no real major structural changes just more data - it's backward compatible with the old version - but no complaints if you want to make 3.0.

Thanks,
Justin

Re: [1/5] git commit: [flex-utilities] [refs/heads/develop] - Added all the versions of AIR and Flash Player to the config file.

Posted by OmPrakash Muppirala <bi...@gmail.com>.
I think we should create a config 3.0 with these changes.  Whenever there
are structural changes to the config xml, we do that in a new version.

Thanks,
Om

On Fri, May 24, 2013 at 9:28 PM, <jm...@apache.org> wrote:

> Updated Branches:
>   refs/heads/develop 45aa3103e -> 8b9088d7d
> Updated Tags:  refs/tags/apache-flex-sdk-installer-2.5.4-RC5 [created]
> 05f64f951
>
>
> Added all the versions of AIR and Flash Player to the config file.
>
>
> Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
> Commit:
> http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/4e0bd04e
> Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/4e0bd04e
> Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/4e0bd04e
>
> Branch: refs/heads/develop
> Commit: 4e0bd04ef7c3ce3bb4161f3e9f95d56d67c01db3
> Parents: 45aa310
> Author: Justin Mclean <jm...@apache.org>
> Authored: Sat May 25 14:24:43 2013 +1000
> Committer: Justin Mclean <jm...@apache.org>
> Committed: Sat May 25 14:24:43 2013 +1000
>
> ----------------------------------------------------------------------
>  installer/src/sdk-installer-config-2.0.xml |   45 ++++++++++++++++++++++-
>  1 files changed, 43 insertions(+), 2 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/4e0bd04e/installer/src/sdk-installer-config-2.0.xml
> ----------------------------------------------------------------------
> diff --git a/installer/src/sdk-installer-config-2.0.xml
> b/installer/src/sdk-installer-config-2.0.xml
> index b57d452..f4d0127 100644
> --- a/installer/src/sdk-installer-config-2.0.xml
> +++ b/installer/src/sdk-installer-config-2.0.xml
> @@ -21,11 +21,11 @@ limitations under the License.
>
>  <config>
>         <version>
> -               <latest>2.5.4</latest>
> +               <latest>2.6.0</latest>
>         </version>
>         <files>
>
> -               <!-- SDK Installer App binary distribution
> +               <!-- SDK Installer Application binary distribution
>                          Notes:
>                                 - use full URL when binaries are NOT
> released yet, else use
>                                   path relative to mirror
> @@ -49,6 +49,47 @@ limitations under the License.
>          <!-- Adobe Flash Player player global swc -->
>          <file name="FlashPlayer" path="
> http://fpdownload.macromedia.com/get/flashplayer/updaters/11/"
> file="playerglobal11_1.swc" version="11.1"/>
>
> +        <!-- All the versions! -->
> +               <file name="Versions"
> airVersions="3.8,3.7,3.6,3.5,3.4,3.3,3.2,3.1,3.0,2.7,2.6"
> flashPlayerVersions="11.8,11.7,11.6,11.5,11.4,11.3,11.2,11.1,11.0,10.3,10.2"
> />
> +
> +               <file name="AdobeAIRSDKLin2.6" path="
> http://airdownload.adobe.com/air/lin/download/2.6" file="AdobeAIRSDK.zip"
> />
> +
> +               <file name="AdobeAIRSDKWin2.6" path="
> http://airdownload.adobe.com/air/win/download/2.6/"
> file="AdobeAIRSDK.zip" />
> +               <file name="AdobeAIRSDKWin2.7" path="
> http://airdownload.adobe.com/air/win/download/2.7/"
> file="AdobeAIRSDK.zip" />
> +               <file name="AdobeAIRSDKWin3.0" path="
> http://airdownload.adobe.com/air/win/download/3.0/"
> file="AdobeAIRSDK.zip" />
> +               <file name="AdobeAIRSDKWin3.1" path="
> http://airdownload.adobe.com/air/win/download/3.1/"
> file="AdobeAIRSDK.zip" />
> +               <file name="AdobeAIRSDKWin3.2" path="
> http://airdownload.adobe.com/air/win/download/3.2/"
> file="AdobeAIRSDK.zip" />
> +               <file name="AdobeAIRSDKWin3.3" path="
> http://airdownload.adobe.com/air/win/download/3.3/"
> file="AdobeAIRSDK.zip" />
> +               <file name="AdobeAIRSDKWin3.4" path="
> http://airdownload.adobe.com/air/win/download/3.4/"
> file="AdobeAIRSDK.zip" />
> +               <file name="AdobeAIRSDKWin3.5" path="
> http://airdownload.adobe.com/air/win/download/3.5/"
> file="AdobeAIRSDK.zip" />
> +               <file name="AdobeAIRSDKWin3.6" path="
> http://airdownload.adobe.com/air/win/download/3.6/"
> file="AdobeAIRSDK.zip" />
> +               <file name="AdobeAIRSDKWin3.7" path="
> http://airdownload.adobe.com/air/win/download/3.7/"
> file="AdobeAIRSDK.zip" />
> +               <file name="AdobeAIRSDKWin3.8" path="
> http://labsdownload.adobe.com/pub/labs/flashruntimes/air"
> file="air3-8_sdk_sa_win.zip" />
> +
> +               <file name="AdobeAIRSDKMac2.6" path="
> http://airdownload.adobe.com/air/win/download/2.6/"
> file="AdobeAIRSDK.tbz2" />
> +               <file name="AdobeAIRSDKMac2.7" path="
> http://airdownload.adobe.com/air/win/download/2.7/"
> file="AdobeAIRSDK.tbz2" />
> +               <file name="AdobeAIRSDKMac3.0" path="
> http://airdownload.adobe.com/air/win/download/3.0/"
> file="AdobeAIRSDK.tbz2" />
> +               <file name="AdobeAIRSDKMac3.1" path="
> http://airdownload.adobe.com/air/win/download/3.1/"
> file="AdobeAIRSDK.tbz2" />
> +               <file name="AdobeAIRSDKMac3.2" path="
> http://airdownload.adobe.com/air/win/download/3.2/"
> file="AdobeAIRSDK.tbz2" />
> +               <file name="AdobeAIRSDKMac3.3" path="
> http://airdownload.adobe.com/air/win/download/3.3/"
> file="AdobeAIRSDK.tbz2" />
> +               <file name="AdobeAIRSDKMac3.4" path="
> http://airdownload.adobe.com/air/win/download/3.4/"
> file="AdobeAIRSDK.tbz2" />
> +               <file name="AdobeAIRSDKMac3.5" path="
> http://airdownload.adobe.com/air/win/download/3.5/"
> file="AdobeAIRSDK.tbz2" />
> +               <file name="AdobeAIRSDKMac3.6" path="
> http://airdownload.adobe.com/air/win/download/3.6/"
> file="AdobeAIRSDK.tbz2" />
> +               <file name="AdobeAIRSDKMac3.7" path="
> http://airdownload.adobe.com/air/win/download/3.7/"
> file="AdobeAIRSDK.tbz2" />
> +               <file name="AdobeAIRSDKMac3.8" path="
> http://labsdownload.adobe.com/pub/labs/flashruntimes/air"
> file="air3-8_sdk_sa_mac.tbz2" />
> +
> +               <file name="FlashPlayer10.2" path="
> http://download.macromedia.com/get/flashplayer/installers/archive/playerglobal"
> file="playerglobal10_2.swc" version="10.2" swfversion="11"/>
> +               <file name="FlashPlayer10.3" path="
> http://download.macromedia.com/get/flashplayer/installers/archive/playerglobal"
> file="playerglobal10_3.swc" version="10.3" swfversion="12"/>
> +               <file name="FlashPlayer11.0" path="
> http://download.macromedia.com/get/flashplayer/updaters/"
> file="playerglobal11_0.swc" version="11.0" swfversion="13"/>
> +               <file name="FlashPlayer11.1" path="
> http://download.macromedia.com/get/flashplayer/updaters/"
> file="playerglobal11_1.swc" version="11.1" swfversion="14"/>
> +               <file name="FlashPlayer11.2" path="
> http://download.macromedia.com/get/flashplayer/updaters/"
> file="playerglobal11_2.swc" version="11.2" swfversion="15"/>
> +               <file name="FlashPlayer11.3" path="
> http://download.macromedia.com/get/flashplayer/updaters/"
> file="playerglobal11_3.swc" version="11.3" swfversion="16"/>
> +               <file name="FlashPlayer11.4" path="
> http://download.macromedia.com/get/flashplayer/updaters/"
> file="playerglobal11_4.swc" version="11.4" swfversion="17"/>
> +               <file name="FlashPlayer11.5" path="
> http://download.macromedia.com/get/flashplayer/updaters/"
> file="playerglobal11_5.swc" version="11.5" swfversion="18"/>
> +               <file name="FlashPlayer11.6" path="
> http://download.macromedia.com/get/flashplayer/updaters/"
> file="playerglobal11_6.swc" version="11.6" swfversion="19" />
> +               <file name="FlashPlayer11.7" path="
> http://download.macromedia.com/get/flashplayer/updaters/"
> file="playerglobal11_7.swc" version="11.7" swfversion="20" />
> +               <file name="FlashPlayer11.8" path="
> http://labsdownload.adobe.com/pub/labs/flashruntimes/flashplayer/"
> file="flashplayer11-8_playerglobal.swc" version="11.8" swfversion="21" />
> +
>          <!-- SWFObject.js -->
>          <file name="swfobject" path="
> http://swfobject.googlecode.com/files/" file="swfobject_2_2.zip"/>
>
>
>

[5/5] git commit: [flex-utilities] [refs/heads/develop] - Updated to 2.6.0

Posted by jm...@apache.org.
Updated to 2.6.0


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

Branch: refs/heads/develop
Commit: 8b9088d7da6437156cd8a812e3052db8254de93d
Parents: 1b9a35c
Author: Justin Mclean <jm...@apache.org>
Authored: Sat May 25 14:28:16 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat May 25 14:28:16 2013 +1000

----------------------------------------------------------------------
 installer/build.number     |    6 +-----
 installer/build.properties |    8 ++++----
 2 files changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/8b9088d7/installer/build.number
----------------------------------------------------------------------
diff --git a/installer/build.number b/installer/build.number
index 2a9979b..006dca2 100644
--- a/installer/build.number
+++ b/installer/build.number
@@ -1,6 +1,2 @@
 #Copyright 2013 The Apache Software Foundation.
-#Thu, 04 Apr 2013 20:42:27 +0200
-#Copyright 2012 The Apache Software Foundation.
-#Mon, 05 Nov 2012 11:23:11 -0800
-#Mon Oct 22 09:24:43 CEST 2012
-build.number=4
+build.number=0

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/8b9088d7/installer/build.properties
----------------------------------------------------------------------
diff --git a/installer/build.properties b/installer/build.properties
index 976a489..22fab38 100644
--- a/installer/build.properties
+++ b/installer/build.properties
@@ -19,11 +19,11 @@
 -->
 
 #nano version number is added by build script
-release.version=2.5
+release.version=2.6
 
 #Flex Locations
 FLEX_HOME_WIN=C:/Program Files (x86)/Adobe/Adobe Flash Builder 4.6/sdks/4.9.1/
-FLEX_HOME_MAC=/Applications/Adobe Flash Builder 4.6/sdks/4.9.1/
+FLEX_HOME_MAC=/Users/justinmclean/Documents/ApacheFlex4.9.1SDK
 
 #AIR Locations
 AIR_HOME_WIN=${FLEX_HOME_WIN}
@@ -49,8 +49,8 @@ TEMP_PASS_CHANGE_THIS=random123$%^
 
 #Certificate for release build.  Modify only when you are making a release build (See RELEASE_GUIDE first)
 STORETYPE=pkcs12
-RELEASE_KEYSTORE_FILE=C:/Users/AsusFred/Documents/certificates/installapacheflex_self.p12
-CERT_PASSWORD_FILE=C:/Users/AsusFred/Documents/certificates/installapacheflex.password
+RELEASE_KEYSTORE_FILE=/Users/justinmclean/Documents/Adobe Flash Builder 4.6/Apache Flex Utilities/installer/cert/installapacheflex_self.p12
+CERT_PASSWORD_FILE=/Users/justinmclean/Documents/Adobe Flash Builder 4.6/Apache Flex Utilities/installer/cert/installapacheflex.password
 CERT_NAME=Apache Flex
 CERT_ORG_UNIT=
 CERT_ORG_NAME=


[4/5] git commit: [flex-utilities] [refs/heads/develop] - Update steps so AIR and Flash Player version can be selected as first step. Added initial Linux support (not tested).

Posted by jm...@apache.org.
Update steps so AIR and Flash Player version can be selected as first step.  Added initial Linux support (not tested).


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

Branch: refs/heads/develop
Commit: 1b9a35ccd83b008ac374c3bd1a5a186e53abfbc9
Parents: cae1d48
Author: Justin Mclean <jm...@apache.org>
Authored: Sat May 25 14:27:26 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat May 25 14:27:26 2013 +1000

----------------------------------------------------------------------
 installer/src/InstallApacheFlex.mxml |  234 ++++++++++++++++++++++------
 1 files changed, 184 insertions(+), 50 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/1b9a35cc/installer/src/InstallApacheFlex.mxml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml
index 751cf14..10046fc 100644
--- a/installer/src/InstallApacheFlex.mxml
+++ b/installer/src/InstallApacheFlex.mxml
@@ -110,10 +110,14 @@ variables are not required because the locations of these pieces are known.
          * Values stored in sdk-installer-config.xml edit file to change
          *
          */
+		[Bindable] private var AIR_VERSIONS:ArrayCollection = new ArrayCollection();
+		private var AIR_VERSION:String;
         private var ADOBE_AIR_SDK_WIN_FILE:String;
         private var ADOBE_AIR_SDK_WIN_URL:String;
-        private var ADOBE_AIR_SDK_MAC_FILE:String;
-        private var ADOBE_AIR_SDK_MAC_URL:String;
+		private var ADOBE_AIR_SDK_MAC_FILE:String;
+		private var ADOBE_AIR_SDK_MAC_URL:String;
+		private var ADOBE_AIR_SDK_LINUX_FILE:String;
+		private var ADOBE_AIR_SDK_LINUX_URL:String;
 
         /**
          * Adobe Flash Player
@@ -121,9 +125,11 @@ variables are not required because the locations of these pieces are known.
          * Values stored in sdk-installer-config.xml edit file to change
          *
          */
+		[Bindable] private var FLASH_PLAYER_VERSIONS:ArrayCollection = new ArrayCollection();
+		private var FLASH_PLAYER_VERSION:String = "11.1";
+		private var FLASH_PLAYER_SWF_VERSION:String = "14";
         private var ADOBE_FB_GLOBALPLAYER_SWC_FILE:String;
         private var ADOBE_FB_GLOBALPLAYER_SWC_URL:String;
-        private var ADOBE_FB_GLOBALPLAYER_SWC_VERSION:String = "11.1";	//Default to 11.1 if this var is not set by value in sdk-installer-config.xml
 
         /**
          *
@@ -153,7 +159,8 @@ variables are not required because the locations of these pieces are known.
         private var RIDEAU_URL:String;
 
         private const WINDOWS_OS:String = "windows";
-        private const MAC_OS:String = "mac";
+		private const MAC_OS:String = "mac";
+		private const LINUX_OS:String = "linux";
 
         [Bindable]
         private var _flexHome:String;
@@ -413,26 +420,51 @@ variables are not required because the locations of these pieces are known.
             if (APACHE_FLEX_BIN_DISTRO_PATH.indexOf("http") == 0) {
                 _useMirror = false;
             }
-
-            ADOBE_AIR_SDK_WIN_FILE = files.(@name == 'AdobeAIRSDKWin').@file.toString();
-            ADOBE_AIR_SDK_WIN_URL = files.(@name == 'AdobeAIRSDKWin').@path.toString();
+			
+			var airVersions:Array = files.(@name == 'Versions').@airVersions.toString().split(",");
+			for each (var airVersion:String in airVersions) {
+				AIR_VERSIONS.addItem({label:"AIR " + airVersion, version:airVersion});
+			}
+			
+			if (this.airVersion.selectedIndex == -1) {
+				this.airVersion.selectedIndex = 1;	
+			}
+			
+			var flashPlayerVersions:Array = files.(@name == 'Versions').@flashPlayerVersions.toString().split(",");
+			for each (var flashPlayerVersion:String in flashPlayerVersions) {
+				FLASH_PLAYER_VERSIONS.addItem({label:"Flash Player " + flashPlayerVersion, version:flashPlayerVersion});
+			}
+			
+			if (this.flashPlayerVersion.selectedIndex == -1) {
+				this.flashPlayerVersion.selectedIndex = 1;	
+			}
+
+            ADOBE_AIR_SDK_WIN_FILE = files.(@name == 'AdobeAIRSDKWin' + AIR_VERSION).@file.toString();
+            ADOBE_AIR_SDK_WIN_URL = files.(@name == 'AdobeAIRSDKWin' + AIR_VERSION).@path.toString();
             if (_os == WINDOWS_OS && (!ADOBE_AIR_SDK_WIN_FILE || !ADOBE_AIR_SDK_WIN_URL)) {
                 log(_viewResourceConstants.ERROR_INVALID_AIR_SDK_URL_WINDOWS);
                 keepGoing = false;
             }
             ADOBE_AIR_SDK_WIN_URL += ADOBE_AIR_SDK_WIN_FILE;
 
-            ADOBE_AIR_SDK_MAC_FILE = files.(@name == 'AdobeAIRSDKMac').@file.toString();
-            ADOBE_AIR_SDK_MAC_URL = files.(@name == 'AdobeAIRSDKMac').@path.toString();
+            ADOBE_AIR_SDK_MAC_FILE = files.(@name == 'AdobeAIRSDKMac' + AIR_VERSION).@file.toString();
+            ADOBE_AIR_SDK_MAC_URL = files.(@name == 'AdobeAIRSDKMac' + AIR_VERSION).@path.toString();
             if (_os == MAC_OS && (!ADOBE_AIR_SDK_MAC_FILE || !ADOBE_AIR_SDK_MAC_URL)) {
                 log(_viewResourceConstants.ERROR_INVALID_AIR_SDK_URL_MAC);
                 keepGoing = false;
             }
             ADOBE_AIR_SDK_MAC_URL += ADOBE_AIR_SDK_MAC_FILE;
-
-            ADOBE_FB_GLOBALPLAYER_SWC_FILE = files.(@name == 'FlashPlayer').@file.toString();
-            ADOBE_FB_GLOBALPLAYER_SWC_URL = files.(@name == 'FlashPlayer').@path.toString();
-            ADOBE_FB_GLOBALPLAYER_SWC_VERSION = files.(@name == 'FlashPlayer').@version.toString();
+			
+			ADOBE_AIR_SDK_LINUX_FILE = files.(@name == 'AdobeAIRSDKMac' + AIR_VERSION).@file.toString();
+			ADOBE_AIR_SDK_LINUX_URL = files.(@name == 'AdobeAIRSDKMac' + AIR_VERSION).@path.toString();
+			if (_os == LINUX_OS && (!ADOBE_AIR_SDK_LINUX_FILE || !ADOBE_AIR_SDK_LINUX_URL)) {
+				log(_viewResourceConstants.ERROR_INVALID_AIR_SDK_URL_LINUX);
+				keepGoing = false;
+			}
+			ADOBE_AIR_SDK_MAC_URL += ADOBE_AIR_SDK_MAC_FILE;
+
+            ADOBE_FB_GLOBALPLAYER_SWC_FILE = files.(@name == 'FlashPlayer' + FLASH_PLAYER_VERSION).@file.toString();
+            ADOBE_FB_GLOBALPLAYER_SWC_URL = files.(@name == 'FlashPlayer' + FLASH_PLAYER_VERSION).@path.toString();
             if (!ADOBE_FB_GLOBALPLAYER_SWC_FILE || !ADOBE_FB_GLOBALPLAYER_SWC_URL) {
                 log(_viewResourceConstants.ERROR_INVALID_FLASH_PLAYER_SWC_URL);
                 keepGoing = false;
@@ -468,8 +500,10 @@ variables are not required because the locations of these pieces are known.
 
             if (operatingSystemStr.search("Mac OS") != -1) {
                 _os = MAC_OS;
-            } else if (operatingSystemStr.search("Windows") != -1) {
-                _os = WINDOWS_OS;
+			} else if (operatingSystemStr.search("Windows") != -1) {
+				_os = WINDOWS_OS;
+			} else if (operatingSystemStr.search("Linux") != -1) {
+				_os = LINUX_OS;
             } else {
                 log(_viewResourceConstants.ERROR_UNSUPPORTED_OPERATING_SYSTEM);
             }
@@ -571,6 +605,19 @@ variables are not required because the locations of these pieces are known.
                 install();
             }
         }
+		
+		protected function handleZeroStepNextBtnClick(event:MouseEvent):void {	
+			AIR_VERSION = airVersion.selectedItem.version;
+			FLASH_PLAYER_VERSION = flashPlayerVersion.selectedItem.version;
+			
+			setXMLVariables(); // as AIR and Flash version may of changed
+			
+			log("AIR version " + AIR_VERSION);
+			log("Flash Plyer version " + FLASH_PLAYER_VERSION);
+			
+			currentState = "directoryState";
+		}
+
 
         protected function handleFirstStepNextBtnClick(event:MouseEvent):void {
             currentState = "optionsState";
@@ -579,6 +626,7 @@ variables are not required because the locations of these pieces are known.
         protected function initiateInstallStepsActivity():void {
             _installationSteps = new ArrayCollection();
 
+			_installationSteps.addItem(new StepItem(_viewResourceConstants.STEP_SELECT_AIR_AND_FLASH_VERSION));
             _installationSteps.addItem(new StepItem(_viewResourceConstants.STEP_CREATE_DIRECTORIES));
             _installationSteps.addItem(new StepItem(_viewResourceConstants.STEP_REQUIRED_INSTALL_APACHE_FLEX_SDK));
             _installationSteps.addItem(new StepItem(_viewResourceConstants.STEP_VERIFY_FLEX_SDK));
@@ -641,6 +689,26 @@ variables are not required because the locations of these pieces are known.
         protected function install():void {
             createDirectories();
         }
+		
+		protected function handleAirVersionChange(event:Event):void {
+			AIR_VERSION = airVersion.selectedItem.verson;
+			
+			// AIR requires a minimum Flash Player version
+			if (flashPlayerVersion.selectedIndex > airVersion.selectedIndex) {
+				flashPlayerVersion.selectedIndex = airVersion.selectedIndex;
+				FLASH_PLAYER_VERSION = FLASH_PLAYER_VERSIONS[airVersion.selectedIndex].version;
+			}
+		}
+		
+		protected function handleFlashPlayerVersionChange(event:Event):void {
+			FLASH_PLAYER_VERSION = flashPlayerVersion.selectedItem.verson;
+			
+			// AIR requires a minimum Flash Player version
+			if (airVersion.selectedIndex > flashPlayerVersion.selectedIndex) {
+				airVersion.selectedIndex = flashPlayerVersion.selectedIndex;
+				AIR_VERSION = AIR_VERSIONS[flashPlayerVersion.selectedIndex].version;
+			}
+		}
 
         protected function browseForSDK(event:MouseEvent):void {
             var file:File = new File();
@@ -785,7 +853,7 @@ variables are not required because the locations of these pieces are known.
 
             if (_os == WINDOWS_OS) {
                 downloadAIRRuntimeKitForWindows();
-            } else if (_os == MAC_OS) {
+            } else if (_os == MAC_OS || _os == LINUX_OS) {
                 /* Copy all files from the unarchived directory to the root */
                 var directory:File = _flexTempDir.resolvePath(APACHE_FLEX_BIN_DISTRO_FILE_SHORT);
                 var files:Array = directory.getDirectoryListing();
@@ -793,7 +861,12 @@ variables are not required because the locations of these pieces are known.
                     file.copyTo(_flexHomeDir.resolvePath(file.name));
                 }
 
-                downloadAIRRuntimeKitForMac();
+				if (_os == MAC_OS) {
+                	downloadAIRRuntimeKitForMac();
+				}
+				else {
+					downloadAIRRuntimeKitForLinux();
+				}
             }
         }
 
@@ -815,18 +888,31 @@ variables are not required because the locations of these pieces are known.
             }
         }
 
-        protected function downloadAIRRuntimeKitForMac():void {
-            updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK, StepItem.ACTIVE);
-
-            try {
-                log(_viewResourceConstants.INFO_DOWNLOADING_AIR_RUNTIME_KIT_MAC + ADOBE_AIR_SDK_MAC_URL);
-                _adobeAIRSDKZipFile = File.userDirectory.resolvePath(_flexTemp + File.separator + ADOBE_AIR_SDK_MAC_FILE);
-                copyOrDownload(ADOBE_AIR_SDK_MAC_URL, handleAIRSDKDownload, _adobeAIRSDKZipFile, handleAIRSDKDownloadError);
-            } catch (e:Error) {
-                updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK, StepItem.ERROR);
-                abortInstallation();
-            }
-        }
+		protected function downloadAIRRuntimeKitForMac():void {
+			updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK, StepItem.ACTIVE);
+			
+			try {
+				log(_viewResourceConstants.INFO_DOWNLOADING_AIR_RUNTIME_KIT_MAC + ADOBE_AIR_SDK_MAC_URL);
+				_adobeAIRSDKZipFile = File.userDirectory.resolvePath(_flexTemp + File.separator + ADOBE_AIR_SDK_MAC_FILE);
+				copyOrDownload(ADOBE_AIR_SDK_MAC_URL, handleAIRSDKDownload, _adobeAIRSDKZipFile, handleAIRSDKDownloadError);
+			} catch (e:Error) {
+				updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK, StepItem.ERROR);
+				abortInstallation();
+			}
+		}
+		
+		protected function downloadAIRRuntimeKitForLinux():void {
+			updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK, StepItem.ACTIVE);
+			
+			try {
+				log(_viewResourceConstants.INFO_DOWNLOADING_AIR_RUNTIME_KIT_LINUX + ADOBE_AIR_SDK_LINUX_URL);
+				_adobeAIRSDKZipFile = File.userDirectory.resolvePath(_flexTemp + File.separator + ADOBE_AIR_SDK_LINUX_FILE);
+				copyOrDownload(ADOBE_AIR_SDK_LINUX_URL, handleAIRSDKDownload, _adobeAIRSDKZipFile, handleAIRSDKDownloadError);
+			} catch (e:Error) {
+				updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK, StepItem.ERROR);
+				abortInstallation();
+			}
+		}
 
         protected function handleAIRSDKDownload(event:Event):void {
             try {
@@ -903,7 +989,7 @@ variables are not required because the locations of these pieces are known.
             try {
                 log(_viewResourceConstants.INFO_INSTALLING_PLAYERGLOBAL_SWC + ADOBE_FB_GLOBALPLAYER_SWC_URL);
                 _fbGlobalPlayerDir = createFolder(_flexHome + File.separator + "frameworks" + File.separator + "libs" + File.separator + "player"
-                                                          + File.separator + ADOBE_FB_GLOBALPLAYER_SWC_VERSION);
+                                                          + File.separator + FLASH_PLAYER_VERSION);
                 _fbGlobalPlayerFile = File.userDirectory.resolvePath(_fbGlobalPlayerDir.nativePath + File.separator + "playerglobal.swc");
                 copyOrDownload(ADOBE_FB_GLOBALPLAYER_SWC_URL, handlePlayerGlobalDownload, _fbGlobalPlayerFile, handlePlayerGlobalDownloadError);
             } catch (e:Error) {
@@ -942,6 +1028,8 @@ variables are not required because the locations of these pieces are known.
                 var configFiles:Array = configFilesDir.getDirectoryListing();
                 var flexHomeFrameworksDir:File = File.userDirectory.resolvePath(_flexHome + File.separator + "frameworks");
                 log(_viewResourceConstants.INFO_INSTALLING_CONFIG_FILES);
+				
+				// TODO update with AIR and flashplayer version selected
 
                 for each (var file:File in configFiles) {
                     if (isValidConfigFile(file)) {
@@ -1317,18 +1405,10 @@ variables are not required because the locations of these pieces are known.
                 getInstallerComponentFromLabel(item.key).selected = true;
             }
         }
-
-        protected function placeFirstGroup():void {
-            firstStepGroup.x = this.width / 2 - firstStepGroup.width / 2;
-        }
-
-        protected function placeSecondGroup():void {
-            secondStepGroup.x = this.width / 2 - secondStepGroup.width / 2;
-        }
-
-        protected function placeThirdGroup():void {
-            thirdStepGroup.x = this.width / 2 - thirdStepGroup.width / 2;
-        }
+		
+		protected function placeGroup(panel:Panel):void {
+			panel.x = this.width / 2 - panel.width / 2;
+		}
 
         protected function handleOptionalInstallsChange(event:IndexChangeEvent):void {
             var selectedItem:InstallerComponentVO = InstallerComponentVO(event.target.selectedItem);
@@ -1671,14 +1751,25 @@ variables are not required because the locations of these pieces are known.
     </fx:Declarations>
 
     <s:states>
-        <s:State name="default"/>
+		<s:State name="default"/>
+		<s:State name="directoryState"/>
         <s:State name="optionsState"/>
         <s:State name="installState"/>
     </s:states>
 
     <s:transitions>
-        <s:Transition id="showDefault" fromState="*" toState="default">
-            <s:Sequence id="t0" targets="{[firstStepGroup]}" effectEnd="placeFirstGroup()">
+		<s:Transition id="showDefault" fromState="*" toState="default">
+			<s:Sequence id="t0" targets="{[zeroStepGroup]}" effectEnd="placeGroup(zeroStepGroup)">
+				<s:SetAction target="{zeroStepGroup}" property="visible" value="true"/>
+				<s:SetAction target="{firstStepGroup}" property="visible" value="false"/>
+				<s:SetAction target="{secondStepGroup}" property="visible" value="false"/>
+				<s:SetAction target="{thirdStepGroup}" property="visible" value="false"/>
+				<s:Move target="{zeroStepGroup}" xFrom="800" xTo="{this.width/2 - zeroStepGroup.width/2}" duration="500" easer="{ease}"/>
+			</s:Sequence>
+		</s:Transition>
+        <s:Transition id="showDirectory" fromState="*" toState="directoryState">
+            <s:Sequence id="t1" targets="{[firstStepGroup]}" effectEnd="placeGroup(firstStepGroup)">
+				<s:SetAction target="{zeroStepGroup}" property="visible" value="false"/>
                 <s:SetAction target="{firstStepGroup}" property="visible" value="true"/>
                 <s:SetAction target="{secondStepGroup}" property="visible" value="false"/>
                 <s:SetAction target="{thirdStepGroup}" property="visible" value="false"/>
@@ -1686,7 +1777,8 @@ variables are not required because the locations of these pieces are known.
             </s:Sequence>
         </s:Transition>
         <s:Transition id="showOptions" fromState="*" toState="optionsState">
-            <s:Sequence id="t1" targets="{[secondStepGroup]}" effectEnd="placeSecondGroup()">
+            <s:Sequence id="t2" targets="{[secondStepGroup]}" effectEnd="placeGroup(secondStepGroup)">
+				<s:SetAction target="{zeroStepGroup}" property="visible" value="false"/>
                 <s:SetAction target="{firstStepGroup}" property="visible" value="false"/>
                 <s:SetAction target="{secondStepGroup}" property="visible" value="true"/>
                 <s:SetAction target="{thirdStepGroup}" property="visible" value="false"/>
@@ -1694,7 +1786,8 @@ variables are not required because the locations of these pieces are known.
             </s:Sequence>
         </s:Transition>
         <s:Transition id="showInstall" fromState="*" toState="installState">
-            <s:Sequence id="t2" targets="{[thirdStepGroup]}" effectEnd="placeThirdGroup()">
+            <s:Sequence id="t3" targets="{[thirdStepGroup]}" effectEnd="placeGroup(thirdStepGroup)">
+				<s:SetAction target="{zeroStepGroup}" property="visible" value="false"/>
                 <s:SetAction target="{firstStepGroup}" property="visible" value="false"/>
                 <s:SetAction target="{secondStepGroup}" property="visible" value="false"/>
                 <s:SetAction target="{thirdStepGroup}" property="visible" value="true"/>
@@ -1747,15 +1840,56 @@ variables are not required because the locations of these pieces are known.
 		</s:VGroup>
 		<s:Spacer width="100" />
 	</s:HGroup>
+	<s:Panel id="zeroStepGroup"
+			 title="{_viewResourceConstants.INFO_SELECT_AIR_FLASH_PLAYER}"
+			 width="640"
+			 height="200"
+			 top="380"
+			 x="{zeroStepGroup.x = this.width/2 - zeroStepGroup.width/2}"
+			 visible="true"
+			 visible.optionsState="false"
+			 visible.directoryState="false"
+			 visible.installState="false"
+			 backgroundAlpha="0">
+		<s:layout>
+			<s:VerticalLayout
+				verticalAlign="middle"
+				paddingRight="10"
+				paddingLeft="10"/>
+		</s:layout>
+		<s:HGroup>
+			<s:Label text="Select AIR version" width="200" />
+			<s:ComboBox id="airVersion"
+						dataProvider="{AIR_VERSIONS}"
+						change="handleAirVersionChange(event)"/>
+		</s:HGroup>
+		<s:HGroup>
+			<s:Label text="Select Flash Player version" width="200" />
+			<s:ComboBox id="flashPlayerVersion"
+						dataProvider="{FLASH_PLAYER_VERSIONS}"
+						change="handleFlashPlayerVersionChange(event)"/>
+		</s:HGroup>
+		<s:controlBarContent>
+			<s:Spacer
+				width="100%"/>
+			<s:Button id="directoryBtn"
+					  styleName="mainBtnStyle"
+					  width="{standardButtonWidth}"
+					  height="32"
+					  right="10"
+					  label="{_viewResourceConstants.BTN_LABEL_NEXT}"
+					  click="handleZeroStepNextBtnClick(event)"/>
+		</s:controlBarContent>
+	</s:Panel>
+
     <s:Panel id="firstStepGroup"
              title="{_viewResourceConstants.INFO_SELECT_DIRECTORY_INSTALL}"
              width="640"
              height="200"
              top="380"
              x="{firstStepGroup.x = this.width/2 - firstStepGroup.width/2}"
-             visible="true"
-             visible.optionsState="false"
-             visible.installState="false"
+             visible="false"
+             visible.directoryState="true"
              backgroundAlpha="0">
         <s:layout>
             <s:HorizontalLayout


[3/5] git commit: [flex-utilities] [refs/heads/develop] - Updated with changes in 2.6

Posted by jm...@apache.org.
Updated with changes in 2.6


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

Branch: refs/heads/develop
Commit: cae1d48d04e0d96aa8399619b34d5a2637f8bcdd
Parents: a689694
Author: Justin Mclean <jm...@apache.org>
Authored: Sat May 25 14:26:14 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat May 25 14:26:14 2013 +1000

----------------------------------------------------------------------
 installer/README        |    3 +++
 installer/RELEASE_NOTES |    6 +++++-
 2 files changed, 8 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/cae1d48d/installer/README
----------------------------------------------------------------------
diff --git a/installer/README b/installer/README
index f2378a7..0b9e49e 100644
--- a/installer/README
+++ b/installer/README
@@ -64,6 +64,9 @@ Overview:
   modify the download urls to point to the required versions.  Then run the app from command line 
   mode with the optional command line parameter: -config=<path to config file>
 	
+- From the 2.6 version, you can select the version of Adobe Flash Playe and Adobe AIR the
+  installer downloads.
+   	
 ==========================================================================================
 How to build the installer using ANT (no Flash Builder or any other IDE required):
 ==========================================================================================

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/cae1d48d/installer/RELEASE_NOTES
----------------------------------------------------------------------
diff --git a/installer/RELEASE_NOTES b/installer/RELEASE_NOTES
index 25fc602..f8ff063 100644
--- a/installer/RELEASE_NOTES
+++ b/installer/RELEASE_NOTES
@@ -20,6 +20,10 @@ limitations under the License.
 Apache Flex
 Copyright 2013 The Apache Software Foundation
 
+Apache Flex SDK Installer 2.6
+Here is a list of significant issues that were fixed with this release:
+1. Able to select which version of AIR and Flash Player to use.
+
 Apache Flex SDK Installer 2.5
 
 Issues addressed in this release:
@@ -44,7 +48,7 @@ Issues addressed in this release:
 Here is a list of significant issues that were fixed with this release:
 1.  https://issues.apache.org/jira/browse/FLEX-33214 (Fix UI of license screen)
 2.  https://issues.apache.org/jira/browse/FLEX-33122 (Enable language switching)
-	Available languages: English(US), English(AU), English(GB), Espa�ol (ES), Fran�ais, Greek, Nederlands and Portugu�s
+	Available languages: English(US), English(AU), English(GB), Español (ES), Français, Greek, Nederlands and Português
 
 Apache Flex Installer SDK 1.0