Not logged inOpenClonk Forum
Forum Home Help Search Watchlist Register Login
Up Topic Development / Developer's Corner / 5.1.2
Post
- - By Günther [de] Date 2011-01-09 16:19
The stable-5.1 branch has been updated. Besides some bugfixes, notable additions are the Debian files, "minidump" generation for Windows, and Thunderous Skies. Suggestions for further patches from the unstable branch are welcome, as well as reasons why a patch shouldn't be in the stable branch. We'll probably release 5.1.2 in one or two weeks.
Reply
Parent - - By Günther [de] Date 2011-01-29 00:41
So I'd like to do the update this weekend, but I don't feel good about doing that without testing it first. How much work would it be to extend the nightly build automation to the stable branch? If it's too much, I'll run on or two testing rounds on Linux myself, but that's hardly comprehensive.

In other news, the bugfixes in the unstable branch mostly concern regressions in the unstable branch now, so there probably won't be a lot of further 5.1.x updates. Though perhaps we can add a few scenarios from people not currently in the development team? Are there any interesting ones?
Reply
Parent - - By Newton [de] Date 2011-01-29 10:36
Sorry I have no time on the weekend to test. But the version to test would still be fetchable from here, right? http://hg.openclonk.org/openclonk/shortlog/stable-5.1

> Are there any interesting ones?


Are there ANY ones?
Reply
Parent - By MimmoO Date 2011-01-29 15:37
http://forum.openclonk.org/topic_show.pl?tid=693
but i dont know the scenario
Reply
Parent - By Günther [de] Date 2011-01-29 15:47
Yes. You should already have gotten that revision in you local copy of the repository with your first pull after 2011-01-09.
Reply
Parent - - By Clonk-Karl [de] Date 2011-01-29 18:47

> How much work would it be to extend the nightly build automation to the stable branch?


Not too much probably, but I can't guarantee to get it done this weekend. Also I don't feel comfortable in doubling the load on the server. Maybe I can make it so that it only attempts a build if something changed since the previous build.
Reply
Parent - By Caesar [de] Date 2011-01-29 23:37
The stable won't be updated that often, right? On my server, the win32 cross build takes 2.8 less than five seconds if there is nothing to be done. Grepping for "0 files updated" in the hg update could reduce that to one second. Is that an issue?
Reply
Parent - By Isilkor Date 2011-01-30 00:45

> How much work would it be to extend the nightly build automation to the stable branch?


My build script takes the revision to build from as a parameter. So, not much work at all; it would be worth to check for changes on the stable branch, though.
Reply
Parent - - By Caesar [de] Date 2011-02-07 20:16
This post is 29 days old... Hm.

And, If you take 22cbe7ea3de5 into the release, I could provide a dedicated server.
Reply
Parent - - By Günther [de] Date 2011-02-10 15:55
Ah, you're volunteering to test the stable branch? Excellent! ;-)

That commit isn't enough to make the dedicated server work again. I think I've picked all necessary patches. I also picked the commit that is supposed to fix #484 and #493 (as well as the commit fixing the commit), and wrote a quick hack to make crews that were used with the unstable branch usable with the stable branch. Unless somebody finds a regression, I'll tag 5.1.2 the day after tomorrow. In the worst case we'll just have to do a 5.1.3 quickly.
Reply
Parent - - By Caesar [de] Date 2011-02-11 14:25 Edited 2011-02-11 15:11
I need this one, too: http://hg.openclonk.org/openclonk/rev/2564

Or actually, I just need

diff -r 169df63ef8ba src/platform/StdTApp.cpp
--- a/src/platform/StdTApp.cpp  Thu Feb 10 15:33:12 2011 +0100
+++ b/src/platform/StdTApp.cpp  Fri Feb 11 15:10:35 2011 +0100
@@ -221,8 +221,8 @@
CStdWindow::CStdWindow() {}
CStdWindow::~CStdWindow() {}
void CStdWindow::FlashWindow() {}
-CStdWindow * CStdWindow::Init(CStdApp*) {return 0;}
-CStdWindow * CStdWindow::Init(CStdApp*, char const*, CStdWindow*, bool) {return 0;}
+CStdWindow * CStdWindow::Init(CStdApp*) {return this;}
+CStdWindow * CStdWindow::Init(CStdApp*, char const*, CStdWindow*, bool) {return this;}
bool CStdWindow::GetSize(RECT*) {return 0;}
bool CStdWindow::RestorePosition(char const*, char const*, bool) {return 0;}
void CStdWindow::SetSize(unsigned int, unsigned int) {}
Reply
Parent - By Günther [de] Date 2011-02-11 15:35
Ah, the perils of stable-branch-only commits. Thanks.
Reply
Up Topic Development / Developer's Corner / 5.1.2
Post

Powered by mwForum 2.29.7 © 1999-2015 Markus Wichitill