Version stuff in CMakeLists.txt

2017-01-04 Thread Dag
I can't figure out how this is meant to be used. We have now released 3.0.0.1. Next should probably be 3.0.1. So I gather current should be an alpha: Major: 3 Minor: 0 Release: 89 But then we would go backwards to Release: 1 when releasing, and after that we go to Release: 89 again and we can't

Jenkins-kde-ci: calligra master kf5-qt5 » Linux,gcc - Build # 182 - Still Unstable!

2017-01-04 Thread no-reply
GENERAL INFO BUILD UNSTABLE Build URL: https://build.kde.org/job/calligra%20master%20kf5-qt5/PLATFORM=Linux,compiler=gcc/182/ Project: PLATFORM=Linux,compiler=gcc Date of build: Wed, 04 Jan 2017 08:49:15 + Build duration: 1 hr 10 min CHANGE SET Revision 00b5bb36d7006ea58b664d49cd237ae4cd611

Re: Version stuff in CMakeLists.txt

2017-01-04 Thread René J . V . Bertin
On Wednesday January 4 2017 10:45:39 Dag wrote: >We have now released 3.0.0.1. Next should probably be 3.0.1. >So I gather current should be an alpha: >Major: 3 >Minor: 0 >Release: 89 > >But then we would go backwards to Release: 1 when releasing, >and after that we go to Release: 89 again and we

Re: Version stuff in CMakeLists.txt

2017-01-04 Thread Jaroslaw Staniek
On 4 January 2017 at 11:09, René J.V. Bertin wrote: > On Wednesday January 4 2017 10:45:39 Dag wrote: > > >We have now released 3.0.0.1. Next should probably be 3.0.1. > >So I gather current should be an alpha: > >Major: 3 > >Minor: 0 > >Release: 89 > ​Hi All, Maybe the logic (where I contribu

Re: Version stuff in CMakeLists.txt

2017-01-04 Thread Boudewijn Rempt
On Wed, 4 Jan 2017, Jaroslaw Staniek wrote: > But I can't spot the calligra/3.0 branch which shall be set to 3.0.0 > version... It was decided not to use release branches, but release from master. -- Boudewijn Rempt | http://www.krita.org, http://www.valdyas.org

Jenkins-kde-ci: calligra master kf5-qt5 » Linux,gcc - Build # 183 - Still Unstable!

2017-01-04 Thread no-reply
GENERAL INFO BUILD UNSTABLE Build URL: https://build.kde.org/job/calligra%20master%20kf5-qt5/PLATFORM=Linux,compiler=gcc/183/ Project: PLATFORM=Linux,compiler=gcc Date of build: Wed, 04 Jan 2017 09:59:34 + Build duration: 51 min CHANGE SET Revision e1e3b24ef54e952c8c83032d48a8cb1608de3681 b

Jenkins-kde-ci: calligra master kf5-qt5 » Linux,gcc - Build # 184 - Still Unstable!

2017-01-04 Thread no-reply
GENERAL INFO BUILD UNSTABLE Build URL: https://build.kde.org/job/calligra%20master%20kf5-qt5/PLATFORM=Linux,compiler=gcc/184/ Project: PLATFORM=Linux,compiler=gcc Date of build: Wed, 04 Jan 2017 10:59:14 + Build duration: 4 hr 38 min CHANGE SET Revision 9da8f979ef5811aa9cfcc146b1ebb3d6cd482

Re: Version stuff in CMakeLists.txt

2017-01-04 Thread Dag
Had a closer look at this, and there is some cmake logic when generating calligraversion.h: Any 3.0.x unstable (alpha/beta/rc) will get version 2.99.x. (3.1.x will be 3.0.x, etc) Afaics this scheme only works when a minor version is increased, e.g 3.0.x -> 3.1.0. Is this a disaster? Probably not