flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [6/9] git commit: [flex-falcon] [refs/heads/develop] - remove circulars option
Date Mon, 11 Jan 2016 18:04:49 GMT
remove circulars option


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

Branch: refs/heads/develop
Commit: a22bc07bb611d9d1e4d4620a38f2cd1429ff6880
Parents: 67ed780
Author: Alex Harui <aharui@apache.org>
Authored: Fri Jan 8 23:54:04 2016 -0800
Committer: Alex Harui <aharui@apache.org>
Committed: Fri Jan 8 23:54:04 2016 -0800

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


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a22bc07b/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 13108ff..4f255c1 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
@@ -50,6 +50,7 @@ public class GoogDepsWriter {
 	{
 		this.outputFolderPath = outputFolder.getAbsolutePath();
 		this.mainName = mainClassName;
+		removeCirculars = config.getRemoveCirculars();
 		otherPaths = config.getSDKJSLib();
 		otherPaths.add(new File(outputFolder.getParent(), "flexjs/FlexJS/src").getPath());
 		this.swcs = swcs;
@@ -64,6 +65,7 @@ public class GoogDepsWriter {
 	private String mainName;
 	private List<String> otherPaths;
 	private List<ISWC> swcs;
+	private boolean removeCirculars = false;
 	private boolean problemsFound = false;
 	private ArrayList<GoogDep> dps;
 	
@@ -147,7 +149,8 @@ public class GoogDepsWriter {
 		visited.put(current.className, current);
 		
 		filePathsInOrder.add(current.filePath);
-		//removeCirculars(current);
+		if (removeCirculars)
+			removeCirculars(current);
         System.out.println("Dependencies calculated for '" + current.filePath + "'");
 
 		ArrayList<String> deps = current.deps;


Mime
View raw message