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/04/13 08:47:15 UTC
[1/3] git commit: [flex-asjs] [refs/heads/develop] - fix nightly
Repository: flex-asjs
Updated Branches:
refs/heads/develop 7e660ea7f -> ba6eda56c
fix nightly
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ba6eda56
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ba6eda56
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ba6eda56
Branch: refs/heads/develop
Commit: ba6eda56c59331554cd62dc669f2837e8cb1e2c4
Parents: 3f065a2
Author: Alex Harui <ah...@apache.org>
Authored: Tue Apr 12 23:46:46 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Apr 12 23:47:06 2016 -0700
----------------------------------------------------------------------
nightly.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba6eda56/nightly.properties
----------------------------------------------------------------------
diff --git a/nightly.properties b/nightly.properties
index 3b96ceb..90de624 100644
--- a/nightly.properties
+++ b/nightly.properties
@@ -23,7 +23,7 @@ nightly = true
falcon.server.url = http://apacheflexbuild.cloudapp.net:8080
falcon.md5.server.url = http://apacheflexbuild.cloudapp.net:8080
falcon.folder = job/flex-falcon/lastSuccessfulBuild/artifact/out
-falcon.version = 0.6.0
+falcon.version = 0.7.0
#need this until Installer 3.2 comes out
#jburg.server=http://downloads.sourceforge.net
#jburg.folder=project/jburg
[3/3] git commit: [flex-asjs] [refs/heads/develop] - eliminate
duplicate download
Posted by ah...@apache.org.
eliminate duplicate download
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/667dd46a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/667dd46a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/667dd46a
Branch: refs/heads/develop
Commit: 667dd46ae564a3f4ba2fe53e56d2524c07a6ee1f
Parents: 7e660ea
Author: Alex Harui <ah...@apache.org>
Authored: Tue Apr 12 22:20:47 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Apr 12 23:47:06 2016 -0700
----------------------------------------------------------------------
build.xml | 2 ++
frameworks/build.xml | 4 +++-
frameworks/downloads.xml | 7 +++----
3 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/667dd46a/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 43e0a6a..941b75d 100644
--- a/build.xml
+++ b/build.xml
@@ -179,6 +179,8 @@
<!-- <ant dir="${basedir}/frameworks/js" target="thirdparty-downloads"/> -->
<!-- don't ask again about these since we just did if these weren't already set -->
<property name="build.noprompt" value="set" />
+ <!-- this flag is used by frameworks/build.xml to prevent a second download -->
+ <property name="no.thirdparty-downloads" value="set" />
</target>
<target name="prebuild" depends="check-compile-env,thirdparty-downloads,create-description,create-config"
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/667dd46a/frameworks/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/build.xml b/frameworks/build.xml
index 8d7b174..c6c8a5e 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -157,7 +157,9 @@
<!-- Delete only if it exists and it is empty. air and swfobject put dirs here. -->
<delete dir="${FLEXJS_HOME}/templates" includeemptydirs="true" failonerror="false">
<exclude name="swfobject/index.template.html" />
- </delete>
+ <exclude name="swfobject/expressInstall.swf" />
+ <exclude name="swfobject/swfobject.js" />
+ </delete>
</target>
<target name="Binding" description="Clean build of Binding.swc">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/667dd46a/frameworks/downloads.xml
----------------------------------------------------------------------
diff --git a/frameworks/downloads.xml b/frameworks/downloads.xml
index ac9e0fb..7fc12b1 100644
--- a/frameworks/downloads.xml
+++ b/frameworks/downloads.xml
@@ -79,9 +79,9 @@
</delete>
</target>
- <!-- swfobject.js (Version 2.2) -->
- <!-- Because this requires a network connection it downloads SWFObject only if it doesn't already exist. -->
- <target name="flat-ui-check" description="Checks if SWFObject has been downloaded.">
+ <!-- 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.">
<available file="${FLEXJS_HOME}/frameworks/fonts/flat-ui-icons-regular.ttf" property="flat.donot.ask"/>
<condition property="flat.donot.ask">
<isset property="build.noprompt"/>
@@ -118,7 +118,6 @@
description="Copies FlatUI from github" />
<target name="get-flat-fonts" depends="ask-flat" if="do.flat.install" >
-
<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"
[2/3] git commit: [flex-asjs] [refs/heads/develop] - strip down GCL
to only the files we need
Posted by ah...@apache.org.
strip down GCL to only the files we need
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/3f065a27
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/3f065a27
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/3f065a27
Branch: refs/heads/develop
Commit: 3f065a274a399801c36c49b82fc4f8b73c89f4bf
Parents: 667dd46
Author: Alex Harui <ah...@apache.org>
Authored: Tue Apr 12 23:25:09 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Apr 12 23:47:06 2016 -0700
----------------------------------------------------------------------
frameworks/build.xml | 1 +
frameworks/downloads.xml | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3f065a27/frameworks/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/build.xml b/frameworks/build.xml
index c6c8a5e..ea42384 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -159,6 +159,7 @@
<exclude name="swfobject/index.template.html" />
<exclude name="swfobject/expressInstall.swf" />
<exclude name="swfobject/swfobject.js" />
+ <exclude name="swfobject/history/**" />
</delete>
</target>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3f065a27/frameworks/downloads.xml
----------------------------------------------------------------------
diff --git a/frameworks/downloads.xml b/frameworks/downloads.xml
index 7fc12b1..0b3909a 100644
--- a/frameworks/downloads.xml
+++ b/frameworks/downloads.xml
@@ -75,6 +75,7 @@
<fileset dir="${FLEXJS_HOME}/templates/swfobject">
<include name="**/**"/>
<exclude name="index.template.html"/>
+ <exclude name="history/**"/>
</fileset>
</delete>
</target>
@@ -160,8 +161,45 @@
<unzip src="${download.dir}/google-closure-library-master.zip" dest="${FLEXJS_HOME}/js/lib/google/closure-library">
<cutdirsmapper dirs="1" />
</unzip>
+ <property name="GOOG_DIR" value="${FLEXJS_HOME}/js/lib/google/closure-library" />
+ <antcall target="subset-goog" />
</target>
+ <target name="subset-goog" >
+ <property name="GOOG_DIR" value="${GOOG_HOME}" />
+ <delete failonerror="false">
+ <!-- we only need base.js, eventtarget.js and their dependencies -->
+ <fileset dir="${GOOG_DIR}">
+ <include name="**"/>
+ <exclude name="closure/goog/array/array.js"/>
+ <exclude name="closure/goog/asserts/asserts.js"/>
+ <exclude name="closure/goog/base.js"/>
+ <exclude name="closure/goog/debug/entrypointregistry.js"/>
+ <exclude name="closure/goog/debug/error.js"/>
+ <exclude name="closure/goog/disposable/disposable.js"/>
+ <exclude name="closure/goog/disposable/idisposable.js"/>
+ <exclude name="closure/goog/dom/nodetype.js"/>
+ <exclude name="closure/goog/events/browserevent.js"/>
+ <exclude name="closure/goog/events/browserfeature.js"/>
+ <exclude name="closure/goog/events/event.js"/>
+ <exclude name="closure/goog/events/eventid.js"/>
+ <exclude name="closure/goog/events/events.js"/>
+ <exclude name="closure/goog/events/eventtarget.js"/>
+ <exclude name="closure/goog/events/eventtype.js"/>
+ <exclude name="closure/goog/events/listenable.js"/>
+ <exclude name="closure/goog/events/listener.js"/>
+ <exclude name="closure/goog/events/listenermap.js"/>
+ <exclude name="closure/goog/labs/useragent/browser.js"/>
+ <exclude name="closure/goog/labs/useragent/engine.js"/>
+ <exclude name="closure/goog/labs/useragent/platform.js"/>
+ <exclude name="closure/goog/labs/useragent/util.js"/>
+ <exclude name="closure/goog/object/object.js"/>
+ <exclude name="closure/goog/reflect/reflect.js"/>
+ <exclude name="closure/goog/string/string.js"/>
+ <exclude name="closure/goog/useragent/useragent.js"/>
+ </fileset>
+ </delete>
+ </target>
<target name="gcl-clean" description="Deletes Google Closure Library">
<echo message="Deleting Google Closure Library"/>
<delete dir="${FLEXJS_HOME}/js/lib" failonerror="false" />