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/06/13 21:40:13 UTC

[1/5] git commit: [flex-utilities] [refs/heads/develop] - add uncaught error handler. Also don't allow caching if no folder specified

Repository: flex-utilities
Updated Branches:
  refs/heads/develop 6ce4b8370 -> 9dfc183a9


add uncaught error handler.  Also don't allow caching if no folder specified


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

Branch: refs/heads/develop
Commit: 104e157d61fc23431904ac16bdee877baa0a23f5
Parents: 6ce4b83
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jun 12 09:41:26 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Jun 12 09:41:26 2014 -0700

----------------------------------------------------------------------
 installer/src/InstallApacheFlex.mxml | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/104e157d/installer/src/InstallApacheFlex.mxml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml
index b055fc3..8971415 100644
--- a/installer/src/InstallApacheFlex.mxml
+++ b/installer/src/InstallApacheFlex.mxml
@@ -91,7 +91,7 @@ variables are not required because the locations of these pieces are known.
                         <s:Button label="Browse..." click="browseFolders()" styleName="genericBtnStyle" enabled="{cb.selected}"/>
                     </s:HGroup>
                     <s:HGroup horizontalAlign="center" width="100%" >
-                        <s:Button label="OK" click="updateCache()" styleName="genericBtnStyle" />
+                        <s:Button label="OK" click="updateCache()" enabled="{cb.selected == false || folder.text.length > 0}" styleName="genericBtnStyle" />
                         <s:Button label="Cancel" click="closeUp()" styleName="genericBtnStyle" />
                     </s:HGroup>
                 </s:VGroup>
@@ -381,11 +381,37 @@ variables are not required because the locations of these pieces are known.
 		
 		protected function handleApplicationComplete(event:FlexEvent):void {
             CursorManager.setBusyCursor();
+			loaderInfo.uncaughtErrorEvents.addEventListener(UncaughtErrorEvent.UNCAUGHT_ERROR, uncaughtErrorHandler);
             updateWindow();
 			loadXML();
             logVersion();
 		}
 		
