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 2015/05/13 06:30:40 UTC
git commit: [flex-falcon] [refs/heads/develop] - try to handle
different slashes on different platforms
Repository: flex-falcon
Updated Branches:
refs/heads/develop 819717089 -> c8d14a6dd
try to handle different slashes on different platforms
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/c8d14a6d
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/c8d14a6d
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/c8d14a6d
Branch: refs/heads/develop
Commit: c8d14a6dd1cdd0de94921baeaca43d2526abc050
Parents: 8197170
Author: Alex Harui <ah...@apache.org>
Authored: Tue May 12 21:30:33 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue May 12 21:30:33 2015 -0700
----------------------------------------------------------------------
.../flex/compiler/internal/graph/GoogDepsWriter.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c8d14a6d/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java b/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
index a41f935..7dd7065 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
@@ -437,11 +437,17 @@ public class GoogDepsWriter {
}
}
+ String fwdClassPath = className.replace("_", "/");
+ String bckClassPath = className.replace("_", "\\");
for (ISWC swc : swcs)
{
- ISWCFileEntry fileEntry = swc.getFile("js/src/" + classPath + ".js");
+ ISWCFileEntry fileEntry = swc.getFile("js/src/" + fwdClassPath + ".js");
if (fileEntry == null)
- fileEntry = swc.getFile("js/out/" + classPath + ".js");
+ fileEntry = swc.getFile("js/out/" + fwdClassPath + ".js");
+ if (fileEntry == null)
+ fileEntry = swc.getFile("js/src/" + bckClassPath + ".js");
+ if (fileEntry == null)
+ fileEntry = swc.getFile("js/out/" + bckClassPath + ".js");
if (fileEntry != null)
{
fn = outputFolderPath + File.separator + classPath + ".js";