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/02/13 23:03:32 UTC
[1/4] git commit: [flex-utilities] [refs/heads/develop] - fix bug in
checksum
Updated Branches:
refs/heads/develop cd397df88 -> 3c7467d3f
fix bug in checksum
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/b80578a5
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/b80578a5
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/b80578a5
Branch: refs/heads/develop
Commit: b80578a54f6abf68716d7e749c6c6e56ac150dec
Parents: cd397df
Author: Alex Harui <ah...@apache.org>
Authored: Thu Feb 13 12:38:25 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Feb 13 13:19:33 2014 -0800
----------------------------------------------------------------------
ant_on_air/src/org/apache/flex/ant/tags/Checksum.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b80578a5/ant_on_air/src/org/apache/flex/ant/tags/Checksum.as
----------------------------------------------------------------------
diff --git a/ant_on_air/src/org/apache/flex/ant/tags/Checksum.as b/ant_on_air/src/org/apache/flex/ant/tags/Checksum.as
index 9827af7..201fb3b 100644
--- a/ant_on_air/src/org/apache/flex/ant/tags/Checksum.as
+++ b/ant_on_air/src/org/apache/flex/ant/tags/Checksum.as
@@ -117,7 +117,7 @@ package org.apache.flex.ant.tags
return;
}
var ba:ByteArray = new ByteArray();
- fs.readBytes(ba, 0, Math.max(readbuffersize, fs.bytesAvailable));
+ fs.readBytes(ba, 0, Math.min(readbuffersize, fs.bytesAvailable));
md5.update(ba);
ant.functionToCall = getSum;
ant.progressClass = this;
[4/4] git commit: [flex-utilities] [refs/heads/develop] - move assets
under installer folder on server
Posted by ah...@apache.org.
move assets under installer folder on server
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/3c7467d3
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/3c7467d3
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/3c7467d3
Branch: refs/heads/develop
Commit: 3c7467d3f24dc49bc553613f01fb303f165eb648
Parents: 93ef15a
Author: Alex Harui <ah...@apache.org>
Authored: Thu Feb 13 13:47:43 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Feb 13 13:47:43 2014 -0800
----------------------------------------------------------------------
.../src/installer/sdk-installer-config-4.0.xml | 26 ++++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/3c7467d3/installer/src/installer/sdk-installer-config-4.0.xml
----------------------------------------------------------------------
diff --git a/installer/src/installer/sdk-installer-config-4.0.xml b/installer/src/installer/sdk-installer-config-4.0.xml
index 4988431..fdc619d 100644
--- a/installer/src/installer/sdk-installer-config-4.0.xml
+++ b/installer/src/installer/sdk-installer-config-4.0.xml
@@ -31,15 +31,15 @@ limitations under the License.
<latest>3.0.0</latest>
</version>
<languages>
- <locale1 id="de_DE" name="Deutsch" path="http://flex.apache.org/properties/de_DE.properties"/>
- <locale2 id="en_US" name="English (US)" path="http://flex.apache.org/properties/en_US.properties"/>
- <locale3 id="en_AU" name="English (AU)" path="http://flex.apache.org/properties/en_AU.properties"/>
- <locale4 id="en_GB" name="English (GB)" path="http://flex.apache.org/properties/en_GB.properties"/>
- <locale5 id="es_ES" name="Español (ES)" path="http://flex.apache.org/properties/es_ES.properties"/>
- <locale6 id="fr_FR" name="Français" path="http://flex.apache.org/properties/fr_FR.properties"/>
- <locale7 id="el_GR" name="Greek" path="http://flex.apache.org/properties/el_GR.properties"/>
- <locale8 id="nl_NL" name="Nederlands" path="http://flex.apache.org/properties/nl_NL.properties"/>
- <locale9 id="pt_BR" name="Português" path="http://flex.apache.org/properties/pt_BR.properties"/>
+ <locale1 id="de_DE" name="Deutsch" path="http://flex.apache.org/installer/properties/de_DE.properties"/>
+ <locale2 id="en_US" name="English (US)" path="http://flex.apache.org/installer/properties/en_US.properties"/>
+ <locale3 id="en_AU" name="English (AU)" path="http://flex.apache.org/installer/properties/en_AU.properties"/>
+ <locale4 id="en_GB" name="English (GB)" path="http://flex.apache.org/installer/properties/en_GB.properties"/>
+ <locale5 id="es_ES" name="Español (ES)" path="http://flex.apache.org/installer/properties/es_ES.properties"/>
+ <locale6 id="fr_FR" name="Français" path="http://flex.apache.org/installer/properties/fr_FR.properties"/>
+ <locale7 id="el_GR" name="Greek" path="http://flex.apache.org/installer/properties/el_GR.properties"/>
+ <locale8 id="nl_NL" name="Nederlands" path="http://flex.apache.org/installer/properties/nl_NL.properties"/>
+ <locale9 id="pt_BR" name="Português" path="http://flex.apache.org/installer/properties/pt_BR.properties"/>
</languages>
<!-- SDK Installer Application binary distribution
Notes:
@@ -55,7 +55,7 @@ limitations under the License.
- path is relative to mirror URL; don't use starting slash
- use http based url if you want to use an absolute url instead of mirror
- remove the extension from the file name -->
- <ApacheFlexSDK name="Apache Flex SDK" prefix="apache-flex-sdk-">
+ <ApacheFlexSDK name="Apache Flex SDK" prefix="apache-flex-sdk-" icon="http://flex.apache.org/installer/icons/apache_flex_logo_text.png">
<versions>
<versionA id="4.9.1" version="4.9.1" path="http://archive.apache.org/dist/flex/4.9.1/binaries/" file="apache-flex-sdk-4.9.1-bin" />
<versionB id="4.10.0" version="4.10.0" path="http://archive.apache.org/dist/flex/4.10.0/binaries/" file="apache-flex-sdk-4.10.0-bin" />
@@ -64,17 +64,17 @@ limitations under the License.
<Nightly id="Nightly" version="Nightly" path="https://builds.apache.org/job/flex-sdk_release/lastSuccessfulBuild/artifact/out/" file="apache-flex-sdk-4.12.0-bin" dev="true"/>
</versions>
</ApacheFlexSDK>
- <ApacheFlexJS name="Apache FlexJS" prefix="apache-flex-flexjs-" icon="http://flex.apache.org/icons/apache_flexjs_logo_text.png">
+ <ApacheFlexJS name="Apache FlexJS" prefix="apache-flex-flexjs-" icon="http://flex.apache.org/installer/icons/apache_flexjs_logo_text.png">
<versions>
<Nightly id="FlexJSNightly" version="Nightly" path="https://builds.apache.org/job/flex-asjs/lastSuccessfulBuild/artifact/out/" file="apache-flex-flexjs-4.0.1-bin" dev="true"/>
</versions>
</ApacheFlexJS>
- <ApacheFlexFalcon name="Apache Flex Falcon" prefix="apache-flex-falcon-" overlay="true" needsAIR="false" needsFlash="false" icon="http://flex.apache.org/icons/apache_flexfalcon_logo_text.png">
+ <ApacheFlexFalcon name="Apache Flex Falcon" prefix="apache-flex-falcon-" overlay="true" needsAIR="false" needsFlash="false" icon="http://flex.apache.org/installer/icons/apache_flexfalcon_logo_text.png">
<versions>
<Nightly id="FlexFalconNightly" version="Nightly" path="https://builds.apache.org/job/flex-falcon/lastSuccessfulBuild/artifact/out/" file="apache-flex-falcon-0.0.1-bin" dev="true"/>
</versions>
</ApacheFlexFalcon>
- <ApacheFlexFalconJX name="Apache Flex FalconJX" prefix="apache-flex-falconjx-" overlay="true" needsAIR="false" needsFlash="false" icon="http://flex.apache.org/icons/apache_flexfalcon_logo_text.png">
+ <ApacheFlexFalconJX name="Apache Flex FalconJX" prefix="apache-flex-falconjx-" overlay="true" needsAIR="false" needsFlash="false" icon="http://flex.apache.org/installer/icons/apache_flexfalcon_logo_text.png">
<versions>
<Nightly id="FlexFalconJXNightly" version="Nightly" path="https://builds.apache.org/job/flex-falcon/lastSuccessfulBuild/artifact/out/" file="apache-flex-falconjx-0.0.1-bin" dev="true"/>
</versions>
[2/4] git commit: [flex-utilities] [refs/heads/develop] - switch
icons by product
Posted by ah...@apache.org.
switch icons by product
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/e73e3927
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/e73e3927
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/e73e3927
Branch: refs/heads/develop
Commit: e73e39277f36b01d3099a89cf4da132ab64418cf
Parents: b80578a
Author: Alex Harui <ah...@apache.org>
Authored: Thu Feb 13 13:17:39 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Feb 13 13:19:34 2014 -0800
----------------------------------------------------------------------
installer/src/InstallApacheFlex.mxml | 9 ++++++---
installer/src/installer/sdk-installer-config-4.0.xml | 6 +++---
.../ws/tink/spark/skins/controls/InstallApacheFlexSkin.mxml | 2 +-
3 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/e73e3927/installer/src/InstallApacheFlex.mxml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml
index e9b0b5f..ee7c698 100644
--- a/installer/src/InstallApacheFlex.mxml
+++ b/installer/src/InstallApacheFlex.mxml
@@ -140,6 +140,7 @@ variables are not required because the locations of these pieces are known.
import org.osmf.utils.OSMFStrings;
import ws.tink.spark.controls.StepItem;
+ import ws.tink.spark.skins.controls.InstallApacheFlexSkin;
private var _mirrorURLCGI:String;
private var _useMirror:Boolean = true;
@@ -636,8 +637,9 @@ variables are not required because the locations of these pieces are known.
var productPrefix:String = productData.@prefix.toString();
var productVersionList:XMLList = productData.versions.children();
var isOverlay:Boolean = productData.@overlay.toString() == "true";
- var needsAIR:Boolean = productData.@needsAIR.toString() != "false"
- var needsFlash:Boolean = productData.@needsFlash.toString() != "false"
+ var needsAIR:Boolean = productData.@needsAIR.toString() != "false";
+ var needsFlash:Boolean = productData.@needsFlash.toString() != "false";
+ var icon:String = productData.@icon.toString();
for each (var productVersion:XML in productVersionList) {
var shortName:String = productVersion.@file.toString();
var fileName:String = shortName + (_os.isWindows() ? Constants.ARCHIVE_EXTENSION_WIN : Constants.ARCHIVE_EXTENSION_MAC);
@@ -650,7 +652,7 @@ variables are not required because the locations of these pieces are known.
selectedFlexVersion = FLEX_VERSIONS.length;
FLEX_VERSIONS.addItem({shortName: shortName, fileName:fileName,label:label, version:ver,
path:path, overlay: isOverlay, prefix: productPrefix,
- needsAIR: needsAIR, needsFlash: needsFlash, devBuild: devBuild});
+ needsAIR: needsAIR, needsFlash: needsFlash, devBuild: devBuild, icon: icon});
}
}
@@ -1102,6 +1104,7 @@ variables are not required because the locations of these pieces are known.
updateFlexVersionStrings(item);
updatePaths();
updateWindowTitle();
+ InstallApacheFlexSkin(skin).textIcon.source = item.icon;
}
protected function browseForSDK(event:MouseEvent):void {
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/e73e3927/installer/src/installer/sdk-installer-config-4.0.xml
----------------------------------------------------------------------
diff --git a/installer/src/installer/sdk-installer-config-4.0.xml b/installer/src/installer/sdk-installer-config-4.0.xml
index 3cc7b0a..2f83762 100644
--- a/installer/src/installer/sdk-installer-config-4.0.xml
+++ b/installer/src/installer/sdk-installer-config-4.0.xml
@@ -63,17 +63,17 @@ limitations under the License.
<Nightly id="Nightly" version="Nightly" path="https://builds.apache.org/job/flex-sdk_release/lastSuccessfulBuild/artifact/out/" file="apache-flex-sdk-4.12.0-bin" dev="true"/>
</versions>
</ApacheFlexSDK>
- <ApacheFlexJS name="Apache FlexJS" prefix="apache-flex-flexjs-">
+ <ApacheFlexJS name="Apache FlexJS" prefix="apache-flex-flexjs-" icon="http://flex.apache.org/icons/apache_flexjs_logo_text.png">
<versions>
<Nightly id="FlexJSNightly" version="Nightly" path="https://builds.apache.org/job/flex-asjs/lastSuccessfulBuild/artifact/out/" file="apache-flex-flexjs-4.0.1-bin" dev="true"/>
</versions>
</ApacheFlexJS>
- <ApacheFlexFalcon name="Apache Flex Falcon" prefix="apache-flex-falcon-" overlay="true" needsAIR="false" needsFlash="false">
+ <ApacheFlexFalcon name="Apache Flex Falcon" prefix="apache-flex-falcon-" overlay="true" needsAIR="false" needsFlash="false" icon="http://flex.apache.org/icons/apache_flexfalcon_logo_text.png">
<versions>
<Nightly id="FlexFalconNightly" version="Nightly" path="https://builds.apache.org/job/flex-falcon/lastSuccessfulBuild/artifact/out/" file="apache-flex-falcon-0.0.1-bin" dev="true"/>
</versions>
</ApacheFlexFalcon>
- <ApacheFlexFalconJX name="Apache Flex FalconJX" prefix="apache-flex-falconjx-" overlay="true" needsAIR="false" needsFlash="false">
+ <ApacheFlexFalconJX name="Apache Flex FalconJX" prefix="apache-flex-falconjx-" overlay="true" needsAIR="false" needsFlash="false" icon="http://flex.apache.org/icons/apache_flexfalcon_logo_text.png">
<versions>
<Nightly id="FlexFalconJXNightly" version="Nightly" path="https://builds.apache.org/job/flex-falcon/lastSuccessfulBuild/artifact/out/" file="apache-flex-falconjx-0.0.1-bin" dev="true"/>
</versions>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/e73e3927/installer/src/ws/tink/spark/skins/controls/InstallApacheFlexSkin.mxml
----------------------------------------------------------------------
diff --git a/installer/src/ws/tink/spark/skins/controls/InstallApacheFlexSkin.mxml b/installer/src/ws/tink/spark/skins/controls/InstallApacheFlexSkin.mxml
index 75f3429..c6211be 100644
--- a/installer/src/ws/tink/spark/skins/controls/InstallApacheFlexSkin.mxml
+++ b/installer/src/ws/tink/spark/skins/controls/InstallApacheFlexSkin.mxml
@@ -84,7 +84,7 @@ limitations under the License.
<!-- layer 1: background fill -->
<s:BitmapImage source="@Embed('/assets/icons/bg_logo.png')" top="0" left="0" scaleMode="letterbox" />
<s:BitmapImage source="@Embed('/assets/icons/bg_logo.png')" top="25" left="0" scaleMode="letterbox" />
- <s:BitmapImage source="@Embed('/assets/icons/apache_flex_logo_text.png')" scaleX=".3" scaleY=".3" smooth="true" horizontalCenter="0" top="5" />
+ <s:BitmapImage id="textIcon" source="@Embed('/assets/icons/apache_flex_logo_text.png')" scaleX=".3" scaleY=".3" smooth="true" horizontalCenter="0" top="5" />
<!-- layer 2: content + status bar -->
<s:Group left="0" right="0" top="0" bottom="0" minHeight="24" minWidth="0" >
[3/4] git commit: [flex-utilities] [refs/heads/develop] - add RC2 to
installer-config
Posted by ah...@apache.org.
add RC2 to installer-config
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/93ef15a7
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/93ef15a7
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/93ef15a7
Branch: refs/heads/develop
Commit: 93ef15a7184a73b2ae5cccef77eed87a7eb651d6
Parents: e73e392
Author: Alex Harui <ah...@apache.org>
Authored: Thu Feb 13 13:43:56 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Feb 13 13:43:56 2014 -0800
----------------------------------------------------------------------
installer/src/installer/sdk-installer-config-4.0.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/93ef15a7/installer/src/installer/sdk-installer-config-4.0.xml
----------------------------------------------------------------------
diff --git a/installer/src/installer/sdk-installer-config-4.0.xml b/installer/src/installer/sdk-installer-config-4.0.xml
index 2f83762..4988431 100644
--- a/installer/src/installer/sdk-installer-config-4.0.xml
+++ b/installer/src/installer/sdk-installer-config-4.0.xml
@@ -60,6 +60,7 @@ limitations under the License.
<versionA id="4.9.1" version="4.9.1" path="http://archive.apache.org/dist/flex/4.9.1/binaries/" file="apache-flex-sdk-4.9.1-bin" />
<versionB id="4.10.0" version="4.10.0" path="http://archive.apache.org/dist/flex/4.10.0/binaries/" file="apache-flex-sdk-4.10.0-bin" />
<versionC id="4.11.0" version="4.11.0" path="flex/4.11.0/binaries/" file="apache-flex-sdk-4.11.0-bin" default="true"/>
+ <versionC id="4.12.0" version="4.12.0 RC2" path="https://dist.apache.org/repos/dist/dev/flex/sdk/4.12.0/rc2/binaries" file="apache-flex-sdk-4.12.0-bin" dev="true"/>
<Nightly id="Nightly" version="Nightly" path="https://builds.apache.org/job/flex-sdk_release/lastSuccessfulBuild/artifact/out/" file="apache-flex-sdk-4.12.0-bin" dev="true"/>
</versions>
</ApacheFlexSDK>