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:24 UTC
[1/3] git commit: [flex-utilities] [refs/heads/develop] - Updated
RELEASE_NOTES
Updated Branches:
refs/heads/develop cd97b8f7c -> 1677255f6
Updated RELEASE_NOTES
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/edfe78e8
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/edfe78e8
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/edfe78e8
Branch: refs/heads/develop
Commit: edfe78e8ab708b0418e50a845041dbedfcb016bc
Parents: cd97b8f
Author: Om <bi...@gmail.com>
Authored: Thu Oct 17 22:11:24 2013 -0700
Committer: Om <bi...@gmail.com>
Committed: Thu Oct 17 22:11:24 2013 -0700
----------------------------------------------------------------------
installer/RELEASE_NOTES | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/edfe78e8/installer/RELEASE_NOTES
----------------------------------------------------------------------
diff --git a/installer/RELEASE_NOTES b/installer/RELEASE_NOTES
index f8ff063..35d9d1f 100644
--- a/installer/RELEASE_NOTES
+++ b/installer/RELEASE_NOTES
@@ -20,6 +20,11 @@ limitations under the License.
Apache Flex
Copyright 2013 The Apache Software Foundation
+Apache Flex SDK Installer 2.7
+1. Added support for OSMF2.0 [http://blogs.adobe.com/osmf/2012/03/osmf-2-0-now-available.html]
+ From Apache Flex 4.11.0 onwards, support for OSMF2.0 has been added.
+2. The osmf.swf RSL now gets generated by the Installer.
+
Apache Flex SDK Installer 2.6
Here is a list of significant issues that were fixed with this release:
1. Able to select which version of AIR and Flash Player to use.
[2/3] git commit: [flex-utilities] [refs/heads/develop] - Updated
build number and build properties
Posted by bi...@apache.org.
Updated build number and build properties
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/25c7db19
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/25c7db19
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/25c7db19
Branch: refs/heads/develop
Commit: 25c7db19e13f7a68387072efc305da3a42ad5484
Parents: edfe78e
Author: Om <bi...@gmail.com>
Authored: Thu Oct 17 22:12:05 2013 -0700
Committer: Om <bi...@gmail.com>
Committed: Thu Oct 17 22:12:05 2013 -0700
----------------------------------------------------------------------
installer/build.number | 2 +-
installer/build.properties | 4 ++--
installer/src/InstallApacheFlex-app.xml | 2 +-
installer/src/installer/sdk-installer-config-3.1.xml | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/25c7db19/installer/build.number
----------------------------------------------------------------------
diff --git a/installer/build.number b/installer/build.number
index e1dec45..c45a6ca 100644
--- a/installer/build.number
+++ b/installer/build.number
@@ -1,3 +1,3 @@
#Copyright 2013 The Apache Software Foundation.
#Sat, 28 Sep 2013 18:23:00 +1000
-build.number=1
+build.number=0
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/25c7db19/installer/build.properties
----------------------------------------------------------------------
diff --git a/installer/build.properties b/installer/build.properties
index f8bd45e..ba8e99c 100644
--- a/installer/build.properties
+++ b/installer/build.properties
@@ -19,10 +19,10 @@
-->
#nano version number is added by build script
-release.version=2.6
+release.version=2.7
#Flex Locations
-FLEX_HOME_WIN=C:/Program Files (x86)/Adobe/Adobe Flash Builder 4.6/sdks/4.10/
+FLEX_HOME_WIN=C:/Program Files (x86)/Adobe/Adobe Flash Builder 4.6/sdks/ApacheFlex4.10.0
FLEX_HOME_MAC=/Users/justinmclean/Documents/ApacheFlex4.10
#AIR Locations
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/25c7db19/installer/src/InstallApacheFlex-app.xml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex-app.xml b/installer/src/InstallApacheFlex-app.xml
index 4690414..27ee589 100644
--- a/installer/src/InstallApacheFlex-app.xml
+++ b/installer/src/InstallApacheFlex-app.xml
@@ -45,7 +45,7 @@
<!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade.
Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
An updated version of application must have a versionNumber value higher than the previous version. Required for namespace >= 2.5 . -->
- <versionNumber>2.6.1</versionNumber>
+ <versionNumber>2.7.0</versionNumber>
<!-- A string value (such as "v1", "2.5", or "Alpha 1") that represents the version of the application, as it should be shown to users. Optional. -->
<!-- <versionLabel></versionLabel> -->
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/25c7db19/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 b859a65..fb43315 100644
--- a/installer/src/installer/sdk-installer-config-3.1.xml
+++ b/installer/src/installer/sdk-installer-config-3.1.xml
@@ -110,7 +110,7 @@ limitations under the License.
<file name="OSMF_SWC" path="http://opensource.adobe.com/svn/opensource/flex/sdk/branches/4.y/frameworks/libs/osmf.swc" 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"/>
+ <file name="OSMF_SWC_2.0" path="http://switch.dl.sourceforge.net/project/osmf.adobe/OSMF%202.0%20Release%20%28final%20source%2C%20ASDocs%2C%20pdf%20guides%20and%20release%20notes%29/OSMF.swc" file="OSMF.swc"/>
</files>
</config>
[3/3] git commit: [flex-utilities] [refs/heads/develop] - Added
functionality to create osmf_..swf in the
frameworks/rsls directory
Posted by bi...@apache.org.
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>