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/18 07:14:26 UTC
[3/3] git commit: [flex-utilities] [refs/heads/develop] - Added
functionality to create osmf_..swf in the
frameworks/rsls directory
Added functionality to create osmf_<flexversion>.<buildnumber>.swf in the frameworks/rsls directory
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/1677255f
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/1677255f
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/1677255f
Branch: refs/heads/develop
Commit: 1677255f6982e2c379876f9efb2adec76b4d6c7c
Parents: 25c7db1
Author: Om <bi...@gmail.com>
Authored: Thu Oct 17 22:13:04 2013 -0700
Committer: Om <bi...@gmail.com>
Committed: Thu Oct 17 22:13:04 2013 -0700
----------------------------------------------------------------------
installer/src/InstallApacheFlex.mxml | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/1677255f/installer/src/InstallApacheFlex.mxml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml
index bab72ac..1589253 100644
--- a/installer/src/InstallApacheFlex.mxml
+++ b/installer/src/InstallApacheFlex.mxml
@@ -459,7 +459,9 @@ variables are not required because the locations of these pieces are known.
SWF_OBJECT_URL = files.(@name == 'swfobject').@path.toString();
//Supporting OSMF 2.0 from 4.11 onwards.
- if(APACHE_FLEX_BIN_DISTRO_VERSION != "4.11.0")
+ //if(APACHE_FLEX_BIN_DISTRO_VERSION != "4.11.0")
+ //TODO: We are having trouble downloading the osmf.swc v2.0 from the sourceforge mirrors. Disabling this till we sort that out
+ if(true)
{
OSMF_SWC_FILE = files.(@name == 'OSMF_SWC').@file.toString();
OSMF_SWC_URL = files.(@name == 'OSMF_SWC').@path.toString();
@@ -1317,10 +1319,15 @@ variables are not required because the locations of these pieces are known.
}
}
+ /**
+ * Unzip osmf.swc, extract library.swf from it and copy it into frameworks/rsls/osmf_<flexversion>.<buildnumber>
+ * Delete other files extracted from osmf.swc
+ */
protected function handleOSMFSWCUnzipped(event:Event):void
{
try {
- var copyToFile:File = _flexHomeDir.resolvePath("frameworks" + File.separator + "libs" + File.separator + OSMF_SWF_FILE);
+ var osmfFileName:String = "osmf_" + getFlexVersionBuildString() + ".swf";
+ var copyToFile:File = _flexHomeDir.resolvePath("frameworks" + File.separator + "rsls" + File.separator + osmfFileName);
var osmfLibrarySwfFile:File = _flexHomeDir.resolvePath("library.swf");
osmfLibrarySwfFile.moveTo(copyToFile);
var catalogXMLFile:File = _flexHomeDir.resolvePath("catalog.xml");
@@ -1837,6 +1844,16 @@ variables are not required because the locations of these pieces are known.
event.target.styleName = "linkText";
}
}
+
+ private function getFlexVersionBuildString():String
+ {
+ var flexPropertiesFile:File = _flexHomeDir.resolvePath("flex-sdk-description.xml");
+ var fs:FileStream = new FileStream();
+ fs.open(flexPropertiesFile, FileMode.READ);
+ var contents:XML = new XML(fs.readMultiByte(fs.bytesAvailable, "utf-8"));
+ fs.close();
+ return contents.version + "." + contents.build;
+ }
]]></fx:Script>
<fx:Declarations>