Not logged inOpenClonk Forum
Up Topic Development / Developer's Corner / OpenClonk 8.1: bug-fix release
- - By Maikel Date 2018-02-11 20:23 Edited 2018-02-15 14:36
Time to keep track of what should go into the bugfix release.

These are currently open decisions:
+ 9e01a861ce4322df8a63f1dcb84cd49ca76d37b9 fix some more structure vertices, also for asymmetric ones when flipped (#1979)
+ 81abbce77ac7e2a497d8173a66f8b00b3445a35d flammable library: burned object copies motion from inflamed object
+ e94a0b3c369cf2de0e15476ff40ea10107cb72d1 molten monarch: fix fire particles and fade out gravestones (#1560)
+ 42310548d8eff5a33ada4211febe19454a048d9a stalactite: fix raindrop, allow placing in sky, fix stalagmite, clean up
+ 3ad91ee02ba5937c84d2558fa275f466a47d5a17 add stalactites to hot ice as decoration (#1564)
+ 08edf3bb583f55cf5bf7ba1050ba86632f02a6e0 Enable -Wformat-security for gcc and fix one warning (GH-64)
+ 18dce041e12b50c7cdf41ce206bca9a300e6c728 floor switch: improve object detection and save switch mass
+ f9e7a983f2f39b863ce9bb46385979e507d705ed docs: removed obsolote Components entry and add IsEditor function

If you object to any one of these commits going into stable-8 or are sure they must go into stable-8 let me know here. If you commit to master and properly tested your bugfix you can also cherrypick directly into stable-8. Please don't squash commits into stable-8 because that makes it hard to track what has been cherry-picked.

I have attached a small script to display the commits that need to be decided on.
Attachment: cherry_pick_list.py.ext (711B)
Attachment: cherry_pick_donotlist.txt (69B)
Parent - - By Zapper [de] Date 2018-02-11 21:29

>+ 3ad91ee02ba5937c84d2558fa275f466a47d5a17 add stalactites to hot ice as decoration (#1564)
>+ 42310548d8eff5a33ada4211febe19454a048d9a stalactite: fix raindrop, allow placing in sky, fix stalagmite, clean up


I would really only put fixes into a bugfix release - but I don't know about the second one, because it contains the word "fix" :)
Parent - By Maikel Date 2018-02-11 21:42
The second one is irrelevant as long as the stalactite is not used anywhere, which is the case if we do not pick number 1 :)
Parent - By Maikel Date 2018-02-15 13:06
It fixes a bug, so once someone tested hot ice I feel we can safely put these into 8.1.
Parent - - By Caesar [jp] Date 2018-02-12 14:49
Why don't we just put those onto stable-8 right now? (Well, except for those Zapper mentioned.)
Parent - By Maikel Date 2018-02-12 16:56
Yes, I will, but I leave them here for a few days for someone to object.
Parent - - By Sven2 [us] Date 2018-02-13 06:59
I pushed a fix to deploy qt DLLs and the platforms\ folder. However, I had to disable it for mac because macdeployqt could not be found.

ck already added platforms to the installer, but the fix didn't work for me. Triggering a new dry release now.
Parent - - By Sven2 [us] Date 2018-02-16 07:26
I could not get the winqtdeploy fix working on the autobuild server (CMake<3.2 doesn't have cmake -E env, and windeployqt cannot find the required DLLs).

I think ck just added the DLLs and platform folder manually to the install directory. So I changed the qt DLL deployment to be a CMake option (default off) in case someone does want to create the installer from a fresh directory. Since the installer from the latest dry-release works, we probably don't need to include these commits for 8.1.
Parent - - By Fulgen [at] Date 2018-02-17 08:26
Can't the autobuild server just update its CMake? I mean, we're at CMake 3.10 or something like that...
Parent - By Sven2 [us] Date 2018-02-17 15:56
It's not really necessary to get setup to work, and it could have other side-effects that require more testing. So I think we should postpone that until the next release.
Parent - - By Clonk-Karl Date 2018-02-17 11:06

> I think ck just added the DLLs and platform folder manually to the install directory.


Just to clarify in case this is not what you are already saying: Basically I just made a dry-release after adding the platform files to the oc.nsi file, and that seemed to do the trick. So before the release builder runs NSIS, it puts all the dependencies including the Qt ones in the right place. So, to make the 8.1 release, we'll need to include my commit, but possibly not any other related ones?
Reply
Parent - - By Sven2 [us] Date 2018-02-17 15:55
How does the release builder know which dependencies to pick? Do you just prepare a package that corresponds to the included libraries? The job of windeployqt is to select the correct DLLs automatically and copy them into a folder. This worked on my local Windows box, but failed on the snapshot builder.

Another update I made is to change the inclusion line in CMake from "platforms/*.dll" to "platforms\". The former did not work for me (didn't find any files). Maybe that's a difference between the Windows NSIS builder and the Linux one.

I don't think we have to include any of my changes, because they are just relevant for people who build the setup themselves from source.
Parent - By Clonk-Karl Date 2018-02-17 22:24

> How does the release builder know which dependencies to pick? Do you just prepare a package that corresponds to the included libraries?


Yes, actually Isilkor provides them here. The release builder doesn't even run CMake, it just fetches the binaries from the autobuild, zips up some stuff in planet/, and adds the aforementioned dependencies.
Reply
Parent - - By Clonkonaut Date 2018-03-11 22:53
We tested stuff and stuff. The installer now creates the platforms on Windows and the editor works! All we need to do is press the button.
Reply
Parent - - By Maikel Date 2018-03-12 18:30
Good, I added two more fixes and I think we can press the button. However, I tried to dry-release today and the button does not respond. ck?
Parent - - By Sven2 [us] Date 2018-03-13 02:55
Let's add a quicklink to a help page in the wiki to the welcome page of the editor?

Since Clonkonaut has made a video already, we could gradually update that help page even after the release.
Parent - - By Maikel Date 2018-03-13 07:12
What is the help page of the editor?
Parent - By Luchs Date 2018-03-13 08:51
The welcome page is the yellow page you get when starting the editor without a scenario. The help page in the wiki does not exist yet, I guess?
- - By Maikel Date 2018-02-15 13:05 Edited 2018-02-15 14:36
Second batch of decisions:

+ b492ae456f84102c460c59699f4faf5c6317263c osx_bundle_libs: skip system libraries
+ a130f59f545a3d8d881d3fdb531d95c7a392af3e Fix mac build likely broken in 13f082e8c8. (Attempt 1)
+ ef1e34844285d468409348d9e0dbca0b5eef20df Install platforms/ folder in windows installer
+ 9df7a193e439ab6db56df5ea333a974ea6073faf Deploy Qt libraries; fix platforms NSIS installer include
+ 8a050c1ff9edda238c84b803334b4121218e7f1b Disable Qt library deployment for mac.
+ f62050cf5bf32d8f5ee13d8a49c5e8b16bac2f7f Docu: Volcano strength
+ c792833d9811d3f90404d21978b97f837a810c1b Volcano: Additional script possibilities Added settings for minimal and maximal strength, reset to defaults if passing nil as a parameter, possibility to overload chunk effects on eruption
+ b0a790c747efa8caf14b11e10186a1a5a677a42b Volcano: Fix copy & paste error
+ b95dd5056490a37400d257effbf2b7c1a1e2d707 Simplify DeployQt to work with CMake<3.2 (hopefully).

Seems to be lots of editor & mac related fixes. Please those who commited the cherry-pick them yourself or let me know what to do with them.
Parent - - By Luchs [de] Date 2018-02-15 16:16

>+ a130f59f545a3d8d881d3fdb531d95c7a392af3e Fix mac build likely broken in 13f082e8c8. (Attempt 1)


Not necessary, I already fixed that issue in stable-8.
Parent - - By Maikel Date 2018-02-15 16:41
But shouldn't that go into master? I would expect that all commits in stable-8 are also in master, except version bumps.
Parent - By Luchs [de] Date 2018-02-15 19:31
Yeah I forgot to push it to master, then Caesar came up with a different fix. The end result is that neither master nor stable-8 are broken :)
Parent - - By Clonkonaut Date 2018-02-15 16:51

> mac related fixes


Do we have anyone who can reliably test the mac version?
Reply
Parent - By Luchs [de] Date 2018-02-15 19:33
If I read GH-66 correctly, the Mac version now always successfully shows the editor UI, but trying to start a scenario crashes the game. You could call that progress in comparison to before where nothing happened at all when launching the game...

In any case, I think Kanibal has a Mac and can test it.
Parent - By Marky [de] Date 2018-02-15 18:13
I am against merging the volcano stuff. It doesn't really add anything unless you expect lots of people scripting volcanoes.
Parent - - By Clonk-Karl Date 2018-02-17 11:12

> + ef1e34844285d468409348d9e0dbca0b5eef20df Install platforms/ folder in windows installer


Please pick.

> + 9df7a193e439ab6db56df5ea333a974ea6073faf Deploy Qt libraries; fix platforms NSIS installer include


The dry release worked for me without this one, so I'm not sure. Maybe Sven knows?
Reply
Parent - By Sven2 [us] Date 2018-02-17 16:00

> > + 9df7a193e439ab6db56df5ea333a974ea6073faf Deploy Qt libraries; fix platforms NSIS installer include
> The dry release worked for me without this one, so I'm not sure. Maybe Sven knows?


Don't include. It adds a new feature (running windeployqt to auto-find the right libraries), which is not required by the current release builder.
- By Maikel Date 2018-03-05 11:26
On IRC there are some voices requesting a speedy 8.1 release. Can someone test the windows editor fixes and tell me if the release branch works. If you need me to trigger a dry-release let me know.
- - By Maikel Date 2018-03-05 17:36 Edited 2018-03-05 17:43
I need decisions on:

+ b492ae456f84102c460c59699f4faf5c6317263c osx_bundle_libs: skip system libraries
+ a130f59f545a3d8d881d3fdb531d95c7a392af3e Fix mac build likely broken in 13f082e8c8. (Attempt 1)
+ 9df7a193e439ab6db56df5ea333a974ea6073faf Deploy Qt libraries; fix platforms NSIS installer include
+ 8a050c1ff9edda238c84b803334b4121218e7f1b Disable Qt library deployment for mac.
+ b95dd5056490a37400d257effbf2b7c1a1e2d707 Simplify DeployQt to work with CMake<3.2 (hopefully).
+ 9c32ee033657c3d03ad4180d7d273eb55bacf51a Make QT library deployment optional via CMake option DEPLOY_QT_LIBRARIES (default off)

I have no idea what to do with these commits.
Parent - By Caesar [jp] Date 2018-03-06 00:00 Edited 2018-03-06 00:18
I think if you want Mac to build (you need that for a release, no?), you need the first two. They should not be able to break anything outside of Mac either. Is 3 the reason we're doing 8.1? Also, 4 seems only necessary if you have 3. The other two seem like a good idea to keep distro builders from going crazy    but they're probably not necessary.

Does the autobuilder act on the stable branch? Can we get Isilkor to run a test build, or so?
Parent - - By Sven2 [us] Date 2018-03-06 04:00

> + 9df7a193e439ab6db56df5ea333a974ea6073faf Deploy Qt libraries; fix platforms NSIS installer include
> + 8a050c1ff9edda238c84b803334b4121218e7f1b Disable Qt library deployment for mac.
> + b95dd5056490a37400d257effbf2b7c1a1e2d707 Simplify DeployQt to work with CMake<3.2 (hopefully).
> + 9c32ee033657c3d03ad4180d7d273eb55bacf51a Make QT library deployment optional via CMake option DEPLOY_QT_LIBRARIES (default off)


They should not be needed, because Qt library deployment is disabled for our autobuilder anyway.

Can you trigger a dry release so we can test the installer?
Parent - By Maikel Date 2018-03-06 08:22
You can test it here with the 8.1 installer.
- - By Maikel Date 2018-03-17 11:07
Since I don't have time tonight I have released 8.1 a bit early for most people, but everything seemed to went smooth!

Can someone take care of the mac package and the source package?
Parent - - By Clonkonaut Date 2018-03-17 14:38

> the mac package


There is no working mac build, right? We shouldn't trick people by supplying a broken application ;)
Reply
Parent - - By Maikel Date 2018-03-17 14:59
I was just saying this because there was some mac download for 8.0
Parent - By Clonkonaut Date 2018-03-17 15:30
I think that was also a non-working version and shouldn't have been there in the first place!
Reply
Up Topic Development / Developer's Corner / OpenClonk 8.1: bug-fix release

Powered by mwForum 2.29.7 © 1999-2015 Markus Wichitill