flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [1/2] git commit: [flex-sdk] [refs/heads/develop] - FLEX-34533 fix installation of optional components
Date Wed, 10 Sep 2014 19:58:18 GMT
Repository: flex-sdk
Updated Branches:
  refs/heads/develop ec8b9bcce -> 572b3a8b3


FLEX-34533 fix installation of optional components


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/67f1f5d3
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/67f1f5d3
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/67f1f5d3

Branch: refs/heads/develop
Commit: 67f1f5d3c522c723e0325b3a4aed68e518cb5e3b
Parents: ec8b9bc
Author: Alex Harui <aharui@apache.org>
Authored: Tue Sep 9 22:37:12 2014 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Wed Sep 10 12:54:55 2014 -0700

----------------------------------------------------------------------
 apache-flex-sdk-installer-config.xml |  6 ++--
 installer.xml                        | 54 ++++++++++++++++++++++++-------
 2 files changed, 45 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/67f1f5d3/apache-flex-sdk-installer-config.xml
----------------------------------------------------------------------
diff --git a/apache-flex-sdk-installer-config.xml b/apache-flex-sdk-installer-config.xml
index edd5286..333893b 100755
--- a/apache-flex-sdk-installer-config.xml
+++ b/apache-flex-sdk-installer-config.xml
@@ -69,7 +69,7 @@
 			<zh_CN>SWFObject (必须的)</zh_CN>
 			<zh_TW>SWFObject (必須的)</zh_TW>
 		</step>
-		<step id="osmf-download" property="do.swfobject.install">
+		<step id="osmf-download" property="do.osmf.install">
 			<de_DE>OSMF (Benötigt)</de_DE>
 			<el_GR>OSMF (Απαιτούμενο)</el_GR>
 			<en_US>OSMF (Required)</en_US>
@@ -81,7 +81,7 @@
 			<zh_CN>OSMF (必须的)</zh_CN>
 			<zh_TW>OSMF (必須的)</zh_TW>
 		</step>
-		<step id="fontswf-download" property="do.swfobject.install">
+		<step id="fontswf-download" property="do.fontswf.install">
 			<de_DE>Adobe Bibliothek zur Einbettung von Schriften (Optional)</de_DE>
 			<el_GR>Adobe Embedded Font Libraries and Utilities (Προαιρετικό)</el_GR>
 			<en_US>Adobe Embedded Font Libraries and Utilities (Optional)</en_US>
@@ -93,7 +93,7 @@
 			<zh_CN>Adobe 镶入字体库和实用程序 (可选的)</zh_CN>
 			<zh_TW>Adobe 鑲入字體庫和實用程式 (可選的)</zh_TW>
 		</step>
-		<step id="blazeds-download" property="do.swfobject.install">
+		<step id="blazeds-download" property="do.blazeds.install">
 			<de_DE>Remoting Support (Optional)</de_DE>
 			<el_GR>Remoting Support (Προαιρετικό)</el_GR>
 			<en_US>Remoting Support (Optional)</en_US>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/67f1f5d3/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 6097703..6191ee3 100644
--- a/installer.xml
+++ b/installer.xml
@@ -334,10 +334,15 @@
     <target name="get-third-party-files" depends="air-download,flash-download,swfobject-download,osmf-download,fontswf-download,blazeds-download"
/>
     
     <target name="air-check" description="Checks if AIR SDK has been downloaded.">
-        <available file="${FLEX_HOME}/lib/adt.jar" property="air.jar.present"/>
+        <available file="${FLEX_HOME}/lib/adt.jar" property="skip.air.install"/>
+		<condition property="skip.air.install" value="true">
+			<not>
+				<isset property="do.air.install" />
+			</not>
+		</condition>
     </target>
     
-    <target name="air-download" depends="air-check" unless="air.jar.present"
+    <target name="air-download" depends="air-check" unless="skip.air.install"
         description="Downloads AIR SDK and copies to correct locations">
         
         <mkdir dir="${download.dir}"/>
@@ -549,10 +554,15 @@
 
     <!-- Because this requires a network connection it downloads Flash SDK only if it
doesn't already exist. -->
     <target name="flash-check" description="Checks if Flash SDK has been downloaded.">
-        <available file="${FLEX_HOME}/frameworks/libs/player/${flash.sdk.version}/playerglobal.swc"
property="flash.swc.present"/>
+        <available file="${FLEX_HOME}/frameworks/libs/player/${flash.sdk.version}/playerglobal.swc"
property="skip.flash.install"/>
+		<condition property="skip.flash.install" value="true">
+			<not>
+				<isset property="do.flash.install" />
+			</not>
+		</condition>
     </target>
     
