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:09 UTC
[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.
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) {