You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by bi...@apache.org on 2014/10/15 22:13:56 UTC
[1/2] git commit: [flex-sdk] [refs/heads/develop] - Ignore
visualcomps folder
Repository: flex-sdk
Updated Branches:
refs/heads/develop 19df2d4c7 -> 201d56377
Ignore visualcomps folder
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/fe8077c5
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/fe8077c5
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/fe8077c5
Branch: refs/heads/develop
Commit: fe8077c5d0a4b99f61ea3f3136ba69f0c19fa4a6
Parents: 19df2d4
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Tue Oct 14 14:55:59 2014 -0700
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Wed Oct 15 13:05:41 2014 -0700
----------------------------------------------------------------------
.gitignore | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/fe8077c5/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 0eccc82..4ee07d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -137,3 +137,4 @@ air-sdk-description.xml
samples/descriptor-sample.xml
include/FlashRuntimeExtensions.h
+visualcomps
[2/2] git commit: [flex-sdk] [refs/heads/develop] - Fix for
https://issues.apache.org/jira/browse/FLEX-34610
Posted by bi...@apache.org.
Fix for https://issues.apache.org/jira/browse/FLEX-34610
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/201d5637
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/201d5637
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/201d5637
Branch: refs/heads/develop
Commit: 201d563779b2dc459509edcb486442319c48aab5
Parents: fe8077c
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Wed Oct 15 13:13:21 2014 -0700
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Wed Oct 15 13:13:21 2014 -0700
----------------------------------------------------------------------
modules/antTasks/src/flex/ant/types/FlexSwcFileSet.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/201d5637/modules/antTasks/src/flex/ant/types/FlexSwcFileSet.java
----------------------------------------------------------------------
diff --git a/modules/antTasks/src/flex/ant/types/FlexSwcFileSet.java b/modules/antTasks/src/flex/ant/types/FlexSwcFileSet.java
index 208cec9..7dce29d 100644
--- a/modules/antTasks/src/flex/ant/types/FlexSwcFileSet.java
+++ b/modules/antTasks/src/flex/ant/types/FlexSwcFileSet.java
@@ -33,7 +33,7 @@ public class FlexSwcFileSet extends FlexFileSet
super(spec, dirs);
}
- // Only accept directories, and *.swc files
+ // Only accept directories, *.swc and *.ane files
protected void addFiles(File base, String[] files, Commandline cmdl)
{
FileUtils utils = FileUtils.getFileUtils();
@@ -43,7 +43,7 @@ public class FlexSwcFileSet extends FlexFileSet
File f = utils.resolveFile(base, files[i]);
String absolutePath = f.getAbsolutePath();
- if( f.isFile() && !absolutePath.endsWith(".swc") )
+ if( f.isFile() && !absolutePath.endsWith(".swc") && !absolutePath.endsWith(".ane") )
continue;
if (spec != null)