[opensource-dev] Viewer-external to Snowglobe 2.x trunk merge update
Hi, As discussed at the last Hippo meeting, I've been working on this big merge those last few days. After a couple of false starts, I decided to use brute force and do a big range merge from svn r3348 to r3472. Surprise: it worked! Well, modulo some changes (mostly in the Water Flickering fix but also in TP double click and sit) but I do have a Snowglobe 2.1 version working on Windows right now :) I'll be doing some more verifications today (that I didn't really gut some Snowglobe features completely and don't have obvious crashers) and we'll talk about it at the Hippo meeting later this afternoon. If everything goes well though, I'm planning a *big* commit tomorrow morning. Let me know if you have issues with this plan. Cheers, - Merov ___ Policies and (un)subscribe information available here: http://wiki.secondlife.com/wiki/OpenSource-Dev Please read the policies before posting to keep unmoderated posting privileges
Re: [opensource-dev] Viewer-external to Snowglobe 2.x trunk merge update
Hi, I've been hit by Parabuild to TeamCity move issues today, with the Snowglobe build failing on TeamCity for script reasons. I just got a full 2.x trunk building on all platforms now on TeamCity but I think it's too late to do a big commit merge on a Friday night and have everything broken during the weekend... so I'm delaying that big commit merge to Monday morning. That way, I'll be there to keep an eye on builds and get help on TeamCity if needs be. Hope it's not derailing your plans. Cheers, - Merov On Thu, Jul 8, 2010 at 12:01 PM, Philippe (Merov) Bossut < me...@lindenlab.com> wrote: > Hi, > > As discussed at the last Hippo meeting, I've been working on this big merge > those last few days. After a couple of false starts, I decided to use brute > force and do a big range merge from svn r3348 to r3472. Surprise: it worked! > Well, modulo some changes (mostly in the Water Flickering fix but also in TP > double click and sit) but I do have a Snowglobe 2.1 version working on > Windows right now :) > > I'll be doing some more verifications today (that I didn't really gut some > Snowglobe features completely and don't have obvious crashers) and we'll > talk about it at the Hippo meeting later this afternoon. If everything goes > well though, I'm planning a *big* commit tomorrow morning. > > Let me know if you have issues with this plan. > > Cheers, > - Merov > ___ Policies and (un)subscribe information available here: http://wiki.secondlife.com/wiki/OpenSource-Dev Please read the policies before posting to keep unmoderated posting privileges
Re: [opensource-dev] Viewer-external to Snowglobe 2.x trunk merge update
Hi, Following the Hippo meeting this afternoon and one last test on Windows, I did commit that merge to Snowglobe 2.x trunk: svn r 3484. This is a merge of all viewer-external revisions from svn r3348 to r3472. The Windows build went fine on TeamCity and we do have a Snowglobe 2.1 binary that can be tested: http://secondlife.com/developers/opensource/downloads/2010///Snowglobe_2-1-0-0_Setup.exe If you want to give it a spin, please do! I'm particularly interested in Water Flickering tests as this is the merge code with the most conflicts. Mac and Linux on the other hand fail. I'm working on Mac right now and will get that fixed asap with the highest priority (it looks like I screwed up some viewer_manifest.py stuff in the merge). If you are building on Mac or Linux, I do appreciate your help to fix the build *but*, if you have no time twiddling with build issues, please do not update your repo! Cheers, - Merov On Fri, Jul 9, 2010 at 7:42 PM, Philippe (Merov) Bossut wrote: > Hi, > > I've been hit by Parabuild to TeamCity move issues today, with the > Snowglobe build failing on TeamCity for script reasons. I just got a full > 2.x trunk building on all platforms now on TeamCity but I think it's too > late to do a big commit merge on a Friday night and have everything broken > during the weekend... so I'm delaying that big commit merge to Monday > morning. That way, I'll be there to keep an eye on builds and get help on > TeamCity if needs be. > > Hope it's not derailing your plans. > > Cheers, > - Merov > > > On Thu, Jul 8, 2010 at 12:01 PM, Philippe (Merov) Bossut < > me...@lindenlab.com> wrote: > >> Hi, >> >> As discussed at the last Hippo meeting, I've been working on this big >> merge those last few days. After a couple of false starts, I decided to use >> brute force and do a big range merge from svn r3348 to r3472. Surprise: it >> worked! Well, modulo some changes (mostly in the Water Flickering fix but >> also in TP double click and sit) but I do have a Snowglobe 2.1 version >> working on Windows right now :) >> >> I'll be doing some more verifications today (that I didn't really gut some >> Snowglobe features completely and don't have obvious crashers) and we'll >> talk about it at the Hippo meeting later this afternoon. If everything goes >> well though, I'm planning a *big* commit tomorrow morning. >> >> Let me know if you have issues with this plan. >> >> Cheers, >> - Merov >> > > ___ Policies and (un)subscribe information available here: http://wiki.secondlife.com/wiki/OpenSource-Dev Please read the policies before posting to keep unmoderated posting privileges
Re: [opensource-dev] Viewer-external to Snowglobe 2.x trunk merge update
I did a few commits: http://svn.secondlife.com/trac/linden/changeset/3486 http://svn.secondlife.com/trac/linden/changeset/3487 http://svn.secondlife.com/trac/linden/changeset/3488 http://svn.secondlife.com/trac/linden/changeset/3489 After that it compiled and linked for me on linux, and probably also on mac... Hopefully you can look into the link problem on mac of the 1.4 trunk too: it needs a new apr tar ball with shared libraries (See my last comments on SNOW-713). I assigned it to you, of course. On Wed, Jul 14, 2010 at 7:27 AM, Philippe (Merov) Bossut < me...@lindenlab.com> wrote: > Hi, > > Following the Hippo meeting this afternoon and one last test on Windows, I > did commit that merge to Snowglobe 2.x trunk: svn r 3484. This is a merge of > all viewer-external revisions from svn r3348 to r3472. > > The Windows build went fine on TeamCity and we do have a Snowglobe 2.1 > binary that can be tested: > > http://secondlife.com/developers/opensource/downloads/2010///Snowglobe_2-1-0-0_Setup.exe > > If you want to give it a spin, please do! I'm particularly interested in > Water Flickering tests as this is the merge code with the most conflicts. > > Mac and Linux on the other hand fail. I'm working on Mac right now and will > get that fixed asap with the highest priority (it looks like I screwed up > some viewer_manifest.py stuff in the merge). If you are building on Mac or > Linux, I do appreciate your help to fix the build *but*, if you have no time > twiddling with build issues, please do not update your repo! > > Cheers, > - Merov > > > On Fri, Jul 9, 2010 at 7:42 PM, Philippe (Merov) Bossut < > me...@lindenlab.com> wrote: > >> Hi, >> >> I've been hit by Parabuild to TeamCity move issues today, with the >> Snowglobe build failing on TeamCity for script reasons. I just got a full >> 2.x trunk building on all platforms now on TeamCity but I think it's too >> late to do a big commit merge on a Friday night and have everything broken >> during the weekend... so I'm delaying that big commit merge to Monday >> morning. That way, I'll be there to keep an eye on builds and get help on >> TeamCity if needs be. >> >> Hope it's not derailing your plans. >> >> Cheers, >> - Merov >> >> >> On Thu, Jul 8, 2010 at 12:01 PM, Philippe (Merov) Bossut < >> me...@lindenlab.com> wrote: >> >>> Hi, >>> >>> As discussed at the last Hippo meeting, I've been working on this big >>> merge those last few days. After a couple of false starts, I decided to use >>> brute force and do a big range merge from svn r3348 to r3472. Surprise: it >>> worked! Well, modulo some changes (mostly in the Water Flickering fix but >>> also in TP double click and sit) but I do have a Snowglobe 2.1 version >>> working on Windows right now :) >>> >>> I'll be doing some more verifications today (that I didn't really gut >>> some Snowglobe features completely and don't have obvious crashers) and >>> we'll talk about it at the Hippo meeting later this afternoon. If everything >>> goes well though, I'm planning a *big* commit tomorrow morning. >>> >>> Let me know if you have issues with this plan. >>> >>> Cheers, >>> - Merov >>> >> >> > > ___ > Policies and (un)subscribe information available here: > http://wiki.secondlife.com/wiki/OpenSource-Dev > Please read the policies before posting to keep unmoderated posting > privileges > ___ Policies and (un)subscribe information available here: http://wiki.secondlife.com/wiki/OpenSource-Dev Please read the policies before posting to keep unmoderated posting privileges
Re: [opensource-dev] Viewer-external to Snowglobe 2.x trunk merge update
On Wed, Jul 14, 2010 at 6:43 AM, Aleric Inglewood < aleric.inglew...@gmail.com> wrote: > I did a few commits: > > http://svn.secondlife.com/trac/linden/changeset/3486 > http://svn.secondlife.com/trac/linden/changeset/3487 > http://svn.secondlife.com/trac/linden/changeset/3488 > http://svn.secondlife.com/trac/linden/changeset/3489 > > After that it compiled and linked for me on linux, and probably also on > mac... > Excellent! Thanks a million Aleric :) I'm building locally on Mac right now. > > Hopefully you can look into the link problem on mac of the 1.4 trunk too: > it needs a new apr tar ball with shared libraries > (See my last comments on SNOW-713). I assigned it to you, of course Thanks for the JIRA. I did run into link issues on Mac. Apparently we need to modify some lib pointers in install.xml and may be create new ones. One thing is that 2.0 dropped the support for PPC architecture so the libs not universal but just supporting i386. That's the reason of the "required architecture" issues you mentioned on SNOW-713. Even building for Intel only though, I get link errors. I need to dig deeper. With all those build issues, I've my work cut our for the day :/ Cheers, - Merov ___ Policies and (un)subscribe information available here: http://wiki.secondlife.com/wiki/OpenSource-Dev Please read the policies before posting to keep unmoderated posting privileges
Re: [opensource-dev] Viewer-external to Snowglobe 2.x trunk merge update
On 07/14/10 9:43:13 am, Aleric Inglewood wrote: > After that it compiled and linked for me on linux, and probably also on > mac... another problem on Linux. (GCC 4.4.4 Debian sid) [ 54%] Building CXX object newview/CMakeFiles/INTEGRATION_TEST_llsecapi.dir/llsecapi.o Linking CXX executable ../sharedlibs/bin/INTEGRATION_TEST_llsecapi CMakeFiles/INTEGRATION_TEST_llsecapi.dir/llsecapi.o: In function `initializeSecHandler()': /home/johnnie/projects/secondlife/snowglobe/indra/newview/llsecapi.cpp:54: undefined reference to `LLSecAPIBasicHandler::LLSecAPIBasicHandler()' collect2: ld returned 1 exit status make[2]: *** [sharedlibs/bin/INTEGRATION_TEST_llsecapi] Error 1 make[1]: *** [newview/CMakeFiles/INTEGRATION_TEST_llsecapi.dir/all] Error 2 make: *** [all] Error 2 ___ Policies and (un)subscribe information available here: http://wiki.secondlife.com/wiki/OpenSource-Dev Please read the policies before posting to keep unmoderated posting privileges
