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 20:58:53 UTC
git commit: [flex-utilities] [refs/heads/develop] - Updated app to
look at remote config xml New config xml sdk-installer-config-3.1.xml added
that handles osmf.swc 2.0
Updated Branches:
refs/heads/develop aa0b8c790 -> cd97b8f7c
Updated app to look at remote config xml
New config xml sdk-installer-config-3.1.xml added that handles osmf.swc 2.0
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/cd97b8f7
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/cd97b8f7
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/cd97b8f7
Branch: refs/heads/develop
Commit: cd97b8f7c59140cd5aeaea33d6ddde4407d52805
Parents: aa0b8c7
Author: Om <bi...@gmail.com>
Authored: Thu Oct 17 11:58:08 2013 -0700
Committer: Om <bi...@gmail.com>
Committed: Thu Oct 17 11:58:08 2013 -0700
----------------------------------------------------------------------
installer/src/InstallApacheFlex.mxml | 4 ++--
installer/src/installer/sdk-installer-config-3.1.xml | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/cd97b8f7/installer/src/InstallApacheFlex.mxml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml
index 5868811..bab72ac 100644
--- a/installer/src/InstallApacheFlex.mxml
+++ b/installer/src/InstallApacheFlex.mxml
@@ -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();
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/cd97b8f7/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 6893156..b859a65 100644
--- a/installer/src/installer/sdk-installer-config-3.1.xml
+++ b/installer/src/installer/sdk-installer-config-3.1.xml
@@ -105,8 +105,9 @@ 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"/>
+ <!-- For OSMF, we are including the file name along with the url. This is to support the weird url format for OSMF2.0 which forces us to do the same -->
<!-- OSMF 1.x -->
- <file name="OSMF_SWC" path="http://opensource.adobe.com/svn/opensource/flex/sdk/branches/4.y/frameworks/libs/" file="osmf.swc"/>
+ <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"/>