You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jo...@apache.org on 2017/03/21 23:11:03 UTC
[26/50] git commit: [flex-falcon] [refs/heads/master] - Added support
for copying .svg and .jpeg files for js
Added support for copying .svg and .jpeg files for js
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/883bebd8
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/883bebd8
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/883bebd8
Branch: refs/heads/master
Commit: 883bebd8d0b75dfb7e1baa76f1eef18e33e651b0
Parents: da54fa9
Author: Harbs <ha...@in-tools.com>
Authored: Wed Feb 8 16:09:06 2017 +0200
Committer: Harbs <ha...@in-tools.com>
Committed: Wed Feb 8 16:09:06 2017 +0200
----------------------------------------------------------------------
.../internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java | 6 +++++-
.../apache/flex/compiler/internal/graph/GoogDepsWriter.java | 2 ++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/883bebd8/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
index 184248d..95eea2b 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
@@ -164,9 +164,13 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements IJSPublisher
FileFilterUtils.suffixFileFilter(".gif"));
IOFileFilter jpgSuffixFilter = FileFilterUtils.and(FileFileFilter.FILE,
FileFilterUtils.suffixFileFilter(".jpg"));
+ IOFileFilter jpegSuffixFilter = FileFilterUtils.and(FileFileFilter.FILE,
+ FileFilterUtils.suffixFileFilter(".jpeg"));
+ IOFileFilter svgSuffixFilter = FileFilterUtils.and(FileFileFilter.FILE,
+ FileFilterUtils.suffixFileFilter(".svg"));
IOFileFilter jsonSuffixFilter = FileFilterUtils.and(FileFileFilter.FILE,
FileFilterUtils.suffixFileFilter(".json"));
- IOFileFilter assetFiles = FileFilterUtils.or(pngSuffixFilter, jpgSuffixFilter, gifSuffixFilter,
+ IOFileFilter assetFiles = FileFilterUtils.or(pngSuffixFilter, jpgSuffixFilter, jpegSuffixFilter, svgSuffixFilter, gifSuffixFilter,
jsonSuffixFilter);
IOFileFilter resourceFilter = FileFilterUtils.or(DirectoryFileFilter.DIRECTORY, assetFiles);
// The source directory is the directory containing the Main class.
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/883bebd8/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
index 8b49a88..9b843b3 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
@@ -541,6 +541,8 @@ public class GoogDepsWriter {
if (included.contains(".png") ||
included.contains(".gif") ||
included.contains(".jpg") ||
+ included.contains(".jpeg") ||
+ included.contains(".svg") ||
included.contains(".json"))
{
fileEntry = includedfiles.get(included);