From: Jean-Philippe <jpm...@fr...> - 2010-02-21 22:42:43
|
Hi, everyone. Never been so close ... Thanks to all for your contributions ... and particularly to you, Kristof, for your extensive tests and reports. The release candidate for 1.4.0 _is_ (trunk) rev 2254. I'll soon create the 1.4.0 tag from it. Please, _any_ commit on the trunk is from now on forbidden : if we have something to fix, it'll be on branches/1.4.x, I'll soon create it. The windows binary installer has just been downloaded to SF.net (256 Mb), and the source tar ball will follow on tomorrow in the evening (320 Mb) if all's right. As you'll notice, I've named them as the final release, but I consider them as "Release Candidate". Hoping they are actually the final one. Please, can you all try and install the 2 packages on your various configurations, and run some random in-game tests (like running a game session with your usual device, with you favorite cars on your favorite tracks, against you favorite opponents) ? After some days - say a week ? - if all's right with these packages, we'll at last be able to advertise about 1.4.0. But only then. Meanwhile, during the week to go, I'll start merging trunk into sdl-port (for the last time ever), so I'd appreciate you completely stop committing things also on sdl-port in 2 or 3 days. I'll tell you precisely when I start. When finished, as already told, we'll move trunk to branches/1.4.x, and branches/sdl-port to trunk ... and will start the 2.0 adventure ! Cheers, Jean-Philippe. |
From: Xavier B. <ber...@ya...> - 2010-02-21 23:30:22
|
Le 21/02/2010 23:43, Jean-Philippe a écrit : > Hi, everyone. > > Never been so close ... > > Thanks to all for your contributions ... and particularly to you, Kristof, > for your extensive tests and reports. > > The release candidate for 1.4.0 _is_ (trunk) rev 2254. > > I'll soon create the 1.4.0 tag from it. > Hi Jean-Philippe, Great !!! Superb ! Finally ! lol ... to have spoken on the room Jabber, Mart thinks it will take more than a week to merge the trunk on the branch sdl, but you know more than me. Please, guys, don't commit anything on trunk now andand if you want to change something about branche 1.4.0 (possibly for a version 1.4.1) calls for the whole team if it's ok. Thank's Cheers Xavier |
From: Mart K. <ma...@ke...> - 2010-02-22 09:46:23
|
Hi Jean-Philippe (and others), On Sunday 21 February 2010 23:43:57 you wrote: > Hi, everyone. > > Meanwhile, during the week to go, I'll start merging trunk into sdl-port > (for the last time ever), so I'd appreciate you completely stop committing > things also on sdl-port in 2 or 3 days. I'll tell you precisely when I > start. I think it is impossible to do the merge by two persons, I will just wait and help with the problems which arrise (if any). If you are getting tired of all the merging, I can continue it. I expect the following problems: * Conflicts because of backports not marked as such (you can mark them as already merged by hand) * Maybe problem because of moved directories * Many commits in trunk if you compare it to the previous merges * Other kind of conflicts > When finished, as already told, we'll move trunk to branches/1.4.x, > and branches/sdl-port to trunk ... and will start the 2.0 adventure ! > > Cheers, > > Jean-Philippe. Regards, Mart |
From: <jpm...@fr...> - 2010-02-22 14:46:49
|
Hi, Mart, and all. > > Meanwhile, during the week to go, I'll start merging trunk into sdl-port > > (for the last time ever), so I'd appreciate you completely stop committing > > things also on sdl-port in 2 or 3 days. I'll tell you precisely when I start. > > I think it is impossible to do the merge by two persons, I will just > wait and help with the problems which arrise (if any). If you are getting tired > of all the merging, I can continue it. Thanks Mart for proposing. I'll start and see what's happening ... and eventually ask for you help :-) > I expect the following problems: > * Conflicts because of backports not marked as such (you can mark them as > already merged by hand) > * Maybe problem because of moved directories > * Many commits in trunk if you compare it to the previous merges > * Other kind of conflicts Yes, I also expect all of these. I'll probably start by merging data/tracks (has been merged recently), and then data/cars ... After that, merging the whole tree should be a little simpler, as the vast majority of directory removes and moves happened in data. Please, wish me good luck ;-) Regards, Jean-Philippe. |
From: Jean-Philippe <jpm...@fr...> - 2010-02-22 21:54:27
|
Hi, again, everyone. The 1.4.0 source tar ball is now available on our SF.net file release system, (as well as the Windows binary installer since last night). Please test :-) I've also created the 1.4.0 tag last night. Cheers, Jean-Philippe. |
From: Jean-Philippe <jpm...@fr...> - 2010-02-23 19:20:32
|
Hi, everyone. Just starting to merge trunk into sdl-port ... please, no commits :-) Cheers, Jean-Philippe. |
From: Jean-Philippe <jpm...@fr...> - 2010-02-25 11:05:29
|
Hi, everyone. > Just starting to merge trunk into sdl-port ... please, no commits :-) Still stuck in the tracks (no mud one, yet ;-) ... SVN doesn't help a lot (?). Could you remind me, artists guys, on which tracks you worked since the fork, where you worked on it (trunk or sdl-port) and finally, where the version we have to keep for the future is : trunk or sdl-port. I already have some clues about this, but I'd want to miss nothing. Cheers, Jean-Philippe. |
From: Xavier B. <ber...@ya...> - 2010-02-26 19:30:42
|
Hi Jean-Philippe, on last merge, rev 2258, I have removed all Makefile in ls1 directory cars and category. But on build I have an errors on tgf lib, I think that I have repaired on replace char* by const char * line 608 on tgf.cpp, but after some errors on tgfclient/guibutton.cpp line 609 to line 892 Cheers Xavier |
From: <jpm...@fr...> - 2010-02-26 20:14:59
|
Hi, Xavier and all. > on last merge, rev 2258, I have removed all Makefile in ls1 directory > cars and category. > But on build I have an errors on tgf lib, I think that I have > repaired > on replace char* by const char * line 608 on tgf.cpp, but after some > errors on tgfclient/guibutton.cpp line 609 to line 892 Please, guys, wait until I have finished merging ... and, over all, no commit please !!! I'll tell you when it'll be in an acceptable state. Probably tomorow. Be patient, I've been spending now about 25 hours in this merging stuff, and it is nearly finished (at least for a first try). Cheers, Jean-Philippe. |
From: Jean-Philippe <jpm...@fr...> - 2010-02-27 19:52:00
|
Hi, everyone. > Still stuck in the tracks (no mud one, yet ;-) ... SVN doesn't help a lot (?). OK, think I've got it now ! At least, it compiles and runs fine under Windows, and I'm just trying under Linux right now. But expect some little regressions (I hope no more that little ones ;-) as many many files were touched, and I could realize that sometimes, the automatic merging system in SVN fails in a strange way .... Actually, we'll definitely have to track these little regressions quickly, as a real first step towards 2.0 ... probably something like checking each recent bug fix achieved on trunk, as well as a good code review of their particular domain for those who have one on sdl-port (network for Brian, Career for Mart, Weather simu for Xavier, cars and tracks for artists, ...). BTW, if no one has any objection (please speak now ;-), I'll go now for the moving stuff (probably tomorrow in the morning, but may be tonight): - trunk to branches/1.4.x - branches/sdl-port to trunk After that, you'll have to make some maintenance operations on your SVN sandboxes : - if you enjoy a quick internet access, may be a simple update on trunk, and a full checkout of branches/1.4.x (if needed) (as well as a full remove of your local working copy of branches/sdl-port) - otherwise, I hope that some "svn switch" hacks should speed-up the updates : I'll try them and hopefully report you how it can be achieved with success in details (Windows and Linux) To be back to the last merges on _sdl-port_, here are some changes that can be of some interest for some of you : * CMake default configuration : - speed-dreams now installs itself by default under /usr/local/dev or C:\Program files\speed-dreams-dev - it seaches for / updates the user settings files under ~/.speed-dreams-dev or <My documents>/speed-dreams-dev.settings * Code "reorganisation" : - removed texture.h/cpp and loadsgi.cpp from libs/tgfclient, as they were not used anywhere and/or caused conflicts with the ones in ssggraph (also renamed here texture.* to grtexture.*, as in trunk) - in tgfclient, renamed img.cpp to guitexture.cpp and changed the exported functions name prefix from GuiImg to GuiTex * Other changes : - the splash screen now "hides" the elapsed time that is necessary to load the main menu and its direct children ... just doing it's expected splash screen "be patient" work ;-) - renamed the car folders in simplix_ls1 and usr_ls1 to fit with the new folder names of these cars -- Cheers, Jean-Philippe. |
From: Brian <bga...@gm...> - 2010-02-27 21:56:40
|
Hi Jean-Philipee, Thanks for doing all the hard work involving the merge. > BTW, if no one has any objection (please speak now ;-), I'll go now for the > moving stuff (probably tomorrow in the morning, but may be tonight): > - trunk to branches/1.4.x > - branches/sdl-port to trunk > > I have some changes I would like to commit for tgfclient and network play is it okay to commit them now? Cheers, Brian |
From: Jean-Philippe <jpm...@fr...> - 2010-02-28 08:47:29
|
Hi, everyone. > BTW, if no one has any objection (please speak now ;-), I'll go now for the > moving stuff (probably tomorrow in the morning, but may be tonight): > - trunk to branches/1.4.x > - branches/sdl-port to trunk Just starting to move ... will let you know when finished. Cheers, Jean-Philippe. |
From: Jean-Philippe <jpm...@fr...> - 2010-02-28 09:12:42
|
Everyone. >> BTW, if no one has any objection (please speak now ;-), I'll go now for the >> moving stuff (probably tomorrow in the morning, but may be tonight): >> - trunk to branches/1.4.x >> - branches/sdl-port to trunk > > Just starting to move ... will let you know when finished. Done. For those who prefer not to checkout everything again (too slow internet connexion), here's how I did in a few seconds, on the Linux side. Note: On the Wondows side, with Windows Explorer and Tortoise SVN, replace : * mv by a drag and drop * cd dir + svn switch xxx . by right click on dir + Tortoise SVN / Switch [xxx] 1) My sandbox before the move / switch : ... speed-dreams trunk # Old trunk branches sdl-port # Old sdl-port branch 2) Move/switch trunk to branches/1.4.x after the move on the SVN repo : [~]$ cd speed-dreams [speed-dreams]$ ls . branches .: branches/ trunk/ branches: sdl-port/ [speed-dreams]$ mv trunk branches/1.4.x [speed-dreams]$ ls . branches .: branches/ branches: 1.4.x/ sdl-port/ [speed-dreams]$ cd branches/1.4.x [1.4.x]$ svn switch https://speed-dreams.svn.sourceforge.net/svnroot/speed-dreams/branches/1.4.x . À la révision 2275. 3) Move/switch branches/sdl-port after the move on the SVN repo : [~]$ cd speed-dreams [speed-dreams]$ ls . branches .: branches/ branches: 1.4.x/ sdl-port/ [speed-dreams]$ mv branches/sdl-port trunk [speed-dreams]$ ls . branches .: branches/ trunk/ branches: 1.4.x/ [speed-dreams]$ cd trunk [1.4.x]$ svn switch https://speed-dreams.svn.sourceforge.net/svnroot/speed-dreams/trunk . À la révision 2276. 4) Done. A few seconds. Not a single file downloaded. Great ! Now, let's go for the 2.0 adventure ! Cheers, Jean-Philippe. |
From: <ba...@ne...> - 2010-02-26 22:14:36
|
Hi JP, all my changes done at the Trunk: * Dirst-1 * Alpine-1 * G-track-1 * G-Track-3 * Corkscrew * Ole Road * E-Road Still reworked for SD 2.0 but not comitted yet: * Michigan * Alpine-1 * G-Track-3 At task list: * Spring * Aalborg * Dirt-1 BTW: I posted the release of 1.4.0 on our Twitter channel. http://twitter.com/speed_dreams We have 8 tweets and 7 followers yet. Cheers Eckhard. Zitat von Jean-Philippe <jpm...@fr...>: > Hi, everyone. > >> Just starting to merge trunk into sdl-port ... please, no commits :-) > > Still stuck in the tracks (no mud one, yet ;-) ... SVN doesn't help > a lot (?). > > Could you remind me, artists guys, on which tracks you worked since the fork, > where you worked on it (trunk or sdl-port) and finally, where the version > we have to keep for the future is : trunk or sdl-port. > > I already have some clues about this, but I'd want to miss nothing. > > Cheers, > > Jean-Philippe. > > > > ------------------------------------------------------------------------------ > Download Intel® Parallel Studio Eval > Try the new software tools for yourself. Speed compiling, find bugs > proactively, and fine-tune applications for parallel performance. > See why Intel Parallel Studio got high marks during beta. > http://p.sf.net/sfu/intel-sw-dev > _______________________________________________ > Speed-dreams-devel mailing list > Spe...@li... > https://lists.sourceforge.net/lists/listinfo/speed-dreams-devel > |
From: Jean-Philippe <jpm...@fr...> - 2010-02-27 14:36:54
|
Hi, Eckhard. > all my changes done at the Trunk: > * Dirst-1 > * Alpine-1 > * G-track-1 > * G-Track-3 > * Corkscrew > * Ole Road > * E-Road > > Still reworked for SD 2.0 but not comitted yet: > * Michigan > * Alpine-1 > * G-Track-3 > > At task list: > * Spring > * Aalborg > * Dirt-1 Thanks for your answer. When I've finished the first try for the merge, we'll have to check all (developers and artists) in case I missed something (and I've certainly missed things ;-) > BTW: I posted the release of 1.4.0 on our Twitter channel. > http://twitter.com/speed_dreams Hope our final release will be current release candidate one ... > We have 8 tweets and 7 followers yet. Great ! Cheers, Jean-Philippe. |