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/29 17:23:33 UTC
[1/2] git commit: [flex-falcon] [refs/heads/develop] - tuning the
release packages
Repository: flex-falcon
Updated Branches:
refs/heads/develop dcbf18a73 -> f51b537af
tuning the release packages
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/f51b537a
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/f51b537a
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/f51b537a
Branch: refs/heads/develop
Commit: f51b537afc189d51a1e3b85c6b5bcd1e4291f4b4
Parents: c1da45f
Author: Alex Harui <ah...@apache.org>
Authored: Fri Apr 29 08:23:16 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Apr 29 08:23:29 2016 -0700
----------------------------------------------------------------------
ApproveFalcon.xml | 8 +++++---
build.xml | 36 +++++++++++++++++++++++++++++++-----
externs/createjs/build.xml | 13 ++++++-------
3 files changed, 42 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f51b537a/ApproveFalcon.xml
----------------------------------------------------------------------
diff --git a/ApproveFalcon.xml b/ApproveFalcon.xml
index 51c4e56..b981cd1 100644
--- a/ApproveFalcon.xml
+++ b/ApproveFalcon.xml
@@ -189,7 +189,7 @@
<delete file="jars.txt" />
<!-- this is a comma-delimited, no spaces, no-line-breaks list used to decide which jars
to skip in the rat-check of the binaries and which jars to examine before approval -->
- <property name="jars-list" value="compiler/generated/dist/sdk/ant/lib/falcon-flexTasks.jar,compiler/generated/dist/sdk/lib/compc.jar,compiler/generated/dist/sdk/lib/compiler.jar,compiler/generated/dist/sdk/lib/falcon-asc.jar,compiler/generated/dist/sdk/lib/falcon-compc.jar,compiler/generated/dist/sdk/lib/falcon-flexTasks.jar,compiler/generated/dist/sdk/lib/falcon-mxmlc.jar,compiler/generated/dist/sdk/lib/falcon-optimizer.jar,compiler/generated/dist/sdk/lib/falcon-swfdump.jar,compiler/generated/dist/sdk/lib/fdb.jar,compiler/generated/dist/sdk/lib/flex-compiler-oem.jar,compiler/generated/dist/sdk/lib/swfutils.jar,js/lib/compc.jar,js/lib/externc.jar,js/lib/jsc.jar,js/lib/mxmlc.jar"/>
+ <property name="jars-list" value="compiler/lib/falcon-flexTasks.jar,compiler/lib/compc.jar,compiler/lib/compiler.jar,compiler/lib/falcon-asc.jar,compiler/lib/falcon-compc.jar,compiler/lib/falcon-flexTasks.jar,compiler/lib/falcon-mxmlc.jar,compiler/lib/falcon-optimizer.jar,compiler/lib/falcon-swfdump.jar,compiler/lib/fdb.jar,compiler/lib/flex-compiler-oem.jar,compiler/lib/swfutils.jar,js/lib/compc.jar,js/lib/externc.jar,js/lib/jsc.jar,js/lib/mxmlc.jar"/>
<echo file="${basedir}/jars.txt" message="${jars-list}"/>
<echo file="${basedir}/jarexcludes.txt" message="${jars-list}"/>
<replaceregexp file="${basedir}/jarexcludes.txt" match="," flags="g" replace="${line.separator}" />
@@ -375,8 +375,10 @@
<exclude name="NOTICE.fdb"/>
<exclude name="NOTICE.oem"/>
<exclude name="NOTICE.swfutils"/>
- <exclude name="externs/js/externs/svg.js" />
- <exclude name="externs/createjs/externs/**/*.js" />
+ <exclude name="compiler/target/generated-sources/**" />
+ <exclude name="externs/js/target/downloads/svg.js" />
+ <exclude name="externs/createjs/target/downloads/**" />
+ <exclude name="externs//**/*.swc" />
<exclude name="js/libs/cordova.swc"/>
<exclude name="js/libs/createjs.swc"/>
<exclude name="js/libs/GCL.swc"/>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f51b537a/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 13f5e63..bb185d5 100644
--- a/build.xml
+++ b/build.xml
@@ -324,22 +324,37 @@
</target>
<target name="stage-fb-integration">
+ <ant dir="${basedir}/debugger" target="downloads" />
+ <delete>
+ <fileset dir="${basedir}/debugger/target/downloads">
+ <include name="*.tar.gz"/>
+ </fileset>
+ </delete>
<copy todir="${basedir}/temp/debugger" includeEmptyDirs="false">
<fileset dir="${basedir}/debugger">
<include name="**"/>
<exclude name=".classpath" />
<exclude name=".project" />
<exclude name=".settings/**" />
- <exclude name="target/**"/>
+ <exclude name="target/flex/**"/>
+ <exclude name="target/flash/**"/>
+ <exclude name="target/generated-sources/**"/>
+ <exclude name="target/META-INF/**"/>
</fileset>
</copy>
+ <ant dir="${basedir}/flex-compiler-oem" target="downloads" />
+ <delete>
+ <fileset dir="${basedir}/flex-compiler-oem/target/downloads">
+ <include name="*.tar.gz"/>
+ </fileset>
+ </delete>
<copy todir="${basedir}/temp/flex-compiler-oem" includeEmptyDirs="false">
<fileset dir="${basedir}/flex-compiler-oem">
<include name="**"/>
<exclude name=".classpath" />
<exclude name=".project" />
<exclude name=".settings/**" />
- <exclude name="target/**"/>
+ <exclude name="target/classes/**"/>
</fileset>
</copy>
</target>
@@ -348,6 +363,10 @@
<copy todir="${basedir}/temp/externs" includeEmptyDirs="false">
<fileset dir="${basedir}/externs">
<include name="**"/>
+ <exclude name="**/target/generated-sources/**" />
+ <exclude name="**/target/downloads/*.zip" />
+ <exclude name="**/target/downloads/EaselJS*/**" />
+ <exclude name="**/target/downloads/TweenJS*/**" />
</fileset>
</copy>
</target>
@@ -441,7 +460,7 @@
<copy todir="${basedir}/temp/compiler/lib">
<fileset dir="${basedir}/compiler/lib">
<include name="**"/>
- <exclude name="lib/external/**"/>
+ <exclude name="external/**"/>
<exclude name="**/env.properties"/>
</fileset>
</copy>
@@ -468,6 +487,7 @@
<exclude name="lib/args4j**"/>
<exclude name="lib/guava**"/>
<exclude name="lib/org.json**"/>
+ <exclude name="lib/junit**"/>
</fileset>
</copy>
@@ -484,13 +504,19 @@
<!-- generated -->
<mkdir dir="${basedir}/temp/externs"/>
- <copy todir="${basedir}/temp/externs">
+ <copy todir="${basedir}/temp/externs" includeEmptyDirs="false">
<fileset dir="${basedir}/externs">
<include name="**/**"/>
<exclude name="**/*.swc"/>
<exclude name="**/*.as"/>
<exclude name="createjs/target/**"/>
- <exclude name="createjs/in/**"/>
+ </fileset>
+ </copy>
+ <echo>copy easel and tween</echo>
+ <copy todir="${basedir}/temp/externs" includeEmptyDirs="false">
+ <fileset dir="${basedir}/externs">
+ <include name="createjs/target/downloads/Easel*/src/**"/>
+ <include name="createjs/target/downloads/Tween*/src/**"/>
</fileset>
</copy>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f51b537a/externs/createjs/build.xml
----------------------------------------------------------------------
diff --git a/externs/createjs/build.xml b/externs/createjs/build.xml
index e093eff..1d6690a 100644
--- a/externs/createjs/build.xml
+++ b/externs/createjs/build.xml
@@ -27,15 +27,15 @@
<target name="main" depends="download, download_tween, preprocess, externc, postprocess, compc" />
<target name="download" >
- <mkdir dir="${basedir}/in" />
+ <mkdir dir="${basedir}/target/downloads" />
<get src="https://github.com/CreateJS/EaselJS/archive/${createjs.version}.zip"
- dest="${basedir}/in/easel-${createjs.version}.zip" skipexisting="true"/>
+ dest="${basedir}/target/downloads/easel-${createjs.version}.zip" skipexisting="true"/>
</target>
<target name="download_tween" >
- <mkdir dir="${basedir}/in" />
+ <mkdir dir="${basedir}/target/downloads" />
<get src="https://github.com/CreateJS/TweenJS/archive/${tweenjs.version}.zip"
- dest="${basedir}/in/tween-${tweenjs.version}.zip" skipexisting="true"/>
+ dest="${basedir}/target/downloads/tween-${tweenjs.version}.zip" skipexisting="true"/>
</target>
<!-- createjs files have certain patterns that fool our compilers.
@@ -231,7 +231,7 @@
<target name="expandzip">
<mkdir dir="${basedir}/target/downloads" />
<delete dir="${basedir}/target/downloads/EaselJS-${createjs.version}" />
- <unzip src="${basedir}/in/easel-${createjs.version}.zip"
+ <unzip src="${basedir}/target/downloads/easel-${createjs.version}.zip"
dest="${basedir}/target/downloads">
</unzip>
</target>
@@ -239,7 +239,7 @@
<target name="expandzip_tween">
<mkdir dir="${basedir}/target/downloads" />
<delete dir="${basedir}/target/downloads/TweenJS-${tweenjs.version}" />
- <unzip src="${basedir}/in/tween-${tweenjs.version}.zip"
+ <unzip src="${basedir}/target/downloads/tween-${tweenjs.version}.zip"
dest="${basedir}/target/downloads">
</unzip>
</target>
@@ -374,7 +374,6 @@
<target name="wipe">
<delete dir="${basedir}/target" />
- <delete dir="${basedir}/in" />
</target>
</project>
[2/2] git commit: [flex-falcon] [refs/heads/develop] - fix build
Posted by ah...@apache.org.
fix build
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/c1da45f1
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/c1da45f1
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/c1da45f1
Branch: refs/heads/develop
Commit: c1da45f1eb7559838973b46f1276f8f95dbc2f42
Parents: dcbf18a
Author: Alex Harui <ah...@apache.org>
Authored: Fri Apr 29 08:20:45 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Apr 29 08:23:29 2016 -0700
----------------------------------------------------------------------
.../internal/codegen/externals/reference/ClassReference.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c1da45f1/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/reference/ClassReference.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/reference/ClassReference.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/reference/ClassReference.java
index f2131a5..44e1e6b 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/reference/ClassReference.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/reference/ClassReference.java
@@ -449,13 +449,16 @@ public class ClassReference extends BaseReference
public List<ClassReference> getSuperClasses()
{
ArrayList<ClassReference> result = new ArrayList<ClassReference>();
+ if (isInterface())
+ {
+ return getExtendedInterfaces();
+ }
ClassReference superClass = getSuperClass();
while (superClass != null)
{
result.add(superClass);
superClass = superClass.getSuperClass();
}
-
return result;
}