You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by bi...@apache.org on 2013/10/17 12:05:02 UTC
git commit: [flex-utilities] [refs/heads/develop] - Added support for
OSMF.swc 2.0 Added functionality to extract osmf.swf RSL from osmf.swc
Updated Branches:
refs/heads/develop 73f9a6338 -> aa0b8c790
Added support for OSMF.swc 2.0
Added functionality to extract osmf.swf RSL from osmf.swc
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/aa0b8c79
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/aa0b8c79
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/aa0b8c79
Branch: refs/heads/develop
Commit: aa0b8c7909b4f68ce4be1d91f7170deed3faa9f7
Parents: 73f9a63
Author: Om <bi...@gmail.com>
Authored: Thu Oct 17 03:04:06 2013 -0700
Committer: Om <bi...@gmail.com>
Committed: Thu Oct 17 03:04:06 2013 -0700
----------------------------------------------------------------------
common/.actionScriptProperties | 5 +-
.../apache/flex/utilities/common/Constants.as | 2 +-
installer/.actionScriptProperties | 2 +-
installer/src/InstallApacheFlex.mxml | 75 ++++++++++++--------
.../src/installer/sdk-installer-config-3.0.xml | 30 ++++----
.../src/installer/sdk-installer-config-3.1.xml | 38 +++++-----
6 files changed, 91 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/aa0b8c79/common/.actionScriptProperties
----------------------------------------------------------------------
diff --git a/common/.actionScriptProperties b/common/.actionScriptProperties
index 2e3088d..660d9e3 100644
--- a/common/.actionScriptProperties
+++ b/common/.actionScriptProperties
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<actionScriptProperties analytics="false" mainApplicationPath="ApacheFlexToolsCommon.as" projectUUID="cb0d0d00-59b0-4a30-8cdd-2d822f7fabd0" version="10">
- <compiler additionalCompilerArguments="-locale en_US" autoRSLOrdering="true" copyDependentFiles="false" flexSDK="Apache Flex 4.9.0 FP11.1 en_US" fteInMXComponents="false" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin" removeUnusedRSL="true" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
+<actionScriptProperties analytics="false" mainApplicationPath="ApacheFlexToolsCommon.as" projectUUID="cb0d0d00-59b0-4a30-8cdd-2d822f7fabd0" version="11">
+ <compiler additionalCompilerArguments="-locale en_US" autoRSLOrdering="true" copyDependentFiles="false" flexSDK="Apache Flex 4.10.0 FP 11.8 AIR 3.8 en_US" fteInMXComponents="false" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin" removeUnusedRSL="true" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="false" useDebugRSLSwfs="true" useFlashSDK="false" verifyDigests="true" warn="true">
<compilerSourcePath/>
<libraryPath defaultLinkType="0">
<libraryPathEntry kind="4" path="">
@@ -16,6 +16,7 @@
<application path="ApacheFlexToolsCommon.as"/>
</applications>
<modules/>
+ <workers/>
<buildCSSFiles/>
<flashCatalyst validateFlashCatalystCompatibility="false"/>
</actionScriptProperties>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/aa0b8c79/common/src/org/apache/flex/utilities/common/Constants.as
----------------------------------------------------------------------
diff --git a/common/src/org/apache/flex/utilities/common/Constants.as b/common/src/org/apache/flex/utilities/common/Constants.as
index f8aa589..14a3162 100644
--- a/common/src/org/apache/flex/utilities/common/Constants.as
+++ b/common/src/org/apache/flex/utilities/common/Constants.as
@@ -38,7 +38,7 @@ public class Constants
public static const APPLICATION_EXTENSION_WIN:String = ".exe";
public static const APPLICATION_EXTENSION_LINUX:String = ".deb";
- public static const CONFIG_XML_NAME:String = "installer/sdk-installer-config-3.0.xml";
+ public static const CONFIG_XML_NAME:String = "installer/sdk-installer-config-3.1.xml";
public static const DISCLAIMER_PATH:String = "about-binaries.html";
public static const INSTALLER_TRACK_SUCCESS:String = "track-installer.html";
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/aa0b8c79/installer/.actionScriptProperties
----------------------------------------------------------------------
diff --git a/installer/.actionScriptProperties b/installer/.actionScriptProperties
index aaac4b4..efc67e2 100644
--- a/installer/.actionScriptProperties
+++ b/installer/.actionScriptProperties
@@ -18,7 +18,7 @@
-->
<actionScriptProperties analytics="false" mainApplicationPath="InstallApacheFlex.mxml" projectUUID="151f0ac8-8811-45cd-b935-d7c2b0949fa3" version="11">
- <compiler additionalCompilerArguments="" autoRSLOrdering="true" copyDependentFiles="true" flexSDK="Apache Flex 4.9.0 FP11.1 en_US" fteInMXComponents="false" generateAccessible="true" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin-debug" removeUnusedRSL="true" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="true" useDebugRSLSwfs="true" useFlashSDK="false" verifyDigests="true" warn="true">
+ <compiler additionalCompilerArguments="" autoRSLOrdering="true" copyDependentFiles="true" flexSDK="Apache Flex 4.10.0 FP 11.8 AIR 3.8 en_US" fteInMXComponents="false" generateAccessible="true" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin-debug" removeUnusedRSL="true" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="true" useDebugRSLSwfs="true" useFlashSDK="false" verifyDigests="true" warn="true">
<compilerSourcePath>
<compilerSourcePathEntry kind="1" linkType="1" path="${APACHE_FLEX_UTILITIES_ROOT}/common/src"/>
</compilerSourcePath>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/aa0b8c79/installer/src/InstallApacheFlex.mxml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml
index 02199fc..5868811 100644
--- a/installer/src/InstallApacheFlex.mxml
+++ b/installer/src/InstallApacheFlex.mxml
@@ -57,6 +57,9 @@ variables are not required because the locations of these pieces are known.
import mx.managers.PopUpManager;
import mx.utils.StringUtil;
+ import spark.events.IndexChangeEvent;
+ import spark.events.TextOperationEvent;
+
import org.apache.flex.packageflexsdk.model.InstallerComponentVO;
import org.apache.flex.packageflexsdk.model.OS;
import org.apache.flex.packageflexsdk.resource.ViewResourceConstants;
@@ -74,9 +77,7 @@ variables are not required because the locations of these pieces are known.
import org.as3commons.zip.Zip;
import org.as3commons.zip.ZipEvent;
import org.as3commons.zip.ZipFile;
-
- import spark.events.IndexChangeEvent;
- import spark.events.TextOperationEvent;
+ import org.osmf.utils.OSMFStrings;
import ws.tink.spark.controls.StepItem;
@@ -153,10 +154,9 @@ variables are not required because the locations of these pieces are known.
* Optional installs
*
*/
- private var OSMF_SWF_FILE:String;
- private var OSMF_SWF_URL:String;
private var OSMF_SWC_FILE:String;
private var OSMF_SWC_URL:String;
+ private var OSMF_SWF_FILE:String = "osmf.swf";
private var BLAZEDS_FILE:String;
private var BLAZEDS_URL:String;
@@ -316,8 +316,8 @@ 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);
- // request = new URLRequest(Constants.CONFIG_XML_NAME);
+ //request = new URLRequest(Constants.APACHE_FLEX_URL + Constants.CONFIG_XML_NAME);
+ request = new URLRequest(Constants.CONFIG_XML_NAME);
}
_loader = new URLLoader();
@@ -458,10 +458,17 @@ variables are not required because the locations of these pieces are known.
SWF_OBJECT_FILE = files.(@name == 'swfobject').@file.toString();
SWF_OBJECT_URL = files.(@name == 'swfobject').@path.toString();
- OSMF_SWC_FILE = files.(@name == 'OSMF_SWC').@file.toString();
- OSMF_SWC_URL = files.(@name == 'OSMF_SWC').@path.toString();
- OSMF_SWF_FILE = files.(@name == 'OSMF_SWF').@file.toString();
- OSMF_SWF_URL = files.(@name == 'OSMF_SWF').@path.toString();
+ //Supporting OSMF 2.0 from 4.11 onwards.
+ if(APACHE_FLEX_BIN_DISTRO_VERSION != "4.11.0")
+ {
+ OSMF_SWC_FILE = files.(@name == 'OSMF_SWC').@file.toString();
+ OSMF_SWC_URL = files.(@name == 'OSMF_SWC').@path.toString();
+ }
+ else
+ {
+ OSMF_SWC_FILE = files.(@name == 'OSMF_SWC_2.0').@file.toString();
+ OSMF_SWC_URL = files.(@name == 'OSMF_SWC_2.0').@path.toString();
+ }
BLAZEDS_FILE = files.(@name == 'BlazeDS').@file.toString();
BLAZEDS_URL = files.(@name == 'BlazeDS').@path.toString();
@@ -1285,31 +1292,18 @@ variables are not required because the locations of these pieces are known.
}
protected function downloadOSMFFile():void {
- log(StringUtil.substitute(_viewResourceConstants.INFO_DOWNLOADING_FILE_FROM, [OSMF_SWF_FILE, OSMF_SWF_URL]));
- _osmfSWFFile = File.userDirectory.resolvePath(_flexTemp + File.separator + OSMF_SWF_FILE);
- copyOrDownload(OSMF_SWF_URL + OSMF_SWF_FILE, handleOSMFSWFFileDownloaded, null, handleOSMFSWFInstallError);
+ _osmfSWFFile = File.userDirectory.resolvePath(_flexTemp + File.separator + OSMF_SWF_FILE.toLowerCase());
log(StringUtil.substitute(_viewResourceConstants.INFO_DOWNLOADING_FILE_FROM, [OSMF_SWC_FILE, OSMF_SWC_URL]));
- _osmfSWCFile = File.userDirectory.resolvePath(_flexTemp + File.separator + OSMF_SWC_FILE);
- copyOrDownload(OSMF_SWC_URL + OSMF_SWC_FILE, handleOSMFSWCFileDownloaded, null, handleOSMFSWCInstallError);
- }
-
- protected function handleOSMFSWFFileDownloaded(event:Event):void {
- try {
- writeFileToDirectory(_osmfSWFFile, event.target.data);
- copyFileToLibDir(_osmfSWFFile);
- clearData(URLLoader(event.target));
- } catch (e:Error) {
- updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_OSMF, StepItem.ERROR);
- updateOptionalComponentInstallStatusAborted(_viewResourceConstants.STEP_REQUIRED_INSTALL_OSMF, true);
- abortInstallation();
- }
+ _osmfSWCFile = File.userDirectory.resolvePath(_flexTemp + File.separator + OSMF_SWC_FILE.toLowerCase());
+ copyOrDownload(OSMF_SWC_URL, handleOSMFSWCFileDownloaded, null, handleOSMFSWCInstallError);
}
protected function handleOSMFSWCFileDownloaded(event:Event):void {
try {
writeFileToDirectory(_osmfSWCFile, event.target.data);
copyFileToLibDir(_osmfSWCFile);
+ unzip(_osmfSWCFile,handleOSMFSWCUnzipped,handleOSMFSWCUnzipError);
clearData(URLLoader(event.target));
updateOptionalComponentInstallStatus(_viewResourceConstants.STEP_REQUIRED_INSTALL_OSMF, true);
@@ -1323,6 +1317,31 @@ variables are not required because the locations of these pieces are known.
}
}
+ protected function handleOSMFSWCUnzipped(event:Event):void
+ {
+ try {
+ var copyToFile:File = _flexHomeDir.resolvePath("frameworks" + File.separator + "libs" + File.separator + OSMF_SWF_FILE);
+ var osmfLibrarySwfFile:File = _flexHomeDir.resolvePath("library.swf");
+ osmfLibrarySwfFile.moveTo(copyToFile);
+ var catalogXMLFile:File = _flexHomeDir.resolvePath("catalog.xml");
+ catalogXMLFile.deleteFile();
+ var manifestXMLFile:File = _flexHomeDir.resolvePath("manifest.xml");
+ manifestXMLFile.deleteFile();
+ }
+ catch (e:Error) {
+ updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_OSMF, StepItem.ERROR);
+ updateOptionalComponentInstallStatusAborted(_viewResourceConstants.STEP_REQUIRED_INSTALL_OSMF, true);
+ abortInstallation();
+ }
+ }
+
+ protected function handleOSMFSWCUnzipError(event:Event):void
+ {
+ updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_OSMF, StepItem.ERROR);
+ updateOptionalComponentInstallStatusAborted(_viewResourceConstants.STEP_REQUIRED_INSTALL_OSMF, true);
+ abortInstallation();
+ }
+
protected function copyFileToOptionalLibDir(file:File):void {
//Copy to "${FLEX_HOME}/lib/external/optional"
var copyToFile:File = _flexHomeDir.resolvePath("lib" + File.separator + "external" + File.separator + "optional" + File.separator + file.name);
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/aa0b8c79/installer/src/installer/sdk-installer-config-3.0.xml
----------------------------------------------------------------------
diff --git a/installer/src/installer/sdk-installer-config-3.0.xml b/installer/src/installer/sdk-installer-config-3.0.xml
index f79d75c..7038970 100644
--- a/installer/src/installer/sdk-installer-config-3.0.xml
+++ b/installer/src/installer/sdk-installer-config-3.0.xml
@@ -30,24 +30,25 @@ limitations under the License.
- use full URL when binaries are NOT released yet, else use
path relative to mirror
- if path is relative, don't use starting slash -->
- <file name="SDKInstallerApp" path="https://dist.apache.org/repos/dist/dev/flex/installer/2.0/rc1/binaries/" file="apache-flex-sdk-installer-2.0.3-bin" />
+ <file name="SDKInstallerApp" path="flex/installer/2.6/binaries/" file="apache-flex-sdk-installer-2.6.0-bin" />
<!-- Mirror URL CGI -->
<file name="MirrorURLCGI" path="" file="single-mirror-url.cgi"/>
- <file name="FlexVersions" versions="4.10.0 RC3,4.9.1,Nightly" default="4.10.0 RC3" />
+ <file name="FlexVersions" versions="4.10.0,4.9.1,Nightly (dev use only),4.11.0 RC1 (dev use only)" default="4.10.0" />
<!-- Apache Flex binary distribution
Notes:
- 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 -->
- <file name="4.10.0 RC3" path="https://dist.apache.org/repos/dist/dev/flex/sdk/4.10.0/rc3/binaries/" file="apache-flex-sdk-4.10.0-bin"/>
+ <file name="4.11.0 RC1 (dev use only)" path="https://dist.apache.org/repos/dist/dev/flex/sdk/4.11.0/rc1/binaries/" file="apache-flex-sdk-4.11.0-bin"/>
+ <file name="4.10.0" path="flex/4.10.0/binaries/" file="apache-flex-sdk-4.10.0-bin"/>
<file name="4.9.1" path="flex/4.9.1/binaries/" file="apache-flex-sdk-4.9.1-bin"/>
- <file name="Nightly" path="https://builds.apache.org/job/flex-sdk_release/lastSuccessfulBuild/artifact/out/" file="apache-flex-sdk-4.10.0-bin" />
+ <file name="Nightly (dev use only)" path="https://builds.apache.org/job/flex-sdk_release/lastSuccessfulBuild/artifact/out/" file="apache-flex-sdk-4.11.0-bin" />
<!-- 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" airDefault="3.8" flashPlayerDefault="11.8" />
+ <file name="Versions" airVersions="3.9,3.8,3.7,3.6,3.5,3.4,3.3,3.2,3.1,3.0,2.7,2.6" flashPlayerVersions="11.9,11.8,11.7,11.6,11.5,11.4,11.3,11.2,11.1,11.0,10.3,10.2" airDefault="3.8" flashPlayerDefault="11.8" />
<!-- Adobe AIR SDK -->
<file name="AdobeAIRSDKLin2.6" path="http://airdownload.adobe.com/air/lin/download/2.6/" file="AdobeAIRSDK.tbz2" />
@@ -61,8 +62,9 @@ limitations under the License.
<file name="AdobeAIRSDKWin3.4" path="http://airdownload.adobe.com/air/win/download/3.4/" file="AdobeAIRSDK.zip" label="tested" />
<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://airdownload.adobe.com/air/win/download/3.8/" file="AdobeAIRSDK.zip" />
+ <file name="AdobeAIRSDKWin3.7" path="http://airdownload.adobe.com/air/win/download/3.7/" file="AdobeAIRSDK.zip" label="tested"/>
+ <file name="AdobeAIRSDKWin3.8" path="http://airdownload.adobe.com/air/win/download/3.8/" file="AdobeAIRSDK.zip" label="tested"/>
+ <file name="AdobeAIRSDKWin3.9" path="http://airdownload.adobe.com/air/win/download/3.9/" file="AdobeAIRSDK.zip" />
<file name="AdobeAIRSDKMac2.6" path="http://airdownload.adobe.com/air/mac/download/2.6/" file="AdobeAIRSDK.tbz2" />
<file name="AdobeAIRSDKMac2.7" path="http://airdownload.adobe.com/air/mac/download/2.7/" file="AdobeAIRSDK.tbz2" />
@@ -73,12 +75,13 @@ limitations under the License.
<file name="AdobeAIRSDKMac3.4" path="http://airdownload.adobe.com/air/mac/download/3.4/" file="AdobeAIRSDK.tbz2" label="tested" />
<file name="AdobeAIRSDKMac3.5" path="http://airdownload.adobe.com/air/mac/download/3.5/" file="AdobeAIRSDK.tbz2" />
<file name="AdobeAIRSDKMac3.6" path="http://airdownload.adobe.com/air/mac/download/3.6/" file="AdobeAIRSDK.tbz2" />
- <file name="AdobeAIRSDKMac3.7" path="http://airdownload.adobe.com/air/mac/download/3.7/" file="AdobeAIRSDK.tbz2" />
- <file name="AdobeAIRSDKMac3.8" path="http://airdownload.adobe.com/air/mac/download/3.8/" file="AdobeAIRSDK.tbz2" />
+ <file name="AdobeAIRSDKMac3.7" path="http://airdownload.adobe.com/air/mac/download/3.7/" file="AdobeAIRSDK.tbz2" label="tested"/>
+ <file name="AdobeAIRSDKMac3.8" path="http://airdownload.adobe.com/air/mac/download/3.8/" file="AdobeAIRSDK.tbz2" label="tested"/>
+ <file name="AdobeAIRSDKMac3.9" path="http://airdownload.adobe.com/air/mac/download/3.9/" file="AdobeAIRSDK.tbz2" />
<!-- Adobe Flash Player player global swc -->
- <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="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/11/" file="playerglobal11_0.swc" version="11.0" swfversion="13" />
<file name="FlashPlayer11.1" path="http://download.macromedia.com/get/flashplayer/updaters/11/" file="playerglobal11_1.swc" version="11.1" swfversion="14" label="tested" />
<file name="FlashPlayer11.2" path="http://download.macromedia.com/get/flashplayer/updaters/11/" file="playerglobal11_2.swc" version="11.2" swfversion="15" />
@@ -86,8 +89,9 @@ limitations under the License.
<file name="FlashPlayer11.4" path="http://download.macromedia.com/get/flashplayer/updaters/11/" file="playerglobal11_4.swc" version="11.4" swfversion="17" label="tested" />
<file name="FlashPlayer11.5" path="http://download.macromedia.com/get/flashplayer/updaters/11/" file="playerglobal11_5.swc" version="11.5" swfversion="18" />
<file name="FlashPlayer11.6" path="http://download.macromedia.com/get/flashplayer/updaters/11/" file="playerglobal11_6.swc" version="11.6" swfversion="19" />
- <file name="FlashPlayer11.7" path="http://download.macromedia.com/get/flashplayer/updaters/11/" file="playerglobal11_7.swc" version="11.7" swfversion="20" />
- <file name="FlashPlayer11.8" path="http://download.macromedia.com/get/flashplayer/updaters/11/" file="playerglobal11_8.swc" version="11.8" swfversion="21" />
+ <file name="FlashPlayer11.7" path="http://download.macromedia.com/get/flashplayer/updaters/11/" file="playerglobal11_7.swc" version="11.7" swfversion="20" label="tested"/>
+ <file name="FlashPlayer11.8" path="http://download.macromedia.com/get/flashplayer/updaters/11/" file="playerglobal11_8.swc" version="11.8" swfversion="21" label="tested"/>
+ <file name="FlashPlayer11.9" path="http://download.macromedia.com/get/flashplayer/updaters/11/" file="playerglobal11_9.swc" version="11.9" swfversion="22" />
<!-- SWFObject.js -->
<file name="swfobject" path="http://swfobject.googlecode.com/files/" file="swfobject_2_2.zip"/>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/aa0b8c79/installer/src/installer/sdk-installer-config-3.1.xml
----------------------------------------------------------------------
diff --git a/installer/src/installer/sdk-installer-config-3.1.xml b/installer/src/installer/sdk-installer-config-3.1.xml
index b9605dd..6893156 100644
--- a/installer/src/installer/sdk-installer-config-3.1.xml
+++ b/installer/src/installer/sdk-installer-config-3.1.xml
@@ -21,7 +21,7 @@ limitations under the License.
<config>
<version>
- <latest>2.6.1</latest>
+ <latest>2.7.0</latest>
</version>
<files>
@@ -30,24 +30,25 @@ limitations under the License.
- use full URL when binaries are NOT released yet, else use
path relative to mirror
- if path is relative, don't use starting slash -->
- <file name="SDKInstallerApp" path="https://dist.apache.org/repos/dist/dev/flex/installer/2.0/rc1/binaries/" file="apache-flex-sdk-installer-2.0.3-bin" />
+ <file name="SDKInstallerApp" path="flex/installer/2.6/binaries/" file="apache-flex-sdk-installer-2.6.0-bin" />
<!-- Mirror URL CGI -->
<file name="MirrorURLCGI" path="" file="single-mirror-url.cgi"/>
- <file name="FlexVersions" versions="4.10.0 RC3,4.9.1,Nightly" default="4.10.0 RC3" />
+ <file name="FlexVersions" versions="4.10.0,4.9.1,Nightly (dev use only),4.11.0 RC2 (dev use only)" default="4.10.0" />
<!-- Apache Flex binary distribution
Notes:
- 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 -->
- <file name="4.10.0 RC3" path="https://dist.apache.org/repos/dist/dev/flex/sdk/4.10.0/rc3/binaries/" file="apache-flex-sdk-4.10.0-bin"/>
+ <file name="4.11.0 RC2 (dev use only)" path="https://dist.apache.org/repos/dist/dev/flex/sdk/4.11.0/rc2/binaries/" file="apache-flex-sdk-4.11.0-bin"/>
+ <file name="4.10.0" path="flex/4.10.0/binaries/" file="apache-flex-sdk-4.10.0-bin"/>
<file name="4.9.1" path="flex/4.9.1/binaries/" file="apache-flex-sdk-4.9.1-bin"/>
- <file name="Nightly" path="https://builds.apache.org/job/flex-sdk_release/lastSuccessfulBuild/artifact/out/" file="apache-flex-sdk-4.10.0-bin" />
+ <file name="Nightly (dev use only)" path="https://builds.apache.org/job/flex-sdk_release/lastSuccessfulBuild/artifact/out/" file="apache-flex-sdk-4.11.0-bin" />
<!-- 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" airDefault="3.8" flashPlayerDefault="11.8" />
+ <file name="Versions" airVersions="3.9,3.8,3.7,3.6,3.5,3.4,3.3,3.2,3.1,3.0,2.7,2.6" flashPlayerVersions="11.9,11.8,11.7,11.6,11.5,11.4,11.3,11.2,11.1,11.0,10.3,10.2" airDefault="3.8" flashPlayerDefault="11.8" />
<!-- Adobe AIR SDK -->
<file name="AdobeAIRSDKLin2.6" path="http://airdownload.adobe.com/air/lin/download/2.6/" file="AdobeAIRSDK.tbz2" />
@@ -61,8 +62,9 @@ limitations under the License.
<file name="AdobeAIRSDKWin3.4" path="http://airdownload.adobe.com/air/win/download/3.4/" file="AdobeAIRSDK.zip" label="tested" />
<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://airdownload.adobe.com/air/win/download/3.8/" file="AdobeAIRSDK.zip" />
+ <file name="AdobeAIRSDKWin3.7" path="http://airdownload.adobe.com/air/win/download/3.7/" file="AdobeAIRSDK.zip" label="tested"/>
+ <file name="AdobeAIRSDKWin3.8" path="http://airdownload.adobe.com/air/win/download/3.8/" file="AdobeAIRSDK.zip" label="tested"/>
+ <file name="AdobeAIRSDKWin3.9" path="http://airdownload.adobe.com/air/win/download/3.9/" file="AdobeAIRSDK.zip" />
<file name="AdobeAIRSDKMac2.6" path="http://airdownload.adobe.com/air/mac/download/2.6/" file="AdobeAIRSDK.tbz2" />
<file name="AdobeAIRSDKMac2.7" path="http://airdownload.adobe.com/air/mac/download/2.7/" file="AdobeAIRSDK.tbz2" />
@@ -73,12 +75,13 @@ limitations under the License.
<file name="AdobeAIRSDKMac3.4" path="http://airdownload.adobe.com/air/mac/download/3.4/" file="AdobeAIRSDK.tbz2" label="tested" />
<file name="AdobeAIRSDKMac3.5" path="http://airdownload.adobe.com/air/mac/download/3.5/" file="AdobeAIRSDK.tbz2" />
<file name="AdobeAIRSDKMac3.6" path="http://airdownload.adobe.com/air/mac/download/3.6/" file="AdobeAIRSDK.tbz2" />
- <file name="AdobeAIRSDKMac3.7" path="http://airdownload.adobe.com/air/mac/download/3.7/" file="AdobeAIRSDK.tbz2" />
- <file name="AdobeAIRSDKMac3.8" path="http://airdownload.adobe.com/air/mac/download/3.8/" file="AdobeAIRSDK.tbz2" />
+ <file name="AdobeAIRSDKMac3.7" path="http://airdownload.adobe.com/air/mac/download/3.7/" file="AdobeAIRSDK.tbz2" label="tested"/>
+ <file name="AdobeAIRSDKMac3.8" path="http://airdownload.adobe.com/air/mac/download/3.8/" file="AdobeAIRSDK.tbz2" label="tested"/>
+ <file name="AdobeAIRSDKMac3.9" path="http://airdownload.adobe.com/air/mac/download/3.9/" file="AdobeAIRSDK.tbz2" />
<!-- Adobe Flash Player player global swc -->
- <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="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/11/" file="playerglobal11_0.swc" version="11.0" swfversion="13" />
<file name="FlashPlayer11.1" path="http://download.macromedia.com/get/flashplayer/updaters/11/" file="playerglobal11_1.swc" version="11.1" swfversion="14" label="tested" />
<file name="FlashPlayer11.2" path="http://download.macromedia.com/get/flashplayer/updaters/11/" file="playerglobal11_2.swc" version="11.2" swfversion="15" />
@@ -86,8 +89,9 @@ limitations under the License.
<file name="FlashPlayer11.4" path="http://download.macromedia.com/get/flashplayer/updaters/11/" file="playerglobal11_4.swc" version="11.4" swfversion="17" label="tested" />
<file name="FlashPlayer11.5" path="http://download.macromedia.com/get/flashplayer/updaters/11/" file="playerglobal11_5.swc" version="11.5" swfversion="18" />
<file name="FlashPlayer11.6" path="http://download.macromedia.com/get/flashplayer/updaters/11/" file="playerglobal11_6.swc" version="11.6" swfversion="19" />
- <file name="FlashPlayer11.7" path="http://download.macromedia.com/get/flashplayer/updaters/11/" file="playerglobal11_7.swc" version="11.7" swfversion="20" />
- <file name="FlashPlayer11.8" path="http://download.macromedia.com/get/flashplayer/updaters/11/" file="playerglobal11_8.swc" version="11.8" swfversion="21" />
+ <file name="FlashPlayer11.7" path="http://download.macromedia.com/get/flashplayer/updaters/11/" file="playerglobal11_7.swc" version="11.7" swfversion="20" label="tested"/>
+ <file name="FlashPlayer11.8" path="http://download.macromedia.com/get/flashplayer/updaters/11/" file="playerglobal11_8.swc" version="11.8" swfversion="21" label="tested"/>
+ <file name="FlashPlayer11.9" path="http://download.macromedia.com/get/flashplayer/updaters/11/" file="playerglobal11_9.swc" version="11.9" swfversion="22" />
<!-- SWFObject.js -->
<file name="swfobject" path="http://swfobject.googlecode.com/files/" file="swfobject_2_2.zip"/>
@@ -101,9 +105,11 @@ limitations under the License.
<file name="flex-fontkit" path="http://opensource.adobe.com/svn/opensource/flex/sdk/branches/4.y/lib/" file="flex-fontkit.jar"/>
<file name="rideau" path="http://opensource.adobe.com/svn/opensource/flex/sdk/branches/4.y/lib/" file="rideau.jar"/>
- <!-- OSMF -->
- <file name="OSMF_SWF" path="http://opensource.adobe.com/svn/opensource/flex/sdk/branches/4.y/frameworks/libs/" file="osmf.swf"/>
+ <!-- OSMF 1.x -->
<file name="OSMF_SWC" path="http://opensource.adobe.com/svn/opensource/flex/sdk/branches/4.y/frameworks/libs/" file="osmf.swc"/>
+ <!-- OSMF 2.0 -->
+ <file name="OSMF_SWC_2.0" path="http://downloads.sourceforge.net/project/osmf.adobe/OSMF%202.0%20Release%20%28final%20source%2C%20ASDocs%2C%20pdf%20guides%20and%20release%20notes%29/OSMF.swc?r=&ts=1382003321&use_mirror=hivelocity" file="OSMF.swc"/>
+
</files>
</config>