flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [3/3] git commit: [flex-falcon] [refs/heads/develop] - fix include-source and include-classes handling in COMPJSC
Date Mon, 16 Jun 2014 20:15:06 GMT
fix include-source and include-classes handling in COMPJSC


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

Branch: refs/heads/develop
Commit: a181cf276dbbcfac7d9f6f213e711195d6cfebfd
Parents: 0445bf3
Author: Alex Harui <aharui@apache.org>
Authored: Mon Jun 16 13:14:51 2014 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Mon Jun 16 13:14:51 2014 -0700

----------------------------------------------------------------------
 .../internal/config/FlashBuilderConfigurator.java     | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a181cf27/compiler/src/org/apache/flex/compiler/internal/config/FlashBuilderConfigurator.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/config/FlashBuilderConfigurator.java
b/compiler/src/org/apache/flex/compiler/internal/config/FlashBuilderConfigurator.java
index 654517b..8424427 100644
--- a/compiler/src/org/apache/flex/compiler/internal/config/FlashBuilderConfigurator.java
+++ b/compiler/src/org/apache/flex/compiler/internal/config/FlashBuilderConfigurator.java
@@ -376,12 +376,20 @@ public class FlashBuilderConfigurator
                 if (h.allClasses)
                 {
                     // may need to find and list all classes
-                    fbArgs.add("-include-sources=src");
+                    fbArgs.add("-include-sources=" + fbFolder + "/src");
                 }
                 else
                 {
-                    String classes = h.includedClasses.toString();
-                    fbArgs.add("-include-classes=" + classes);
+                    StringBuilder classList = new StringBuilder();
+                    boolean first = true;
+                    for (String cname : h.includedClasses)
+                    {
+                        if (!first)
+                            classList.append(", ");
+                        first = false;
+                        classList.append(cname);
+                    }
+                    fbArgs.add("-include-classes=" + classList.toString());
                 }
             }
             catch (SAXConfigurationException e)


Mime
View raw message