> Hmm. The merge went smoothly. All tests pass. I haven’t tried out > flex-oem-compiler.jar, so I’ll do that tomorrow.
Cool ! Note: Before the merge, my plan was to rename my branch prefixing it with the ticket number (to have the modified code linked in fisheye), rebase from develop (git pull --rebase origin develop), test again, checkout develop + update it, and then merge: git merge --no-ff <MyBranch> Oh, I cherry-picked one remaining commit from my branch and adjusted the build (the compiler.tests was removed from the main target and the swfutils_ckeck was returning fasle in the build.xml taken from my branch). And my issue with the swfutils target was because my FLEX_HOME was still pointing on a installed SDK (required by FlexUnit) instead of a dev one. Also, I had to add the manifiests to the <InstalledSDK>/frameworks from the Flex SDK, especially mxml-2009-manifest.xml, otherwise intelliJ wasn't able to recognize <fx:Script Should we add them to the dev SDK too ? I will focus on the debugger now. Thanks, Frédéric THOMAS > From: aha...@adobe.com > To: dev@flex.apache.org > Subject: Re: Re : Re: Re : Re: AW: AW: AW: [FlexJS] IntelliJ Integration > Date: Thu, 4 Jun 2015 06:07:47 +0000 > > Hmm. The merge went smoothly. All tests pass. I haven’t tried out > flex-oem-compiler.jar, so I’ll do that tomorrow. > > -Alex > > On 6/3/15, 10:47 PM, "Alex Harui" <aha...@adobe.com> wrote: > > >I’m going to give it a try. I want to get your stuff into the nightly > >builds so folks can try it and the other changes we’ve been making. > > > >On 6/3/15, 1:31 PM, "Frédéric THOMAS" <webdoubl...@hotmail.com> wrote: > > > >>You can do it if you like or want to speed up on it or any other reasons > >>but it wont solve the current issue I have and potentialy the one other > >>people will have but if you think you have a good reason enough to do it, > >>please, be my guest. > >> > >>--- Message initial --- > >> > >>De : "Alex Harui" <aha...@adobe.com> > >>Envoyé : 3 juin 2015 20:25 > >>A : dev@flex.apache.org > >>Objet : Re: Re : Re: AW: AW: AW: [FlexJS] IntelliJ Integration > >> > >>How about if I take a shot at merging IDEA into develop? > >> > >>-Alex > >> > >>On 6/3/15, 12:23 PM, "Frédéric THOMAS" <webdoubl...@hotmail.com> wrote: > >> > >>>Actually Im out so I will do that tomorrow > >>> > >>>--- Message initial --- > >>> > >>>De : "Alex Harui" <aha...@adobe.com> > >>>Envoyé : 3 juin 2015 19:33 > >>>A : dev@flex.apache.org > >>>Objet : Re: AW: AW: AW: [FlexJS] IntelliJ Integration > >>> > >>> > >>> > >>>On 6/3/15, 9:59 AM, "Frédéric THOMAS" <webdoubl...@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 > >>> > >> > > >