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/28 13:19:08 UTC
[1/2] git commit: [flex-utilities] [refs/heads/develop] - Fixed mac
paths added a few helpful attributes including initial version selection.
Updated Branches:
refs/heads/develop 71bb12297 -> 335635d24
Fixed mac paths added a few helpful attributes including initial version selection.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/f4e466d7
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/f4e466d7
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/f4e466d7
Branch: refs/heads/develop
Commit: f4e466d73f3886125040cc2d90d7e9aef49837e1
Parents: 71bb122
Author: Justin Mclean <jm...@apache.org>
Authored: Tue May 28 18:41:39 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue May 28 18:41:39 2013 +1000
----------------------------------------------------------------------
installer/src/sdk-installer-config-3.0.xml | 46 +++++++++++-----------
1 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f4e466d7/installer/src/sdk-installer-config-3.0.xml
----------------------------------------------------------------------
diff --git a/installer/src/sdk-installer-config-3.0.xml b/installer/src/sdk-installer-config-3.0.xml
index 8287328..517ee13 100644
--- a/installer/src/sdk-installer-config-3.0.xml
+++ b/installer/src/sdk-installer-config-3.0.xml
@@ -43,7 +43,7 @@ limitations under the License.
<file name="ApacheFlexSDK" path="flex/4.9.1/binaries/" file="apache-flex-sdk-4.9.1-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" />
+ <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.7" flashPlayerDefault="11.7" />
<!-- Adobe AIR SDK -->
<file name="AdobeAIRSDKLin2.6" path="http://airdownload.adobe.com/air/lin/download/2.6" file="AdobeAIRSDK.zip" />
@@ -51,39 +51,39 @@ limitations under the License.
<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.1" path="http://airdownload.adobe.com/air/win/download/3.1/" file="AdobeAIRSDK.zip" label="tested" />
<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.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://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="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" />
+ <file name="AdobeAIRSDKMac3.0" path="http://airdownload.adobe.com/air/mac/download/3.0/" file="AdobeAIRSDK.tbz2" />
+ <file name="AdobeAIRSDKMac3.1" path="http://airdownload.adobe.com/air/mac/download/3.1/" file="AdobeAIRSDK.tbz2" label="tested" />
+ <file name="AdobeAIRSDKMac3.2" path="http://airdownload.adobe.com/air/mac/download/3.2/" file="AdobeAIRSDK.tbz2" />
+ <file name="AdobeAIRSDKMac3.3" path="http://airdownload.adobe.com/air/mac/download/3.3/" file="AdobeAIRSDK.tbz2" />
+ <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://labsdownload.adobe.com/pub/labs/flashruntimes/air/" file="air3-8_sdk_sa_mac.tbz2" label="beta" />
<!-- 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="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"/>
- <file name="FlashPlayer11.2" path="http://download.macromedia.com/get/flashplayer/updaters/11/" file="playerglobal11_2.swc" version="11.2" swfversion="15"/>
- <file name="FlashPlayer11.3" path="http://download.macromedia.com/get/flashplayer/updaters/11/" file="playerglobal11_3.swc" version="11.3" swfversion="16"/>
- <file name="FlashPlayer11.4" path="http://download.macromedia.com/get/flashplayer/updaters/11/" file="playerglobal11_4.swc" version="11.4" swfversion="17"/>
- <file name="FlashPlayer11.5" path="http://download.macromedia.com/get/flashplayer/updaters/11/" file="playerglobal11_5.swc" version="11.5" swfversion="18"/>
+ <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" />
+ <file name="FlashPlayer11.3" path="http://download.macromedia.com/get/flashplayer/updaters/11/" file="playerglobal11_3.swc" version="11.3" swfversion="16" />
+ <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://labsdownload.adobe.com/pub/labs/flashruntimes/flashplayer/" file="flashplayer11-8_playerglobal.swc" version="11.8" swfversion="21" />
+ <file name="FlashPlayer11.8" path="http://labsdownload.adobe.com/pub/labs/flashruntimes/flashplayer/" file="flashplayer11-8_playerglobal.swc" version="11.8" swfversion="21" label="beta" />
<!-- SWFObject.js -->
<file name="swfobject" path="http://swfobject.googlecode.com/files/" file="swfobject_2_2.zip"/>
[2/2] git commit: [flex-utilities] [refs/heads/develop] - Support
selected version from config file. Update Flex config files with Flash Player
and SWF versions.
Posted by jm...@apache.org.
Support selected version from config file. Update Flex config files with Flash Player and SWF versions.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/335635d2
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/335635d2
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/335635d2
Branch: refs/heads/develop
Commit: 335635d244aa3b96c52ed0bcb4a52d6135ea7cd0
Parents: f4e466d
Author: Justin Mclean <jm...@apache.org>
Authored: Tue May 28 21:18:54 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue May 28 21:18:54 2013 +1000
----------------------------------------------------------------------
installer/src/InstallApacheFlex.mxml | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/335635d2/installer/src/InstallApacheFlex.mxml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml
index 640bdc6..f9289cc 100644
--- a/installer/src/InstallApacheFlex.mxml
+++ b/installer/src/InstallApacheFlex.mxml
@@ -50,13 +50,13 @@ variables are not required because the locations of these pieces are known.
<fx:Script><![CDATA[
import flash.globalization.LocaleID;
import flash.globalization.StringTools;
-
+
import mx.collections.ArrayCollection;
import mx.core.IFlexDisplayObject;
import mx.events.FlexEvent;
import mx.managers.PopUpManager;
import mx.utils.StringUtil;
-
+
import org.apache.flex.packageflexsdk.model.InstallerComponentVO;
import org.apache.flex.packageflexsdk.resource.ViewResourceConstants;
import org.apache.flex.packageflexsdk.util.MD5CompareUtil;
@@ -72,10 +72,10 @@ 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 ws.tink.spark.controls.StepItem;
private var _mirrorURLCGI:String;
@@ -422,6 +422,7 @@ variables are not required because the locations of these pieces are known.
}
var airVersions:Array = files.(@name == 'Versions').@airVersions.toString().split(",");
+ var selected:String = files.(@name == 'Versions').@airDefault.toString();
for each (var airVersion:String in airVersions) {
if (_os != LINUX_OS || Number(airVersion) <= 2.6) {
AIR_VERSIONS.addItem({label:"AIR " + airVersion, version:airVersion});
@@ -429,10 +430,11 @@ variables are not required because the locations of these pieces are known.
}
if (this.airVersion.selectedIndex == -1) {
- this.airVersion.selectedIndex = 0;
+ this.airVersion.selectedIndex = airVersions.indexOf(selected);
}
var flashPlayerVersions:Array = files.(@name == 'Versions').@flashPlayerVersions.toString().split(",");
+ selected = files.(@name == 'Versions').@flashPlayerDefault.toString();
for each (var flashPlayerVersion:String in flashPlayerVersions) {
if (_os != LINUX_OS || Number(flashPlayerVersion) <= 11.2) {
FLASH_PLAYER_VERSIONS.addItem({label:"Flash Player " + flashPlayerVersion, version:flashPlayerVersion});
@@ -440,7 +442,7 @@ variables are not required because the locations of these pieces are known.
}
if (this.flashPlayerVersion.selectedIndex == -1) {
- this.flashPlayerVersion.selectedIndex = 0;
+ this.flashPlayerVersion.selectedIndex = flashPlayerVersions.indexOf(selected);
}
ADOBE_AIR_SDK_WIN_FILE = files.(@name == 'AdobeAIRSDKWin' + AIR_VERSION).@file.toString();
@@ -469,6 +471,7 @@ variables are not required because the locations of these pieces are known.
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();
+ FLASH_PLAYER_SWF_VERSION = files.(@name == 'FlashPlayer' + FLASH_PLAYER_VERSION).@swfversion.toString();
if (!ADOBE_FB_GLOBALPLAYER_SWC_FILE || !ADOBE_FB_GLOBALPLAYER_SWC_URL) {
log(_viewResourceConstants.ERROR_INVALID_FLASH_PLAYER_SWC_URL);
keepGoing = false;
@@ -1030,13 +1033,19 @@ 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)) {
- var copyToFile:File = flexHomeFrameworksDir.resolvePath(file.name);
- file.copyTo(copyToFile, true);
+ var configFile:FileStream = new FileStream();
+ configFile.open(file, FileMode.UPDATE);
+ var contents:String = configFile.readMultiByte(configFile.bytesAvailable, "utf-8");
+ var playerVersion:RegExp = /<target-player>\d\d\.\d<\/target-player>/;
+ contents = contents.replace(playerVersion, "<target-player>" + FLASH_PLAYER_VERSION + "<\/target-player>");
+ var swfVersion:RegExp = /<swf-version>\d\d<\/swf-version>/;
+ contents = contents.replace(swfVersion, "<swf-version>" + FLASH_PLAYER_SWF_VERSION + "<\/swf-version>" );
+ configFile.writeMultiByte(contents, "utf-8");
+ var copyToFile:File = flexHomeFrameworksDir.resolvePath(file.name);
+ file.copyTo(copyToFile, true);
}
}
} catch (e:Error) {