Re: git commit: [flex-falcon] [refs/heads/develop] - FLEX-35359 fixed issue where absolute path for output compiler option on windows could result in empty source map file

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

Re: git commit: [flex-falcon] [refs/heads/develop] - FLEX-35359 fixed issue where absolute path for output compiler option on windows could result in empty source map file

Harbs
Josh,

flex-falcon has been moved to https://github.com/apache/royale-compiler/ <https://github.com/apache/royale-compiler/>

Could you change your origin to there and push?

FYI to update for the new repos you need to do the following:
1. Point your origins to:
https://github.com/apache/royale-compiler.git <https://github.com/apache/royale-compiler.git>
https://github.com/apache/royale-asjs.git <https://github.com/apache/royale-asjs.git>
https://github.com/apache/royale-typedefs.git <https://github.com/apache/royale-typedefs.git>

2. Change your local directory names to royale-compiler, royale-asjs, royale-typedefs.

I think Alex committed changes so the build scripts will work with these changes. I have not yet tried to build locally, and I don’t know if Maven has yet been changed.

Thanks,
Harbs

> On Sep 29, 2017, at 1:33 AM, [hidden email] wrote:
>
> Repository: flex-falcon
> Updated Branches:
>  refs/heads/develop 8e3e0af7c -> 6b7bc48d1
>
>
> FLEX-35359 fixed issue where absolute path for output compiler option on windows could result in empty source map file
>
>
> Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
> Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/6b7bc48d
> Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/6b7bc48d
> Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/6b7bc48d
>
> Branch: refs/heads/develop
> Commit: 6b7bc48d1efabdb3d02ae14ea21fed12880a2eaa
> Parents: 8e3e0af
> Author: Josh Tynjala <[hidden email]>
> Authored: Thu Sep 28 15:33:11 2017 -0700
> Committer: Josh Tynjala <[hidden email]>
> Committed: Thu Sep 28 15:33:11 2017 -0700
>
> ----------------------------------------------------------------------
> .../apache/flex/compiler/internal/codegen/js/JSWriter.java  | 9 +++++++++
> 1 file changed, 9 insertions(+)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6b7bc48d/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSWriter.java
> ----------------------------------------------------------------------
> 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());
>

Reply | Threaded
Open this post in threaded view
|

Re: git commit: [flex-falcon] [refs/heads/develop] - FLEX-35359 fixed issue where absolute path for output compiler option on windows could result in empty source map file

piotrz
Harbs,

Maven wasn't touch yet, but I hope to get my hands on that, once I got
clear signal from Alex that Ant build is ready.

Thanks, Piotr

2017-09-29 12:40 GMT+02:00 Harbs <[hidden email]>:

> Josh,
>
> flex-falcon has been moved to https://github.com/apache/royale-compiler/ <
> https://github.com/apache/royale-compiler/>
>
> Could you change your origin to there and push?
>
> FYI to update for the new repos you need to do the following:
> 1. Point your origins to:
> https://github.com/apache/royale-compiler.git <https://github.com/apache/
> royale-compiler.git>
> https://github.com/apache/royale-asjs.git <https://github.com/apache/
> royale-asjs.git>
> https://github.com/apache/royale-typedefs.git <https://github.com/apache/
> royale-typedefs.git>
>
> 2. Change your local directory names to royale-compiler, royale-asjs,
> royale-typedefs.
>
> I think Alex committed changes so the build scripts will work with these
> changes. I have not yet tried to build locally, and I don’t know if Maven
> has yet been changed.
>
> Thanks,
> Harbs
>
> > On Sep 29, 2017, at 1:33 AM, [hidden email] wrote:
> >
> > Repository: flex-falcon
> > Updated Branches:
> >  refs/heads/develop 8e3e0af7c -> 6b7bc48d1
> >
> >
> > FLEX-35359 fixed issue where absolute path for output compiler option on
> windows could result in empty source map file
> >
> >
> > Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
> > Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/
> 6b7bc48d
> > Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/6b7bc48d
> > Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/6b7bc48d
> >
> > Branch: refs/heads/develop
> > Commit: 6b7bc48d1efabdb3d02ae14ea21fed12880a2eaa
> > Parents: 8e3e0af
> > Author: Josh Tynjala <[hidden email]>
> > Authored: Thu Sep 28 15:33:11 2017 -0700
> > Committer: Josh Tynjala <[hidden email]>
> > Committed: Thu Sep 28 15:33:11 2017 -0700
> >
> > ----------------------------------------------------------------------
> > .../apache/flex/compiler/internal/codegen/js/JSWriter.java  | 9
> +++++++++
> > 1 file changed, 9 insertions(+)
> > ----------------------------------------------------------------------
> >
> >
> > http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/
> 6b7bc48d/compiler-jx/src/main/java/org/apache/flex/compiler/
> internal/codegen/js/JSWriter.java
> > ----------------------------------------------------------------------
> > 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());
> >
>
>


