You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2014/05/05 07:33:17 UTC
[1/3] git commit: [flex-sdk] [refs/heads/develop] - fix some bugs in
the air install and clean up 'in' folder if success
Repository: flex-sdk
Updated Branches:
refs/heads/develop 8350eb580 -> 6f4c21e6e
fix some bugs in the air install and clean up 'in' folder if success
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/5fe5608b
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/5fe5608b
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/5fe5608b
Branch: refs/heads/develop
Commit: 5fe5608b665ad773e86f19f57742de3309295669
Parents: 8350eb5
Author: Alex Harui <ah...@apache.org>
Authored: Sun May 4 21:33:53 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sun May 4 21:35:35 2014 -0700
----------------------------------------------------------------------
installer.xml | 28 +++++++++++++++++++++++++++-
1 file changed, 27 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5fe5608b/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 9e4547f..98c341d 100644
--- a/installer.xml
+++ b/installer.xml
@@ -115,6 +115,7 @@
<property name="do-not-cache-next-get" value="true" />
<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"/>
<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}" />
@@ -135,6 +136,7 @@
</target>
<target name="install" depends="get-data,check-binary,ask-licenses,get-third-party-files,fixup-config-files" description="Converts binary package to IDE compatible folder">
+ <delete dir="${download.dir}" />
<echo>${install.complete.echo}</echo>
</target>
@@ -330,11 +332,21 @@
<param name="destdir" value="${FLEX_HOME}" />
</antcall>
<antcall target="mac-copy-file">
+ <param name="srcdir" value="." />
+ <param name="filename" value="airsdk.xml"/>
+ <param name="destdir" value="${FLEX_HOME}" />
+ </antcall>
+ <antcall target="mac-copy-file">
<param name="srcdir" value="bin" />
<param name="filename" value="adl"/>
<param name="destdir" value="${FLEX_HOME}/bin" />
</antcall>
<antcall target="mac-copy-file">
+ <param name="srcdir" value="bin" />
+ <param name="filename" value="adt"/>
+ <param name="destdir" value="${FLEX_HOME}/bin" />
+ </antcall>
+ <antcall target="mac-copy-file">
<param name="srcdir" value="lib" />
<param name="filename" value="adt.jar"/>
<param name="destdir" value="${FLEX_HOME}/lib" />
@@ -388,6 +400,14 @@
<param name="srcdir" value="templates/air" />
<param name="destdir" value="${FLEX_HOME}/templates" />
</antcall>
+ <antcall target="mac-copy-dir">
+ <param name="srcdir" value="templates/extensions" />
+ <param name="destdir" value="${FLEX_HOME}/templates" />
+ </antcall>
+ <antcall target="mac-copy-dir">
+ <param name="srcdir" value="templates/sdk" />
+ <param name="destdir" value="${FLEX_HOME}/templates" />
+ </antcall>
</target>
<target name="mac-copy-file" description="copies a file">
@@ -494,9 +514,15 @@
<mkdir dir="${basedir}/frameworks/libs/"/>
<get src="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"
- dest="${basedir}/frameworks/libs/OSMF.swc"
+ dest="${basedir}/frameworks/libs/osmf.swc"
verbose="false"/>
+ <unzip src="${basedir}/frameworks/libs/osmf.swc" dest="${download.dir}">
+ <patternset>
+ <include name="library.swf"/>
+ </patternset>
+ </unzip>
+ <copy file="${download.dir}/library.swf" tofile="${FLEX_HOME}/frameworks/rsls/osmf_${flex-sdk-description.version}.${flex-sdk-description.build}.swf" />
</target>
<!-- fontswf -->
[3/3] git commit: [flex-sdk] [refs/heads/develop] - this file shows
up in rat
Posted by ah...@apache.org.
this file shows up in rat
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/6f4c21e6
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/6f4c21e6
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/6f4c21e6
Branch: refs/heads/develop
Commit: 6f4c21e6e736a37278c9e74ffed575ee956d155f
Parents: 82dcfde
Author: Alex Harui <ah...@apache.org>
Authored: Sun May 4 22:33:05 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sun May 4 22:33:05 2014 -0700
----------------------------------------------------------------------
build.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/6f4c21e6/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 9e9a3a8..40dfcb8 100644
--- a/build.xml
+++ b/build.xml
@@ -1799,6 +1799,7 @@ There are no known issues.
<!-- exclude batik manifests -->
<exclude name="modules/thirdparty/batik/sources/*.mf"/>
<!-- exclude text files -->
+ <exclude name="CONTRIBUTING"/>
<exclude name="modules/thirdparty/batik/lib/**/LICENSE*.txt"/>
<exclude name="modules/thirdparty/batik/lib/**/README*.txt"/>
<!-- exclude w3c sources -->
[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
Posted by ah...@apache.org.
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 <ah...@apache.org>
Authored: Sun May 4 22:30:06 2014 -0700
Committer: Alex Harui <ah...@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">