You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@flex.apache.org by Frédéric THOMAS <we...@hotmail.com> on 2015/06/01 16:34:57 UTC
RE: AW: AW: AW: [FlexJS] IntelliJ Integration
It is not mandatory to re-apply now, I can have a look later and try to find a way.
Frédéric THOMAS
> From: aharui@adobe.com
> To: dev@flex.apache.org
> Subject: Re: AW: AW: AW: [FlexJS] IntelliJ Integration
> Date: Sun, 31 May 2015 06:37:25 +0000
>
>
>
> On 5/30/15, 8:58 AM, "Frédéric THOMAS" <we...@hotmail.com> wrote:
>
> >Ok good luck :)
> >
> >1 question though, did you plan to re-apply all the fix from the
> >sdk\modules\debugger when done ?
>
> OK, I’m out of BURM hell and now heading towards Git merge hell.
>
> I started looking into how to re-apply the fixes from
> sdk\modules\debugger. It turns out that Falcon uses a slightly different
> folder structure so in the flex-sdk repo, DebugCLI.java is at:
>
> modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java
>
> but in Falcon, it is in:
>
>
> debugger/src/flex/tools/debugger/cli/DebugCLI.java
>
>
> So I’m pondering how to grab all of the changes from flex-sdk (sure looks
> like a lot of changes) and applying them to this different folder tree and
> not have lots of merge issues.
>
> Thoughts? I’m done for tonight, will try again tomorrow night.
>
> -Alex
>
Re: AW: AW: AW: [FlexJS] IntelliJ Integration
Posted by Alex Harui <ah...@adobe.com>.
On 6/3/15, 9:59 AM, "Frédéric THOMAS" <we...@hotmail.com> wrote:
>I updated the dev branch 1 or 2 hours ago and had the same issue, will
>try to fix it later tonight before finishing FDB and merge the comipler
>part.
OK. The CI server said the build of my changes passed. So, when you are
ready feel free to merge or I can do it. If build breaks after your merge
I can try to help fix it.
-Alex
RE: AW: AW: AW: [FlexJS] IntelliJ Integration
Posted by Frédéric THOMAS <we...@hotmail.com>.
I updated the dev branch 1 or 2 hours ago and had the same issue, will try to fix it later tonight before finishing FDB and merge the comipler part.
Frédéric THOMAS
> From: aharui@adobe.com
> To: dev@flex.apache.org
> Subject: Re: AW: AW: AW: [FlexJS] IntelliJ Integration
> Date: Wed, 3 Jun 2015 16:45:31 +0000
>
> I made some changes to the oem and swfutils last night. Hopefully that
> will help.
>
> I’m going to try to multi-task this week and get the Installer to where it
> can install things properly. I just built it and the progress squares did
> not fill in correctly but all the files were installed. Then while folks
> play with that, I can try to merge your IDEA branch into develop if you
> haven’t already.
>
> -Alex
>
> On 6/3/15, 9:14 AM, "Frédéric THOMAS" <we...@hotmail.com> wrote:
>
> >I switched on the develop branch but have to fix the swfutils part as as
> >I said before it doesn't work for me, the copy never occurs, will do that
> >as soon as I can to be able to continue the FDB part.
> >
> >Frédéric THOMAS
> >
> >> From: webdoublefx@hotmail.com
> >> To: dev@flex.apache.org
> >> Subject: RE: AW: AW: AW: [FlexJS] IntelliJ Integration
> >> Date: Tue, 2 Jun 2015 18:39:10 +0100
> >>
> >> Hi Alex,
> >>
> >> Ok, thanks a lot, I will have a look as soon as I will finish the
> >>compiler part which should happen by tomorrow I guess.
> >>
> >> I committed the chained compilation, it works pretty well, the only
> >>drawback was that the user had to set -output from the "additional
> >>compiler options" in IntelliJ (equivalent to the command line), I want
> >>less config as possible, so, I check and use the IntelliJ config too
> >>now, I'm not far to finish, eventually, what I could add, is the check
> >>for the alias "-o" and I will need to update the build file too.
> >>
> >> Oh, btw, I appreciated the check for * in include-file :-)
> >>
> >> I'll keep you in touch.
> >> Frédéric THOMAS
> >>
> >> > From: aharui@adobe.com
> >> > To: dev@flex.apache.org
> >> > Subject: Re: AW: AW: AW: [FlexJS] IntelliJ Integration
> >> > Date: Tue, 2 Jun 2015 17:08:41 +0000
> >> >
> >> > I just pushed FDB for Falcon.
> >> >
> >> > I tried various ways of merging the changes from flex-sdk and
> >>eventually
> >> > gave up. It seems like the line numbers are off by 300 lines or so,
> >>so
> >> > the patch utilities can’t figure out what to do. I’ve manually
> >>re-applied
> >> > the patches I saw from Fred except:
> >> >
> >> > df0fceaeef45569c06aaf342fa9ba6e9c4d7efb5
> >> >
> >> > which is implemented differently (in the Reducer).
> >> >
> >> > I could certainly have messed things up, so give it a try. Next step
> >>is
> >> > to try to merge your IDEA branch, although I may pause to do some
> >> > Installer stuff.
> >> >
> >> > -Alex
> >> >
> >> >
> >> > On 6/1/15, 7:34 AM, "Frédéric THOMAS" <we...@hotmail.com> wrote:
> >> >
> >> > >It is not mandatory to re-apply now, I can have a look later and try
> >>to
> >> > >find a way.
> >> > >
> >> > >Frédéric THOMAS
> >> > >
> >> > >> From: aharui@adobe.com
> >> > >> To: dev@flex.apache.org
> >> > >> Subject: Re: AW: AW: AW: [FlexJS] IntelliJ Integration
> >> > >> Date: Sun, 31 May 2015 06:37:25 +0000
> >> > >>
> >> > >>
> >> > >>
> >> > >> On 5/30/15, 8:58 AM, "Frédéric THOMAS" <we...@hotmail.com>
> >>wrote:
> >> > >>
> >> > >> >Ok good luck :)
> >> > >> >
> >> > >> >1 question though, did you plan to re-apply all the fix from the
> >> > >> >sdk\modules\debugger when done ?
> >> > >>
> >> > >> OK, I’m out of BURM hell and now heading towards Git merge hell.
> >> > >>
> >> > >> I started looking into how to re-apply the fixes from
> >> > >> sdk\modules\debugger. It turns out that Falcon uses a slightly
> >> > >>different
> >> > >> folder structure so in the flex-sdk repo, DebugCLI.java is at:
> >> > >>
> >> > >> modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java
> >> > >>
> >> > >> but in Falcon, it is in:
> >> > >>
> >> > >>
> >> > >> debugger/src/flex/tools/debugger/cli/DebugCLI.java
> >> > >>
> >> > >>
> >> > >> So I’m pondering how to grab all of the changes from flex-sdk (sure
> >> > >>looks
> >> > >> like a lot of changes) and applying them to this different folder
> >>tree
> >> > >>and
> >> > >> not have lots of merge issues.
> >> > >>
> >> > >> Thoughts? I’m done for tonight, will try again tomorrow night.
> >> > >>
> >> > >> -Alex
> >> > >>
> >> > >
> >> >
> >>
> >
>
Re: AW: AW: AW: [FlexJS] IntelliJ Integration
Posted by Alex Harui <ah...@adobe.com>.
I made some changes to the oem and swfutils last night. Hopefully that
will help.
I’m going to try to multi-task this week and get the Installer to where it
can install things properly. I just built it and the progress squares did
not fill in correctly but all the files were installed. Then while folks
play with that, I can try to merge your IDEA branch into develop if you
haven’t already.
-Alex
On 6/3/15, 9:14 AM, "Frédéric THOMAS" <we...@hotmail.com> wrote:
>I switched on the develop branch but have to fix the swfutils part as as
>I said before it doesn't work for me, the copy never occurs, will do that
>as soon as I can to be able to continue the FDB part.
>
>Frédéric THOMAS
>
>> From: webdoublefx@hotmail.com
>> To: dev@flex.apache.org
>> Subject: RE: AW: AW: AW: [FlexJS] IntelliJ Integration
>> Date: Tue, 2 Jun 2015 18:39:10 +0100
>>
>> Hi Alex,
>>
>> Ok, thanks a lot, I will have a look as soon as I will finish the
>>compiler part which should happen by tomorrow I guess.
>>
>> I committed the chained compilation, it works pretty well, the only
>>drawback was that the user had to set -output from the "additional
>>compiler options" in IntelliJ (equivalent to the command line), I want
>>less config as possible, so, I check and use the IntelliJ config too
>>now, I'm not far to finish, eventually, what I could add, is the check
>>for the alias "-o" and I will need to update the build file too.
>>
>> Oh, btw, I appreciated the check for * in include-file :-)
>>
>> I'll keep you in touch.
>> Frédéric THOMAS
>>
>> > From: aharui@adobe.com
>> > To: dev@flex.apache.org
>> > Subject: Re: AW: AW: AW: [FlexJS] IntelliJ Integration
>> > Date: Tue, 2 Jun 2015 17:08:41 +0000
>> >
>> > I just pushed FDB for Falcon.
>> >
>> > I tried various ways of merging the changes from flex-sdk and
>>eventually
>> > gave up. It seems like the line numbers are off by 300 lines or so,
>>so
>> > the patch utilities can’t figure out what to do. I’ve manually
>>re-applied
>> > the patches I saw from Fred except:
>> >
>> > df0fceaeef45569c06aaf342fa9ba6e9c4d7efb5
>> >
>> > which is implemented differently (in the Reducer).
>> >
>> > I could certainly have messed things up, so give it a try. Next step
>>is
>> > to try to merge your IDEA branch, although I may pause to do some
>> > Installer stuff.
>> >
>> > -Alex
>> >
>> >
>> > On 6/1/15, 7:34 AM, "Frédéric THOMAS" <we...@hotmail.com> wrote:
>> >
>> > >It is not mandatory to re-apply now, I can have a look later and try
>>to
>> > >find a way.
>> > >
>> > >Frédéric THOMAS
>> > >
>> > >> From: aharui@adobe.com
>> > >> To: dev@flex.apache.org
>> > >> Subject: Re: AW: AW: AW: [FlexJS] IntelliJ Integration
>> > >> Date: Sun, 31 May 2015 06:37:25 +0000
>> > >>
>> > >>
>> > >>
>> > >> On 5/30/15, 8:58 AM, "Frédéric THOMAS" <we...@hotmail.com>
>>wrote:
>> > >>
>> > >> >Ok good luck :)
>> > >> >
>> > >> >1 question though, did you plan to re-apply all the fix from the
>> > >> >sdk\modules\debugger when done ?
>> > >>
>> > >> OK, I’m out of BURM hell and now heading towards Git merge hell.
>> > >>
>> > >> I started looking into how to re-apply the fixes from
>> > >> sdk\modules\debugger. It turns out that Falcon uses a slightly
>> > >>different
>> > >> folder structure so in the flex-sdk repo, DebugCLI.java is at:
>> > >>
>> > >> modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java
>> > >>
>> > >> but in Falcon, it is in:
>> > >>
>> > >>
>> > >> debugger/src/flex/tools/debugger/cli/DebugCLI.java
>> > >>
>> > >>
>> > >> So I’m pondering how to grab all of the changes from flex-sdk (sure
>> > >>looks
>> > >> like a lot of changes) and applying them to this different folder
>>tree
>> > >>and
>> > >> not have lots of merge issues.
>> > >>
>> > >> Thoughts? I’m done for tonight, will try again tomorrow night.
>> > >>
>> > >> -Alex
>> > >>
>> > >
>> >
>>
>
RE: AW: AW: AW: [FlexJS] IntelliJ Integration
Posted by Frédéric THOMAS <we...@hotmail.com>.
I switched on the develop branch but have to fix the swfutils part as as I said before it doesn't work for me, the copy never occurs, will do that as soon as I can to be able to continue the FDB part.
Frédéric THOMAS
> From: webdoublefx@hotmail.com
> To: dev@flex.apache.org
> Subject: RE: AW: AW: AW: [FlexJS] IntelliJ Integration
> Date: Tue, 2 Jun 2015 18:39:10 +0100
>
> Hi Alex,
>
> Ok, thanks a lot, I will have a look as soon as I will finish the compiler part which should happen by tomorrow I guess.
>
> I committed the chained compilation, it works pretty well, the only drawback was that the user had to set -output from the "additional compiler options" in IntelliJ (equivalent to the command line), I want less config as possible, so, I check and use the IntelliJ config too now, I'm not far to finish, eventually, what I could add, is the check for the alias "-o" and I will need to update the build file too.
>
> Oh, btw, I appreciated the check for * in include-file :-)
>
> I'll keep you in touch.
> Frédéric THOMAS
>
> > From: aharui@adobe.com
> > To: dev@flex.apache.org
> > Subject: Re: AW: AW: AW: [FlexJS] IntelliJ Integration
> > Date: Tue, 2 Jun 2015 17:08:41 +0000
> >
> > I just pushed FDB for Falcon.
> >
> > I tried various ways of merging the changes from flex-sdk and eventually
> > gave up. It seems like the line numbers are off by 300 lines or so, so
> > the patch utilities can’t figure out what to do. I’ve manually re-applied
> > the patches I saw from Fred except:
> >
> > df0fceaeef45569c06aaf342fa9ba6e9c4d7efb5
> >
> > which is implemented differently (in the Reducer).
> >
> > I could certainly have messed things up, so give it a try. Next step is
> > to try to merge your IDEA branch, although I may pause to do some
> > Installer stuff.
> >
> > -Alex
> >
> >
> > On 6/1/15, 7:34 AM, "Frédéric THOMAS" <we...@hotmail.com> wrote:
> >
> > >It is not mandatory to re-apply now, I can have a look later and try to
> > >find a way.
> > >
> > >Frédéric THOMAS
> > >
> > >> From: aharui@adobe.com
> > >> To: dev@flex.apache.org
> > >> Subject: Re: AW: AW: AW: [FlexJS] IntelliJ Integration
> > >> Date: Sun, 31 May 2015 06:37:25 +0000
> > >>
> > >>
> > >>
> > >> On 5/30/15, 8:58 AM, "Frédéric THOMAS" <we...@hotmail.com> wrote:
> > >>
> > >> >Ok good luck :)
> > >> >
> > >> >1 question though, did you plan to re-apply all the fix from the
> > >> >sdk\modules\debugger when done ?
> > >>
> > >> OK, I’m out of BURM hell and now heading towards Git merge hell.
> > >>
> > >> I started looking into how to re-apply the fixes from
> > >> sdk\modules\debugger. It turns out that Falcon uses a slightly
> > >>different
> > >> folder structure so in the flex-sdk repo, DebugCLI.java is at:
> > >>
> > >> modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java
> > >>
> > >> but in Falcon, it is in:
> > >>
> > >>
> > >> debugger/src/flex/tools/debugger/cli/DebugCLI.java
> > >>
> > >>
> > >> So I’m pondering how to grab all of the changes from flex-sdk (sure
> > >>looks
> > >> like a lot of changes) and applying them to this different folder tree
> > >>and
> > >> not have lots of merge issues.
> > >>
> > >> Thoughts? I’m done for tonight, will try again tomorrow night.
> > >>
> > >> -Alex
> > >>
> > >
> >
>
RE: AW: AW: AW: [FlexJS] IntelliJ Integration
Posted by Frédéric THOMAS <we...@hotmail.com>.
Hi Alex,
Ok, thanks a lot, I will have a look as soon as I will finish the compiler part which should happen by tomorrow I guess.
I committed the chained compilation, it works pretty well, the only drawback was that the user had to set -output from the "additional compiler options" in IntelliJ (equivalent to the command line), I want less config as possible, so, I check and use the IntelliJ config too now, I'm not far to finish, eventually, what I could add, is the check for the alias "-o" and I will need to update the build file too.
Oh, btw, I appreciated the check for * in include-file :-)
I'll keep you in touch.
Frédéric THOMAS
> From: aharui@adobe.com
> To: dev@flex.apache.org
> Subject: Re: AW: AW: AW: [FlexJS] IntelliJ Integration
> Date: Tue, 2 Jun 2015 17:08:41 +0000
>
> I just pushed FDB for Falcon.
>
> I tried various ways of merging the changes from flex-sdk and eventually
> gave up. It seems like the line numbers are off by 300 lines or so, so
> the patch utilities can’t figure out what to do. I’ve manually re-applied
> the patches I saw from Fred except:
>
> df0fceaeef45569c06aaf342fa9ba6e9c4d7efb5
>
> which is implemented differently (in the Reducer).
>
> I could certainly have messed things up, so give it a try. Next step is
> to try to merge your IDEA branch, although I may pause to do some
> Installer stuff.
>
> -Alex
>
>
> On 6/1/15, 7:34 AM, "Frédéric THOMAS" <we...@hotmail.com> wrote:
>
> >It is not mandatory to re-apply now, I can have a look later and try to
> >find a way.
> >
> >Frédéric THOMAS
> >
> >> From: aharui@adobe.com
> >> To: dev@flex.apache.org
> >> Subject: Re: AW: AW: AW: [FlexJS] IntelliJ Integration
> >> Date: Sun, 31 May 2015 06:37:25 +0000
> >>
> >>
> >>
> >> On 5/30/15, 8:58 AM, "Frédéric THOMAS" <we...@hotmail.com> wrote:
> >>
> >> >Ok good luck :)
> >> >
> >> >1 question though, did you plan to re-apply all the fix from the
> >> >sdk\modules\debugger when done ?
> >>
> >> OK, I’m out of BURM hell and now heading towards Git merge hell.
> >>
> >> I started looking into how to re-apply the fixes from
> >> sdk\modules\debugger. It turns out that Falcon uses a slightly
> >>different
> >> folder structure so in the flex-sdk repo, DebugCLI.java is at:
> >>
> >> modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java
> >>
> >> but in Falcon, it is in:
> >>
> >>
> >> debugger/src/flex/tools/debugger/cli/DebugCLI.java
> >>
> >>
> >> So I’m pondering how to grab all of the changes from flex-sdk (sure
> >>looks
> >> like a lot of changes) and applying them to this different folder tree
> >>and
> >> not have lots of merge issues.
> >>
> >> Thoughts? I’m done for tonight, will try again tomorrow night.
> >>
> >> -Alex
> >>
> >
>
Re: AW: AW: AW: [FlexJS] IntelliJ Integration
Posted by Alex Harui <ah...@adobe.com>.
I just pushed FDB for Falcon.
I tried various ways of merging the changes from flex-sdk and eventually
gave up. It seems like the line numbers are off by 300 lines or so, so
the patch utilities can’t figure out what to do. I’ve manually re-applied
the patches I saw from Fred except:
df0fceaeef45569c06aaf342fa9ba6e9c4d7efb5
which is implemented differently (in the Reducer).
I could certainly have messed things up, so give it a try. Next step is
to try to merge your IDEA branch, although I may pause to do some
Installer stuff.
-Alex
On 6/1/15, 7:34 AM, "Frédéric THOMAS" <we...@hotmail.com> wrote:
>It is not mandatory to re-apply now, I can have a look later and try to
>find a way.
>
>Frédéric THOMAS
>
>> From: aharui@adobe.com
>> To: dev@flex.apache.org
>> Subject: Re: AW: AW: AW: [FlexJS] IntelliJ Integration
>> Date: Sun, 31 May 2015 06:37:25 +0000
>>
>>
>>
>> On 5/30/15, 8:58 AM, "Frédéric THOMAS" <we...@hotmail.com> wrote:
>>
>> >Ok good luck :)
>> >
>> >1 question though, did you plan to re-apply all the fix from the
>> >sdk\modules\debugger when done ?
>>
>> OK, I’m out of BURM hell and now heading towards Git merge hell.
>>
>> I started looking into how to re-apply the fixes from
>> sdk\modules\debugger. It turns out that Falcon uses a slightly
>>different
>> folder structure so in the flex-sdk repo, DebugCLI.java is at:
>>
>> modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java
>>
>> but in Falcon, it is in:
>>
>>
>> debugger/src/flex/tools/debugger/cli/DebugCLI.java
>>
>>
>> So I’m pondering how to grab all of the changes from flex-sdk (sure
>>looks
>> like a lot of changes) and applying them to this different folder tree
>>and
>> not have lots of merge issues.
>>
>> Thoughts? I’m done for tonight, will try again tomorrow night.
>>
>> -Alex
>>
>