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 2016/10/25 20:00:45 UTC
[1/2] git commit: [flex-asjs] [refs/heads/develop] - allow CI build
to use download cache in case true source is unavailable
Repository: flex-asjs
Updated Branches:
refs/heads/develop 4c9ab06a8 -> 4b7967018
allow CI build to use download cache in case true source is unavailable
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4b796701
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4b796701
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4b796701
Branch: refs/heads/develop
Commit: 4b796701864d8b12a601c205b1e72bad2219c847
Parents: 64d564f
Author: Alex Harui <ah...@apache.org>
Authored: Tue Oct 25 13:00:03 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Oct 25 13:00:42 2016 -0700
----------------------------------------------------------------------
frameworks/downloads.xml | 76 ++++++++++++++++++++++++++++++++++++++++---
1 file changed, 72 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b796701/frameworks/downloads.xml
----------------------------------------------------------------------
diff --git a/frameworks/downloads.xml b/frameworks/downloads.xml
index 6238641..220b3f9 100644
--- a/frameworks/downloads.xml
+++ b/frameworks/downloads.xml
@@ -55,8 +55,15 @@
<mkdir dir="${download.dir}"/>
<get src="https://codeload.github.com/swfobject/swfobject/zip/2.2"
- dest="${download.dir}/swfobject_2_2.zip"
- verbose="false"/>
+ dest="${download.dir}/swfobject_2_2.zip"
+ verbose="false" ignoreerrors="true"/>
+
+ <antcall target="get-from-cache-if-needed" >
+ <param name="filename" value="swfobject_2_2.zip" />
+ </antcall>
+ <antcall target="fail-if-not-found" >
+ <param name="filename" value="swfobject_2_2.zip" />
+ </antcall>
<unzip src="${download.dir}/swfobject_2_2.zip" dest="${FLEXJS_HOME}/templates/swfobject">
<patternset>
@@ -65,6 +72,7 @@
</patternset>
<flattenmapper />
</unzip>
+ <antcall target="swfobject-double-check" />
<mkdir dir="${FLEXJS_HOME}/templates/swfobject/history"/>
<copy toDir="${FLEXJS_HOME}/templates/swfobject/history" >
<fileset dir="${FLEXJS_HOME}/templates/swfobject/history">
@@ -83,6 +91,24 @@
</delete>
</target>
+ <target name="have-swfobject" >
+ <condition property="still-no-swfobject">
+ <not>
+ <available file="${FLEXJS_HOME}/templates/swfobject/swfobject.js" />
+ </not>
+ </condition>
+ </target>
+
+ <target name="swfobject-double-check" depends="have-swfobject" if="still-no-swfobject" description="some SWFObject zips have a different folder structure so if the first unzip doesn't work, try this one">
+ <unzip src="${download.dir}/swfobject_2_2.zip" dest="${FLEXJS_HOME}/templates/swfobject">
+ <patternset>
+ <include name="swfobject/expressInstall.swf"/>
+ <include name="swfobject/swfobject.js"/>
+ </patternset>
+ <flattenmapper />
+ </unzip>
+ </target>
+
<!-- flat ui fonts -->
<!-- Because this requires a network connection it downloads Flat UI fonts only if it doesn't already exist. -->
<target name="flat-ui-check" description="Checks if Flat UI fonts have been downloaded.">
@@ -125,7 +151,16 @@
<mkdir dir="${download.dir}"/>
<get src="https://github.com/designmodo/Flat-UI/archive/2.2.2.zip"
dest="${download.dir}/flat-ui_2_2.zip"
- verbose="false"/>
+ verbose="false" ignoreerrors="true"/>
+
+ <antcall target="get-from-cache-if-needed" >
+ <param name="filename" value="flat-ui_2_2.zip" />
+ <param name="destDir" value="${download.dir}" />
+ </antcall>
+ <antcall target="fail-if-not-found" >
+ <param name="filename" value="flat-ui_2_2.zip" />
+ <param name="destDir" value="${download.dir}" />
+ </antcall>
<mkdir dir="${FLEXJS_HOME}/frameworks/fonts"/>
<unzip src="${download.dir}/flat-ui_2_2.zip" dest="${FLEXJS_HOME}/frameworks/fonts">
@@ -158,8 +193,17 @@
<mkdir dir="${download.dir}"/>
<get src="https://github.com/google/closure-library/archive/master.zip"
dest="${download.dir}/google-closure-library-master.zip"
- verbose="false"/>
+ verbose="false" ignoreerrors="true"/>
+ <antcall target="get-from-cache-if-needed" >
+ <param name="filename" value="google-closure-library-master.zip" />
+ <param name="destDir" value="${download.dir}" />
+ </antcall>
+ <antcall target="fail-if-not-found" >
+ <param name="filename" value="google-closure-library-master.zip" />
+ <param name="destDir" value="${download.dir}" />
+ </antcall>
+
<mkdir dir="${FLEXJS_HOME}/js/lib/google/closure-library"/>
<unzip src="${download.dir}/google-closure-library-master.zip" dest="${FLEXJS_HOME}/js/lib/google/closure-library">
<cutdirsmapper dirs="1" />
@@ -225,4 +269,28 @@
value="${env.GOOG_HOME}" />
</target>
+ <target name="fail-if-not-found">
+ <fail message="${filename} could not be downloaded or found in cache">
+ <condition>
+ <not>
+ <available file="${download.dir}/${filename}" />
+ </not>
+ </condition>
+ </fail>
+ </target>
+
+ <target name="double-check-file" >
+ <condition property="still-no-file" value="true">
+ <and>
+ <not>
+ <available file="${download.dir}/${filename}" />
+ </not>
+ <isset property="env.FLEX_DOWNLOAD_CACHE" />
+ </and>
+ </condition>
+ <echo>Need file: ${still_no_file}</echo>
+ </target>
+ <target name="get-from-cache-if-needed" depends="double-check-file" if="still-no-file">
+ <copy file="${env.FLEX_DOWNLOAD_CACHE}/${filename}" tofile="${download.dir}/${filename}" />
+ </target>
</project>
[2/2] git commit: [flex-asjs] [refs/heads/develop] - change name so
the instance and static properties have different names. This was messing up
reflection info
Posted by ah...@apache.org.
change name so the instance and static properties have different names. This was messing up reflection info
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/64d564f8
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/64d564f8
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/64d564f8
Branch: refs/heads/develop
Commit: 64d564f8f90b177ff573215983cb9da6b0da29f5
Parents: 4c9ab06
Author: Alex Harui <ah...@apache.org>
Authored: Tue Oct 25 12:59:38 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Oct 25 13:00:42 2016 -0700
----------------------------------------------------------------------
.../HTML/src/main/flex/org/apache/flex/html/SimpleAlert.as | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/64d564f8/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/SimpleAlert.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/SimpleAlert.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/SimpleAlert.as
index 76160c0..0719036 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/SimpleAlert.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/SimpleAlert.as
@@ -103,7 +103,7 @@ package org.apache.flex.html
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function show(parent:Object) : void
+ public function showAlert(parent:Object) : void
{
parent.addElement(this);
}
@@ -125,7 +125,7 @@ package org.apache.flex.html
{
var alert:SimpleAlert = new SimpleAlert();
alert.message = message;
- alert.show(parent);
+ alert.showAlert(parent);
return alert;
}