flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject git commit: [flex-falcon] [refs/heads/develop] - fix apps that don't use remove-circulars
Date Tue, 28 Mar 2017 15:47:50 GMT
Repository: flex-falcon
Updated Branches:
  refs/heads/develop 6593d848a -> fce80f5f4


fix apps that don't use remove-circulars


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/fce80f5f
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/fce80f5f
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/fce80f5f

Branch: refs/heads/develop
Commit: fce80f5f46864e924bd14205e092f651a9aa5124
Parents: 6593d84
Author: Alex Harui <aharui@apache.org>
Authored: Tue Mar 28 08:47:36 2017 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Tue Mar 28 08:47:44 2017 -0700

----------------------------------------------------------------------
 .../apache/flex/compiler/internal/graph/GoogDepsWriter.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/fce80f5f/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 c8bbe16..8efaf77 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
@@ -133,10 +133,16 @@ public class GoogDepsWriter {
 			GoogDep gd = dps.get(i);
 			if (!isGoogClass(gd.className)) 
 			{
-				sb.append("goog.addDependency('").append(relativePath(gd.filePath)).append("', ['")
+				if (removeCirculars)
+					sb.append("goog.addDependency('").append(relativePath(gd.filePath)).append("', ['")
 						.append(gd.className).append("'], [")
 						.append((gd.fileInfo.impls != null) ? getDependencies(gd.fileInfo.impls) : "")
 						.append("]);\n");
+				else
+					sb.append("goog.addDependency('").append(relativePath(gd.filePath)).append("', ['")
+					.append(gd.className).append("'], [")
+					.append(getDependencies(gd.deps))
+					.append("]);\n");					
 			}
 		}
 		if (removeCirculars)


Mime
View raw message