--

Piotr Zarzycki

mobile: +48 880 859 557
skype: zarzycki10

LinkedIn: http://www.linkedin.com/piotrzarzycki
<https://pl.linkedin.com/in/piotr-zarzycki-92a53552>

GitHub: https://github.com/piotrzarzycki21
Reply | Threaded
Open this post in threaded view
|

Re: git commit: [flex-falcon] [refs/heads/develop] - FLEX-35359 fixed issue where absolute path for output compiler option on windows could result in empty source map file

Harbs
In reply to this post by Harbs
I merged it and pushed.

> On Sep 29, 2017, at 1:40 PM, Harbs <[hidden email]> wrote:
>
> Josh,
>
> flex-falcon has been moved to https://github.com/apache/royale-compiler/ <https://github.com/apache/royale-compiler/>
>
> Could you change your origin to there and push?
>
> FYI to update for the new repos you need to do the following:
> 1. Point your origins to:
> https://github.com/apache/royale-compiler.git <https://github.com/apache/royale-compiler.git>
> https://github.com/apache/royale-asjs.git <https://github.com/apache/royale-asjs.git>
> https://github.com/apache/royale-typedefs.git <https://github.com/apache/royale-typedefs.git>
>
> 2. Change your local directory names to royale-compiler, royale-asjs, royale-typedefs.
>
> I think Alex committed changes so the build scripts will work with these changes. I have not yet tried to build locally, and I don’t know if Maven has yet been changed.
>
> Thanks,
> Harbs
>
>> On Sep 29, 2017, at 1:33 AM, [hidden email] <mailto:[hidden email]> wrote:
>>
>> Repository: flex-falcon
>> Updated Branches:
>>  refs/heads/develop 8e3e0af7c -> 6b7bc48d1
>>
>>
>> FLEX-35359 fixed issue where absolute path for output compiler option on windows could result in empty source map file
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo <http://git-wip-us.apache.org/repos/asf/flex-falcon/repo>
>> Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/6b7bc48d <http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/6b7bc48d>
>> Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/6b7bc48d <http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/6b7bc48d>
>> Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/6b7bc48d <http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/6b7bc48d>
>>
>> Branch: refs/heads/develop
>> Commit: 6b7bc48d1efabdb3d02ae14ea21fed12880a2eaa
>> Parents: 8e3e0af
>> Author: Josh Tynjala <[hidden email] <mailto:[hidden email]>>
>> Authored: Thu Sep 28 15:33:11 2017 -0700
>> Committer: Josh Tynjala <[hidden email] <mailto:[hidden email]>>
>> Committed: Thu Sep 28 15:33:11 2017 -0700
>>
>> ----------------------------------------------------------------------
>> .../apache/flex/compiler/internal/codegen/js/JSWriter.java  | 9 +++++++++
>> 1 file changed, 9 insertions(+)
>> ----------------------------------------------------------------------
>>
>>
>> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6b7bc48d/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSWriter.java <http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6b7bc48d/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSWriter.java>
>> ----------------------------------------------------------------------
>> 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());
>>
>