[royale-compiler] branch develop updated: FLEX-35359 fixed issue where absolute path for output compiler option on windows could result in empty source map file

[ha...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

harbs pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git


The following commit(s) were added to refs/heads/develop by this push:
     new 6b7bc48  FLEX-35359 fixed issue where absolute path for output compiler option on windows could result in empty source map file
     new 6e00187  Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-falcon into develop
6b7bc48 is described below

commit 6b7bc48d1efabdb3d02ae14ea21fed12880a2eaa
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Thu Sep 28 15:33:11 2017 -0700

    FLEX-35359 fixed issue where absolute path for output compiler option on windows could result in empty source map file
---
 .../org/apache/flex/compiler/internal/codegen/js/JSWriter.java   | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSWriter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSWriter.java
index 2013c66..e123115 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSWriter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSWriter.java
@@ -143,6 +143,11 @@ public class JSWriter implements IJSWriter
     //should be able to replace this method
     private String relativePath(String filePath, String relativeToFilePath)
     {
+        boolean caseInsensitive = System.getProperty("os.name").toLowerCase().startsWith("windows");
+        if(caseInsensitive)
+        {
+            relativeToFilePath = relativeToFilePath.toLowerCase();
+        }
         File currentFile = new File(filePath);
         Stack<String> stack = new Stack<String>();
         stack.push(currentFile.getName());
@@ -150,6 +155,10 @@ public class JSWriter implements IJSWriter
         while (currentFile != null)
         {
             String absoluteCurrentFile = currentFile.getAbsolutePath() + File.separator;
+            if(caseInsensitive)
+            {
+                absoluteCurrentFile = absoluteCurrentFile.toLowerCase();
+            }
             if (relativeToFilePath.startsWith(absoluteCurrentFile))
             {
                 String relativeRelativeToFile = relativeToFilePath.substring(absoluteCurrentFile.length());

-- 
To stop receiving notification emails like this one, please contact
['"commits@royale.apache.org" <co...@royale.apache.org>'].