These are currently open decisions:
+ 42310548d8eff5a33ada4211febe19454a048d9a stalactite: fix raindrop, allow placing in sky, fix stalagmite, clean up
+ 3ad91ee02ba5937c84d2558fa275f466a47d5a17 add stalactites to hot ice as decoration (#1564)
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.
>+ 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" :)
ck already added platforms to the installer, but the fix didn't work for me. Triggering a new dry release now.
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.
> 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?
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.
> 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.
Since Clonkonaut has made a video already, we could gradually update that help page even after the release.
+ 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.
>+ a130f59f545a3d8d881d3fdb531d95c7a392af3e Fix mac build likely broken in 13f082e8c8. (Attempt 1)
Not necessary, I already fixed that issue in stable-8.
> mac related fixes
Do we have anyone who can reliably test the mac version?
In any case, I think Kanibal has a Mac and can test it.
> + 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?
> > + 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.
+ 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.
Does the autobuilder act on the stable branch? Can we get Isilkor to run a test build, or so?
> + 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?
Can someone take care of the mac package and the source package?
> the mac package
There is no working mac build, right? We shouldn't trick people by supplying a broken application ;)
Powered by mwForum 2.29.7 © 1999-2015 Markus Wichitill