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 asdoc on windows
Date Tue, 13 Dec 2016 06:03:40 GMT
Repository: flex-falcon
Updated Branches:
  refs/heads/develop 1f27ba264 -> 5002a11e0


fix asdoc on windows


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

Branch: refs/heads/develop
Commit: 5002a11e011fedfb4048ba05a66f55256ceede4c
Parents: 1f27ba2
Author: Alex Harui <aharui@apache.org>
Authored: Mon Dec 12 22:03:20 2016 -0800
Committer: Alex Harui <aharui@apache.org>
Committed: Mon Dec 12 22:03:20 2016 -0800

----------------------------------------------------------------------
 .../compiler/internal/driver/js/goog/ASDocConfiguration.java   | 6 +++++-
 .../internal/driver/mxml/ASDocASSourceFileHandler.java         | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/5002a11e/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/goog/ASDocConfiguration.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/goog/ASDocConfiguration.java
b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/goog/ASDocConfiguration.java
index f1b3cca..7bae8db 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/goog/ASDocConfiguration.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/goog/ASDocConfiguration.java
@@ -500,7 +500,11 @@ public class ASDocConfiguration extends JSGoogConfiguration
 
     public void cfgExcludeSources(ConfigurationValue cv, List<String> args) throws
ConfigurationException
     {
-        excludeSources.addAll( args );
+        for (String arg : args)
+        {
+            arg = arg.replace("\\", "/");
+            excludeSources.add(arg);
+        }
     }
 
     public static ConfigurationInfo getExcludeSourcesInfo()

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/5002a11e/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/mxml/ASDocASSourceFileHandler.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/mxml/ASDocASSourceFileHandler.java
b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/mxml/ASDocASSourceFileHandler.java
index 90f754e..8b1aa7c 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/mxml/ASDocASSourceFileHandler.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/mxml/ASDocASSourceFileHandler.java
@@ -74,6 +74,7 @@ public final class ASDocASSourceFileHandler implements ISourceFileHandler
     {
     	FlexJSProject fproject = (FlexJSProject)project;
     	ASDocConfiguration config = (ASDocConfiguration)(fproject.configurator.getConfiguration());
+        path = path.replace("\\", "/");
     	return !(config.getExcludeSources().contains(path));
     }
 


Mime
View raw message