Hi Harbs, I will wait for your branch and take a look into that as well.
Thanks, Piotr niedz., 2 wrz 2018 o 20:36 Harbs <harbs.li...@gmail.com> napisał(a): > I hope to be able to push tonight. > > I’m pretty close, but there’s still some issues with the merge. > > Once I push, you can look at what I did and comment. :-) > > Harbs > > > On Sep 2, 2018, at 9:12 PM, Carlos Rovira <carlosrov...@apache.org> > wrote: > > > > Ok Harbs, > > > > I'll prefer, you say here you have it ok. So me and others could build > > localy and test as most projects as possible, to detect that all is ok. > > As I said there's code on Jewel changed that will not work in the current > > state, and I think I'm the only one that knows what's working and what > not > > > > moving things to Basic I assume that is copying it from Core to Basic and > > to Jewel and removing from Core? For me that's ok. > > > > Thanks > > > > > > El dom., 2 sept. 2018 a las 17:59, Harbs (<harbs.li...@gmail.com>) > escribió: > > > >> I’m working on a new merge. > >> > >> I’m moving some classes back to Basic to reduce the number of conflicts. > >> > >> Let’s see if my attempt works any better. > >> > >> If it works well, I’ll push my branch when it’s done… > >> > >> On my first attempt to merge, I see lots of conflicts related to AMF. > I’m > >> not sure which is the latest. > >> > >>> On Sep 2, 2018, at 6:26 PM, Carlos Rovira <carlosrov...@apache.org> > >> wrote: > >>> > >>> The problem is than far beyond the merge problems, code was changed in > >> some > >>> classes (at least in Jewel I see changes), to get compiling. This make > >> more > >>> difficult to be confident with the actual code I integration branch > since > >>> we must to know what code is the latest, and see if code was not > changed > >> to > >>> get it compile, since normally that code will not work since was change > >> to > >>> compile but never tested, and would be a hit of luck if it works. > >>> > >>> As I said, I can help on that front in few days, but I'm running to get > >>> most of the things I have on my plate done, working many ours a day in > >>> this. Sorry to not be of much help right now. > >>> > >>> Carlos > >>> > >>> > >>> > >>> El dom., 2 sept. 2018 a las 14:38, Piotr Zarzycki (< > >>> piotrzarzyck...@gmail.com>) escribió: > >>> > >>>> I meant here DataContainerView and DataContainerBase missing methods > >>>> there. > >>>> > >>>> Thanks, > >>>> Piotr > >>>> > >>>> niedz., 2 wrz 2018 o 14:24 Harbs <harbs.li...@gmail.com> napisał(a): > >>>> > >>>>> I’m not sure what you are referring to. Do you mean the merge > >> conflicts? > >>>>> > >>>>> I’m pretty sure there is more than one class which has conflicts. > >> Carlos > >>>>> is right that there could be lot of classes which need resolution, > but > >>>> I’m > >>>>> not sure what the right answer is. > >>>>> > >>>>> We might need to go through all the classes manually and check them… > >>>>> > >>>>>> On Sep 2, 2018, at 2:34 PM, Piotr Zarzycki < > piotrzarzyck...@gmail.com > >>> > >>>>> wrote: > >>>>>> > >>>>>> Hi Carlos, > >>>>>> > >>>>>> Please let's do not make such drastical steps. It looks like Harbs > >>>> found > >>>>>> where the issue is. > >>>>>> > >>>>>> Let's make the changes and see whether it is working. > >>>>>> > >>>>>> Harbs can you do this? > >>>>>> > >>>>>> Thanks, > >>>>>> Piotr > >>>>>> > >>>>>> On Sun, Sep 2, 2018, 12:42 PM Harbs <harbs.li...@gmail.com> wrote: > >>>>>> > >>>>>>> To tell you the truth, I don’t understand exactly how the tokens > are > >>>>>>> working, but the $ prefix definitely breaks it. > >>>>>>> > >>>>>>> I’m guessing the brackets is an XML construct recognized as a > >> variable > >>>>> in > >>>>>>> things like E4X. > >>>>>>> > >>>>>>> Harbs > >>>>>>> > >>>>>>>> On Sep 2, 2018, at 1:30 PM, Carlos Rovira < > carlosrov...@apache.org> > >>>>>>> wrote: > >>>>>>>> > >>>>>>>> Hi Habs, > >>>>>>>> > >>>>>>>> El dom., 2 sept. 2018 a las 11:42, Harbs (<harbs.li...@gmail.com > >) > >>>>>>> escribió: > >>>>>>>> > >>>>>>>>> I found the problem. > >>>>>>>>> > >>>>>>>>> Carlos, I don’t know why you changed the tokens in the config > >> files, > >>>>> but > >>>>>>>>> changing them made them unrecognized and caused the FlexUnit > tests > >>>> to > >>>>>>> fail. > >>>>>>>>> > >>>>>>>>> > >>>>>>>> I thought the tokens you refer was not correctly setup, since > >> doesn't > >>>>>>> have > >>>>>>>> the $ symbol and this way those are not interpreted and changed by > >>>>> maven. > >>>>>>>> What I tried to do is fix maven build distribution. When I create > a > >>>> SDK > >>>>>>> vía > >>>>>>>> Maven, I get flex-config.xml and other files with > >>>>>>>> > >>>>>>>> > >>>>>>>> > >>>>>>> > >>>>> > >>>> > >> > <path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}/playerglobal.swc</path-element> > >>>>>>>> > >>>>>>>> instead of > >>>>>>>> > >>>>>>>> <path-element>libs/path/20.0/playerglobal.swc</path-element> > >>>>>>>> > >>>>>>>> that is what IDEs expect. > >>>>>>>> > >>>>>>>> Maybe this is not the way to get this? if not how could we get > maven > >>>>>>>> generates those files?. In the other hand, Can FlexUnit change to > >>>>>>> recognize > >>>>>>>> token with $ prefix? > >>>>>>>> > >>>>>>>> Thanks > >>>>>>>> > >>>>>>>> > >>>>>>>> -- > >>>>>>>> Carlos Rovira > >>>>>>>> http://about.me/carlosrovira > >>>>>>> > >>>>>>> > >>>>> > >>>>> > >>>> > >>>> -- > >>>> > >>>> Piotr Zarzycki > >>>> > >>>> Patreon: *https://www.patreon.com/piotrzarzycki > >>>> <https://www.patreon.com/piotrzarzycki>* > >>>> > >>> > >>> > >>> -- > >>> Carlos Rovira > >>> http://about.me/carlosrovira > >> > >> > > > > -- > > Carlos Rovira > > http://about.me/carlosrovira > > -- Piotr Zarzycki Patreon: *https://www.patreon.com/piotrzarzycki <https://www.patreon.com/piotrzarzycki>*