flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [2/3] git commit: [flex-sdk] [refs/heads/develop] - more installer fixes. swfobject now goes in the right javascript folder, pick up default player and air versions from sdk-installer-config-4.0.xml
Date Mon, 05 May 2014 05:33:18 GMT
more installer fixes.  swfobject now goes in the right javascript folder, pick up default player
and air versions from sdk-installer-config-4.0.xml


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

Branch: refs/heads/develop
Commit: 82dcfdee74d4d27bc48ee6a7bb573f0fdc8ca329
Parents: 5fe5608
Author: Alex Harui <aharui@apache.org>
Authored: Sun May 4 22:30:06 2014 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Sun May 4 22:30:06 2014 -0700

----------------------------------------------------------------------
 installer.xml | 39 +++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/82dcfdee/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 98c341d..2b86c5c 100644
--- a/installer.xml
+++ b/installer.xml
@@ -43,9 +43,6 @@
     <property file="${FLEX_HOME}/installer.properties/en_US.properties"/>
     <property name="download.dir" value="${FLEX_HOME}/in"/>
     
-    <property name="air.sdk.version" value="13.0"/>
-    <property name="flash.sdk.version" value="13.0"/>
-    
     <property name="xml.properties" value="http://flex.apache.org/installer/sdk-installer-config-4.0.xml"
/>
     
     <condition property="platform" value="mac">
@@ -91,17 +88,6 @@
         <isset property="installer" />
     </condition>
     
-    <condition property="flash.version.changed" value="true">
-        <not>
-            <equals arg1="${playerglobal.version}" arg2="${flash.sdk.version}" />
-        </not>
-    </condition>
-    <condition property="air.version.changed" value="true">
-        <not>
-            <equals arg1="${air.version}" arg2="${air.sdk.version}" />
-        </not>
-    </condition>
-    
     <condition property="java.home" value="${env.JAVA_HOME}">
         <and>
             <available file="${env.JAVA_HOME}" type="dir" />
@@ -116,6 +102,26 @@
         <get src="${xml.properties}" dest="${basedir}/sdk-installer-config-4.0.xml" />
         <xmlproperty file="${basedir}/sdk-installer-config-4.0.xml" semanticAttributes="true"
collapseAttributes="true"/>
         <xmlproperty file="${basedir}/flex-sdk-description.xml" semanticAttributes="true"
collapseAttributes="true"/>
+        <condition property="air.sdk.version" value="${config.airsdk.linux.versions.default}">
+            <equals arg1="${platform}" arg2="linux" />
+        </condition>
+        <condition property="air.sdk.version" value="${config.airsdk.windows.versions.default}">
+            <equals arg1="${platform}" arg2="windows" />
+        </condition>
+        <condition property="air.sdk.version" value="${config.airsdk.mac.versions.default}">
+            <equals arg1="${platform}" arg2="mac" />
+        </condition>
+        <property name="flash.sdk.version" value="${config.flashsdk.versions.default}"/>
+        <condition property="flash.version.changed" value="true">
+            <not>
+                <equals arg1="${playerglobal.version}" arg2="${flash.sdk.version}" />
+            </not>
+        </condition>
+        <condition property="air.version.changed" value="true">
+            <not>
+                <equals arg1="${air.version}" arg2="${air.sdk.version}" />
+            </not>
+        </condition>
         <property name="air.sdk.url.path.ref" value="air.sdk.path.${platform}.${air.sdk.version}"
/>
         <property name="air.sdk.url.path" refid="${air.sdk.url.path.ref}" />
         <property name="air.sdk.url.file.ref" value="air.sdk.file.${platform}.${air.sdk.version}"
/>
@@ -494,6 +500,8 @@
                 <include name="swfobject/swfobject.js"/>
             </patternset>
         </unzip>
+        <mkdir dir="${FLEX_HOME}/frameworks/javascript/fabridge/samples/fabridge/swfobject"
/>
+        <copy file="${FLEX_HOME}/templates/swfobject/swfobject.js" todir="${FLEX_HOME}/frameworks/javascript/fabridge/samples/fabridge/swfobject"
/>
     </target>
     
     <!-- osmf (Version 2.0) -->
@@ -630,6 +638,9 @@
             <replacefilter token="{airHome}/frameworks/libs"
             value="libs"/>
         </replace>
+        <copy file="${FLEX_HOME}/frameworks/flex-config.xml" todir="${FLEX_HOME}/ide/flashbuilder/config"
overwrite="true" />
+        <copy file="${FLEX_HOME}/frameworks/air-config.xml" todir="${FLEX_HOME}/ide/flashbuilder/config"
overwrite="true" />
+        <copy file="${FLEX_HOME}/frameworks/airmobile-config.xml" todir="${FLEX_HOME}/ide/flashbuilder/config"
overwrite="true" />
     </target>
     
     <target name="fixup-config-files-version" if="flash.version.changed">


Mime
View raw message