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 <[email protected]> Authored: Tue May 12 21:30:33 2015 -0700 Committer: Alex Harui <[email protected]> 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";