+		private function uncaughtErrorHandler(event:UncaughtErrorEvent):void
+		{
+			if (currentStep > 0)
+				updateActivityStep(stepLabels[currentStep - 1], StepItem.ERROR);
+			if (event.error is Error)
+			{
+				var error:Error = event.error as Error;
+				log(error.message);
+				log(error.getStackTrace(), -1, false);
+				abortInstallation(error.message + "\n" + error.getStackTrace());
+			}
+			else if (event.error is ErrorEvent)
+			{
+				var errorEvent:ErrorEvent = event.error as ErrorEvent;
+				log(errorEvent.text);
+				abortInstallation(errorEvent.text);
+			}
+			else
+			{
+				// a non-Error, non-ErrorEvent type was thrown and uncaught
+				log(event.toString());
+				abortInstallation(event.toString());
+			}
+		}
+
 		/**
 		 * Define on ResourceManager all keys for translation.
 		 * If some key is not present on any other language selected by user, the default value will be displayed


[5/5] git commit: [flex-utilities] [refs/heads/develop] - update release notes and readme

Posted by ah...@apache.org.
update release notes and readme


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

Branch: refs/heads/develop
Commit: 9dfc183a918a681d328cc9154a34202c040f9825
Parents: b1b5d05
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jun 12 14:58:47 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Jun 12 14:58:47 2014 -0700

----------------------------------------------------------------------
 installer/README        | 10 +++++++---
 installer/RELEASE_NOTES |  2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/9dfc183a/installer/README
----------------------------------------------------------------------
diff --git a/installer/README b/installer/README
index c088a7b..a7d7e1e 100644
--- a/installer/README
+++ b/installer/README
@@ -35,9 +35,10 @@ Overview:
     - Adobe BlazeDS
     - Adobe embedded font support
  
-- The Apache Flex SDK Installer 3.0 adds the ability to install virtually anything that
-  can be installed via an Apache Ant script.  The list of choices to install are
-  described in installer/src/installer/sdk-installer-config-4.0.xml and posted to
+- The Apache Flex SDK Installer 3.0 and later supports the ability to install 
+  virtually anything that can be installed via an Apache Ant script.  The list 
+  of choices to install are described in 
+  installer/src/installer/sdk-installer-config-4.0.xml and posted to
   http://flex.apache.org/installer/sdk-installer-config-4.0.xml.  By default, the
   installer looks there to determine the list of choices.  Once a selection is made,
   the installer then looks in the folder of the install package for a -config.xml file
@@ -72,6 +73,9 @@ Overview:
 - Then the rest of the external dependencies and the optional files (if selected by user) 
   are downloaded and copied into the appropriate locations.  
 
+- If you experience problems with the install, please try again, but right-click
+  and select "Verbose Logging" to add more information to the log. 
+
 - From the 2.6 version, you can select the version of Adobe Flash Player and Adobe AIR SDK
   the installer downloads.
 

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/9dfc183a/installer/RELEASE_NOTES
----------------------------------------------------------------------
diff --git a/installer/RELEASE_NOTES b/installer/RELEASE_NOTES
index 92c6c7c..7735f58 100644
--- a/installer/RELEASE_NOTES
+++ b/installer/RELEASE_NOTES
@@ -23,6 +23,8 @@ Copyright 2014 The Apache Software Foundation
 Apache Flex SDK Installer 3.1
 1. Fixed bugs in ant_on_air library to support more checkums in installer scripts.
 2. Reports more information when an install fails or is aborted.
+3. Caching is now implemented in the ant scripts.  This means that Apache Flex SDK
+   4.12.1 and earlier will not use the download cache and may install more slowly.
 
 Apache Flex SDK Installer 3.0
 1. Now uses external localized strings


[2/5] git commit: [flex-utilities] [refs/heads/develop] - pop log to front if it was buried by the main window

Posted by ah...@apache.org.
pop log to front if it was buried by the main window


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

Branch: refs/heads/develop
Commit: 4c784368342bb52d7e63d967e7349f4b4d01072e
Parents: 104e157
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jun 12 10:09:11 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Jun 12 10:09:11 2014 -0700

----------------------------------------------------------------------
 installer/src/InstallApacheFlex.mxml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/4c784368/installer/src/InstallApacheFlex.mxml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml
index 8971415..39aa9cb 100644
--- a/installer/src/InstallApacheFlex.mxml
+++ b/installer/src/InstallApacheFlex.mxml
@@ -590,7 +590,9 @@ variables are not required because the locations of these pieces are known.
 			if (configOverride != "") {
 				request = new URLRequest(configOverride);
 			} else {
-				request = new URLRequest(Constants.APACHE_FLEX_URL + Constants.CONFIG_XML_NAME);
+				var d:Date = new Date();
+				var ts:String = d.getTime().toString();
+				request = new URLRequest(Constants.APACHE_FLEX_URL + Constants.CONFIG_XML_NAME + "?ts=" + ts);
 				//request = new URLRequest(Constants.CONFIG_XML_NAME);
 			}
 			
@@ -2678,6 +2680,9 @@ variables are not required because the locations of these pieces are known.
 		private function showConsole(event:Event):void {
 			if (!console || console.closed)
 				console = new ConsoleWindow();
+			else if (console)
+				console.orderToFront();
+				
 			console.messages = _messages;
 			console.open();
 			console.nativeWindow.x = this.nativeWindow.x + this.nativeWindow.width / 2 - console.nativeWindow.width / 2;


Re: [4/5] git commit: [flex-utilities] [refs/heads/develop] - om says we don't need timestamping here

Posted by OmPrakash Muppirala <bi...@gmail.com>.
On Fri, Jun 13, 2014 at 12:40 PM, <ah...@apache.org> wrote:

> om says we don't need timestamping here
>
>
> Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
> Commit:
> http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/b1b5d057
> Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/b1b5d057
> Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/b1b5d057
>
> Branch: refs/heads/develop
> Commit: b1b5d057ae1911fc93131d409accb57767201e11
> Parents: 5d9a11f
> Author: Alex Harui <ah...@apache.org>
> Authored: Thu Jun 12 14:38:56 2014 -0700
> Committer: Alex Harui <ah...@apache.org>
> Committed: Thu Jun 12 14:38:56 2014 -0700
>
> ----------------------------------------------------------------------
>  installer/src/InstallApacheFlex.mxml | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b1b5d057/installer/src/InstallApacheFlex.mxml
> ----------------------------------------------------------------------
> diff --git a/installer/src/InstallApacheFlex.mxml
> b/installer/src/InstallApacheFlex.mxml
> index 8794b45..1590872 100644
> --- a/installer/src/InstallApacheFlex.mxml
> +++ b/installer/src/InstallApacheFlex.mxml
> @@ -609,7 +609,7 @@ variables are not required because the locations of
> these pieces are known.
>                         } else {
>                                 var d:Date = new Date();
>                                 var ts:String = d.getTime().toString();
> -                               request = new
> URLRequest(Constants.APACHE_FLEX_URL + Constants.CONFIG_XML_NAME + "?ts=" +
> ts);
> +                               request = new
> URLRequest(Constants.APACHE_FLEX_URL + Constants.CONFIG_XML_NAME);
>                                 //request = new
> URLRequest(Constants.CONFIG_XML_NAME);
>                         }
>
>
>

Probably want to get rid of the variables d and ts?  No need to make a new
RC for this change.

Thanks,
Om

[4/5] git commit: [flex-utilities] [refs/heads/develop] - om says we don't need timestamping here

Posted by ah...@apache.org.
om says we don't need timestamping here


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

Branch: refs/heads/develop
Commit: b1b5d057ae1911fc93131d409accb57767201e11
Parents: 5d9a11f
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jun 12 14:38:56 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Jun 12 14:38:56 2014 -0700

----------------------------------------------------------------------
 installer/src/InstallApacheFlex.mxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b1b5d057/installer/src/InstallApacheFlex.mxml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml
index 8794b45..1590872 100644
--- a/installer/src/InstallApacheFlex.mxml
+++ b/installer/src/InstallApacheFlex.mxml
@@ -609,7 +609,7 @@ variables are not required because the locations of these pieces are known.
 			} else {
 				var d:Date = new Date();
 				var ts:String = d.getTime().toString();
-				request = new URLRequest(Constants.APACHE_FLEX_URL + Constants.CONFIG_XML_NAME + "?ts=" + ts);
+				request = new URLRequest(Constants.APACHE_FLEX_URL + Constants.CONFIG_XML_NAME);
 				//request = new URLRequest(Constants.CONFIG_XML_NAME);
 			}
 			


[3/5] git commit: [flex-utilities] [refs/heads/develop] - add network interface check

Posted by ah...@apache.org.
add network interface check


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

Branch: refs/heads/develop
Commit: 5d9a11fc8c66be29510ffcec0b7e4c5bd8d395a6
Parents: 4c78436
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jun 12 14:34:50 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Jun 12 14:34:50 2014 -0700

----------------------------------------------------------------------
 installer/src/InstallApacheFlex.mxml | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/5d9a11fc/installer/src/InstallApacheFlex.mxml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml
index 39aa9cb..8794b45 100644
--- a/installer/src/InstallApacheFlex.mxml
+++ b/installer/src/InstallApacheFlex.mxml
@@ -383,8 +383,24 @@ variables are not required because the locations of these pieces are known.
             CursorManager.setBusyCursor();
 			loaderInfo.uncaughtErrorEvents.addEventListener(UncaughtErrorEvent.UNCAUGHT_ERROR, uncaughtErrorHandler);
             updateWindow();
-			loadXML();
+			var hasInternet:Boolean = false;
+			var networkAdapters:Vector.<NetworkInterface> = NetworkInfo.networkInfo.findInterfaces();
+			for each (var networkAdapter:NetworkInterface in networkAdapters)
+			{
+				if (networkAdapter.active)
+				{
+					hasInternet = true;
+					break;
+				}
+			}
+			if (hasInternet)
+				loadXML();
             logVersion();
+			if (!hasInternet)
+			{
+				log("Internet connection unavailable");
+				abortInstallation("Internet connection unavailable.");
+			}
 		}
 		
 		private function uncaughtErrorHandler(event:UncaughtErrorEvent):void
@@ -565,6 +581,7 @@ variables are not required because the locations of these pieces are known.
 			
 			_viewResourceConstants.update();
 			setButtonWidths();
+			directoryBtn.enabled = true;
 			
             updateWindow();
             
@@ -622,7 +639,8 @@ variables are not required because the locations of these pieces are known.
 			if (setXMLVariables()) {
                 _langSelect.dataProvider = supportedLanguages;
                 _langSelect.selectedIndex = getIndexOfEnUS();
-                defineResourceManagerDefaultLanguage();
+				_langSelect.enabled = true;
+				defineResourceManagerDefaultLanguage();
 			}
 		}
 		
@@ -2871,6 +2889,7 @@ variables are not required because the locations of these pieces are known.
 				 fontFamily="openSansSemibold"
 				 verticalAlign="middle"/>
 		<s:DropDownList id="_langSelect"
+						enabled="false"
 						fontFamily="openSansSemibold"
 						change="_langSelect_changeHandler(event)">
 			<s:layout>
@@ -2955,6 +2974,7 @@ variables are not required because the locations of these pieces are known.
 					  height="32"
 					  right="10"
 					  label="{_viewResourceConstants.BTN_LABEL_NEXT}"
+					  enabled="false"
 					  click="handleZeroStepNextBtnClick(event)"/>
 		</s:controlBarContent>
 	</s:Panel>