Skip to content
Permalink
Browse files
…x-utilities into develop
  • Loading branch information
mauriceamsellem committed Feb 14, 2014
2 parents ed03e8a + dbe8be2 commit 0d70ef205b54813060c2c82c42f8be0a871ef66d
Showing 9 changed files with 47 additions and 25 deletions.
@@ -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;
@@ -41,6 +41,7 @@ public class Constants
public static const CONFIG_XML_NAME:String = "installer/sdk-installer-config-4.0.xml";
public static const DISCLAIMER_PATH:String = "about-binaries.html";
public static const INSTALLER_TRACK_SUCCESS:String = "track-installer.html";
public static const INSTALLER_TRACK_FAILURE:String = "track-installer.html?failure=true";


public static const SDK_BINARY_FILE_NAME_PREFIX:String = "apache-flex-sdk-";
@@ -31,6 +31,7 @@
</libraryPathEntry>
<libraryPathEntry kind="1" linkType="1" path="libs"/>
<libraryPathEntry kind="3" linkType="1" path="/common/bin/common.swc" useDefaultLinkType="false"/>
<libraryPathEntry kind="3" linkType="1" path="/ant_on_air/bin/ant_on_air.swc" useDefaultLinkType="false"/>
</libraryPath>
<sourceAttachmentPath/>
</compiler>
@@ -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 {
@@ -1389,7 +1392,7 @@ variables are not required because the locations of these pieces are known.
private function output(s:String):void
{
var isPublic:Boolean = true;
var isPublic:Boolean = false;
var skipLog:Boolean = !debugMode;
if (s.indexOf(":") != -1 && s.charAt(0) == "\n")
{
@@ -1406,7 +1409,7 @@ variables are not required because the locations of these pieces are known.
else if (s.indexOf("[echo] ") != -1)
{
s = s.substr(s.indexOf("[echo] ") + 7);
//isPublic = false;
isPublic = true;
skipLog = false;
}
log(s, -1, isPublic, skipLog);
@@ -1979,7 +1982,7 @@ variables are not required because the locations of these pieces are known.
}
}
if (allComponentsInstalled) {
tracker.trackInstallerSuccess(APACHE_FLEX_BIN_DISTRO_VERSION, _os.os);
tracker.trackInstallerSuccess(APACHE_FLEX_BIN_DISTRO_VERSION_DISPLAY, APACHE_FLEX_BIN_DISTRO_VERSION, _os.os);
cleanup(false);
}
}
@@ -1991,7 +1994,11 @@ variables are not required because the locations of these pieces are known.
log(_viewResourceConstants.ERROR_UNABLE_TO_DELETE_TEMP_DIRECTORY);
}
if (!isAbort) {
if (isAbort) {
tracker.trackInstallerFailure(APACHE_FLEX_BIN_DISTRO_VERSION_DISPLAY, APACHE_FLEX_BIN_DISTRO_VERSION, _os.os);
}
else
{
log(_viewResourceConstants.INFO_INSTALLATION_COMPLETE);
updateUIHandleInstallationComplete();
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -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,25 +55,26 @@ 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" />
<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>
<ApacheFlexJS name="Apache FlexJS" prefix="apache-flex-flexjs-">
<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">
<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">
<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>
@@ -23,18 +23,30 @@ limitations under the License.
<fx:Script>
<![CDATA[
import org.apache.flex.utilities.common.Constants;
public function trackInstallerSuccess(version:String=null,os:String=null):void
public function trackInstallerSuccess(sdkLabel:String=null,version:String=null,os:String=null):void
{
if(version == null && os == null)
{
trackInstallerHTML.location = Constants.APACHE_FLEX_URL + Constants.INSTALLER_TRACK_SUCCESS;
}
else
{
trackInstallerHTML.location = Constants.APACHE_FLEX_URL + Constants.INSTALLER_TRACK_SUCCESS + "?version=" + version + "&os=" + os;
trackInstallerHTML.location = Constants.APACHE_FLEX_URL + Constants.INSTALLER_TRACK_SUCCESS + "?label=" + sdkLabel + "&version=" + version + "&os=" + os;
}
}
public function trackInstallerFailure(sdkLabel:String=null,version:String=null,os:String=null):void
{
if(version == null && os == null)
{
trackInstallerHTML.location = Constants.APACHE_FLEX_URL + Constants.INSTALLER_TRACK_FAILURE;
}
else
{
trackInstallerHTML.location = Constants.APACHE_FLEX_URL + Constants.INSTALLER_TRACK_FAILURE + "&label=" + sdkLabel + "&version=" + version + "&os=" + os;
}
}
]]>
</fx:Script>
<mx:HTML id="trackInstallerHTML" width="100%" height="100%" />
@@ -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" >

0 comments on commit 0d70ef2

Please sign in to comment.