Updated Branches: refs/heads/develop f57d54194 -> eda5f959f
Installer badge now supports sdk-installer-config-3.0.xml and hence Flex 4.10.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/eda5f959 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/eda5f959 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/eda5f959 Branch: refs/heads/develop Commit: eda5f959f14de6f78d92a345ce82ca8efc89351d Parents: f57d541 Author: Om <bigosma...@gmail.com> Authored: Mon Aug 5 11:45:24 2013 -0700 Committer: Om <bigosma...@gmail.com> Committed: Mon Aug 5 11:45:24 2013 -0700 ---------------------------------------------------------------------- installerBadge/.actionScriptProperties | 6 +++--- installerBadge/src/InstallApacheFlexBadge.mxml | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/eda5f959/installerBadge/.actionScriptProperties ---------------------------------------------------------------------- diff --git a/installerBadge/.actionScriptProperties b/installerBadge/.actionScriptProperties index c9e2451..991a460 100644 --- a/installerBadge/.actionScriptProperties +++ b/installerBadge/.actionScriptProperties @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<actionScriptProperties analytics="false" mainApplicationPath="InstallApacheFlexBadge.mxml" projectUUID="86e06d97-9ac5-4d36-a8ab-9da6d44644d9" version="10"> - <compiler additionalCompilerArguments="-locale en_US" autoRSLOrdering="true" copyDependentFiles="true" fteInMXComponents="false" generateAccessible="true" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="false" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin-debug" removeUnusedRSL="true" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true" warn="true"> +<actionScriptProperties analytics="false" mainApplicationPath="InstallApacheFlexBadge.mxml" projectUUID="86e06d97-9ac5-4d36-a8ab-9da6d44644d9" version="11"> + <compiler additionalCompilerArguments="-locale en_US" autoRSLOrdering="true" copyDependentFiles="true" fteInMXComponents="false" generateAccessible="true" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="false" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin-debug" removeUnusedRSL="true" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="false" useDebugRSLSwfs="true" useFlashSDK="false" verifyDigests="true" warn="true"> <compilerSourcePath> <compilerSourcePathEntry kind="1" linkType="1" path="/common/src"/> </compilerSourcePath> @@ -11,7 +11,6 @@ <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/core.swc" useDefaultLinkType="false"/> </excludedEntries> </libraryPathEntry> - <libraryPathEntry kind="1" linkType="1" path="libs"/> </libraryPath> <sourceAttachmentPath/> </compiler> @@ -19,6 +18,7 @@ <application path="InstallApacheFlexBadge.mxml"/> </applications> <modules/> + <workers/> <buildCSSFiles/> <flashCatalyst validateFlashCatalystCompatibility="false"/> </actionScriptProperties> http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/eda5f959/installerBadge/src/InstallApacheFlexBadge.mxml ---------------------------------------------------------------------- diff --git a/installerBadge/src/InstallApacheFlexBadge.mxml b/installerBadge/src/InstallApacheFlexBadge.mxml index 453a65a..aca734f 100644 --- a/installerBadge/src/InstallApacheFlexBadge.mxml +++ b/installerBadge/src/InstallApacheFlexBadge.mxml @@ -161,8 +161,9 @@ limitations under the License. { var configXML:XML = XML(_internetUtil.result); var files:XMLList = configXML.files.file; + var defaultFlexVersion:String = files.(@name == "FlexVersions").@default.toString(); - _sdkBinaryFileName = files.(@name == "ApacheFlexSDK").@file.toString(); + _sdkBinaryFileName = files.(@name == defaultFlexVersion).@file.toString(); _installerFileName = files.(@name == 'SDKInstallerApp').@file.toString(); _installerDownloadPath = files.(@name == 'SDKInstallerApp').@path.toString();