-    <target name="flash-download" depends="flash-check" unless="flash.swc.present"
+    <target name="flash-download" depends="flash-check" unless="skip.flash.install"
         description="Downloads playerglobal.swc and copies to correct locations">
         
         <mkdir dir="${download.dir}"/>
@@ -580,10 +590,15 @@
     <!-- swfobject.js (Version 2.2) -->
     <!-- Because this requires a network connection it downloads SWFObject only if it
doesn't already exist. -->
     <target name="swfobject-check" description="Checks if SWFObject has been downloaded.">
-        <available file="${basedir}/../templates/swfobject/swfobject.js" property="swfobject.js.present"/>
+        <available file="${basedir}/../templates/swfobject/swfobject.js" property="skip.swfobject.install"/>
+		<condition property="skip.swfobject.install" value="true">
+			<not>
+				<isset property="do.swfobject.install" />
+			</not>
+		</condition>
     </target>
     
-    <target name="swfobject-download" depends="swfobject-check" unless="swfobject.js.present"
+    <target name="swfobject-download" depends="swfobject-check" unless="skip.swfobject.install"
         description="Copies SWFObject from code.google.com">
         
         <echo file="${basedir}/swfobject.properties">swfobject.echo=${INFO_DOWNLOADING_FILE_FROM}</echo>
@@ -623,10 +638,15 @@
     <!-- osmf (Version 2.0) -->
     <!-- Because this requires a network connection it downloads OSMF only if it doesn't
already exist. -->
     <target name="osmf-check" description="Checks if OSMF has been downloaded.">
-        <available file="${basedir}/frameworks/libs/osmf.swc" property="osmf.swc.present"/>
+        <available file="${basedir}/frameworks/libs/osmf.swc" property="skip.osmf.install"/>
+		<condition property="skip.osmf.install" value="true">
+			<not>
+				<isset property="do.osmf.install" />
+			</not>
+		</condition>
     </target>
     
-    <target name="osmf-download" depends="osmf-check" unless="osmf.swc.present"
+    <target name="osmf-download" depends="osmf-check" unless="skip.osmf.install"
         description="Copies OSMF from Open@Adobe">
         
         <echo file="${basedir}/osmf.properties">osmf.echo=${INFO_DOWNLOADING_FILE_FROM}</echo>
@@ -657,7 +677,7 @@
     <!-- fontswf -->
     <!-- Because this requires a network connection it downloads only if it doesn't already
exist. -->
     <target name="fontswf-check" description="Checks if fontswf has been downloaded.">
-        <condition property="fontswf.jars.present">
+        <condition property="skip.fontswf.install">
             <and>
                 <available file="${basedir}/lib/external/optional/afe.jar" />
                 <available file="${basedir}/lib/external/optional/aglj40.jar" />
@@ -665,9 +685,14 @@
                 <available file="${basedir}/lib/external/optional/rideau.jar" />
             </and>
         </condition>
+		<condition property="skip.fontswf.install" value="true">
+			<not>
+				<isset property="do.fontswf.install" />
+			</not>
+		</condition>
     </target>
 
-    <target name="fontswf-download" depends="fontswf-check" unless="fontswf.jars.present"
+    <target name="fontswf-download" depends="fontswf-check" unless="skip.fontswf.install"
         description="Copies OSMF from Open@Adobe">
         
         <echo file="${basedir}/afe.properties">afe.echo=${INFO_DOWNLOADING_FILE_FROM}</echo>
@@ -742,10 +767,15 @@
     <!-- BlazeDS  -->
     <!-- Because this requires a network connection it downloads BlazeDS only if it doesn't
already exist. -->
     <target name="blazeds-check" description="Checks if BlazeDS has been downloaded.">
-        <available file="${basedir}/external/optional/flex-messaging-common.jar" property="blazeds.jar.present"/>
+        <available file="${basedir}/external/optional/flex-messaging-common.jar" property="skip.blazeds.install"/>
+		<condition property="skip.blazeds.install" value="true">
+			<not>
+				<isset property="do.blazeds.install" />
+			</not>
+		</condition>
     </target>
 
-    <target name="blazeds-download" depends="blazeds-check" unless="blazeds.jar.present"
+    <target name="blazeds-download" depends="blazeds-check" unless="skip.blazeds.install"
         description="Copies BlazeDS from Open@Adobe">
         
         <echo file="${basedir}/blaze.properties">blaze.echo=${INFO_DOWNLOADING_FILE_FROM}</echo>


Mime
View raw message