Version stuff in CMakeLists.txt
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 see what 3.0.89 actually means as it will crop up for every new 3.0 release. Is it just me being confused, or... Anybody?
Jenkins-kde-ci: calligra master kf5-qt5 » Linux,gcc - Build # 182 - Still Unstable!
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 00b5bb36d7006ea58b664d49cd237ae4cd61162b by Dag Andersen: (Messages and release script: Add structure to Message.sh to ease test) change: edit karbon/Messages.sh change: edit plugins/shapefiltereffects/Messages.sh change: edit plugins/textshape/Messages.sh change: edit plan/plugins/schedulers/rcps/Messages.sh change: edit plugins/pluginshape/Messages.sh change: edit extras/okularodpgenerator/Messages.sh change: edit tests/CMakeLists.txt change: edit libs/Messages.sh change: edit plugins/chartshape/Messages.sh change: edit sheets/shape/Messages.sh change: edit flow/Messages.sh change: edit plugins/commentshape/Messages.sh change: edit plan/plugins/scripting/Messages.sh change: add devtools/release/create_tarball.rb change: edit plugins/staging/templateshape/Messages.sh change: edit plugins/textediting/changecase/Messages.sh change: edit plugins/dockers/Messages.sh change: edit words/Messages.sh change: edit stage/Messages.sh change: add tests/test_messages.sh change: edit plugins/textediting/autocorrection/Messages.sh change: edit plugins/variables/Messages.sh change: edit plugins/vectorshape/Messages.sh change: edit plugins/semanticitems/event/Messages.sh change: edit plugins/karbonplugins/tools/Messages.sh change: edit plan/plugins/schedulers/tj/Messages.sh change: edit plugins/videoshape/Messages.sh change: edit plugins/staging/threedshape/Messages.sh change: edit extras/calligra/Messages.sh change: edit plugins/textediting/thesaurus/Messages.sh change: edit words/plugins/scripting/Messages.sh change: edit plugins/formulashape/Messages.sh change: edit plugins/pathshapes/Messages.sh change: edit plugins/colorengines/Messages.sh change: edit sheets/plugins/solver/Messages.sh change: edit plugins/musicshape/Messages.sh change: edit sheets/plugins/scripting/Messages.sh change: edit plugins/semanticitems/location/Messages.sh change: edit extras/converter/Messages.sh change: edit braindump/Messages.sh change: edit plugins/semanticitems/contact/Messages.sh change: edit plugins/artistictextshape/Messages.sh change: edit plan/libs/Messages.sh change: edit extras/okularodtgenerator/Messages.sh change: edit sheets/plugins/calendar/Messages.sh change: edit plugins/defaultTools/Messages.sh change: edit sheets/Messages.sh change: edit plan/workpackage/Messages.sh change: edit plugins/textediting/spellcheck/Messages.sh change: edit plan/Messages.sh change: edit plugins/pictureshape/Messages.sh change: edit filters/Messages.sh JUNIT RESULTS Name: (root) Failed: 4 test(s), Passed: 150 test(s), Skipped: 0 test(s), Total: 154 test(s)Failed: TestSuite.libs-koodf-TestNumberStyleFailed: TestSuite.libs-pigment-TestColorConversionSystemFailed: TestSuite.sheets-ValueConverterFailed: TestSuite.sheets-ValueParser COBERTURA RESULTS Cobertura Coverage Report PACKAGES 144/171 (84%)FILES 1202/2604 (46%)CLASSES 1202/2604 (46%)LINE 77554/259049 (30%)CONDITIONAL 51597/282118 (18%) By packages braindump.braindumpcore FILES 0/4 (0%)CLASSES 0/4 (0%)LINE 0/134 (0%)CONDITIONAL 0/98 (0%) braindump.plugins.stateshape FILES 4/14 (29%)CLASSES 4/14 (29%)LINE 24/280 (9%)CONDITIONAL 3/140 (2%) braindump.plugins.webshape FILES 4/9 (44%)CLASSES 4/9 (44%)LINE 22/295 (7%)CONDITIONAL 1/114 (1%) braindump.src FILES 0/1 (0%)CLASSES 0/1 (0%)LINE 0/3 (0%)CONDITIONAL 0/0 (100%) devtools.rng2cpp FILES 1/1 (100%)CLASSES 1/1 (100%)LINE 600/693 (87%)CONDITIONAL 596/814 (73%) filters.libmso FILES 10/12 (83%)CLASSES 10/12 (83%)LINE 880/7716 (11%)CONDITIONAL 2165/19897 (11%) filters.libmso.generated FILES 3/3 (100%)CLASSES 3/3 (100%)LINE 4193/12624 (33%)CONDITIONAL 3969/23069 (17%) filters.libmsooxml FILES 2/35 (6%)CLASSES 2/35 (6%)LINE 3/8010 (0%)CONDITIONAL 2/24349 (0%) filters.libmsooxml.generated FILES 0/1 (0%)CLASSES 0/1 (0%)LINE 0/743 (0%)CONDITIONAL 0/3336 (0%) filters.libodf2 FILES 6/29 (21%)CLASSES 6/29 (21%)LINE 97/1606 (6%)CONDITIONAL 82/2174 (4%) filters.libodf2.chart FILES 0/3 (0%)CLASSES 0/3 (0%)LINE 0/582 (0%)CONDITIONAL 0/1321 (0%) filters.sheets.excel.sidewinder FILES 1/1 (100%)CLASSES 1/1 (100%)LINE 654/685 (95%)CONDITIONAL 1918/3502 (55%) filters.sheets.xlsx FILES 4/5 (80%)CLASSES 4/5 (80%)LINE 111/281 (40%)CONDITIONAL 67/460 (15%) filters.stage.powerpoint FILES 9/10 (90%)CLASSES 9/10 (90%)LINE 1651/2710 (61%)CONDITIONAL
Re: Version stuff in CMakeLists.txt
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 can't see >what 3.0.89 actually means as it will crop up for every new 3.0 release. >Is it just me being confused, or... No, that's something that's been confusing me in other projects too. FWIW, KDevelop 5.1 will be released soon, up from 5.0.3 . Their current version (in CMakeLists.txt and the git tag) is 5.0.80. Who knows, maybe that'll become 5.0.99 for the gold release candidate whatever version. So what would be wrong with 3.0.0.89? Conveys clearly enough the message that it's not just a patch release, and that it's closer to 3.0.1 than to 3.0.0 . R.
Re: Version stuff in CMakeLists.txt
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 contributed) in CMakeLists.txt that counts the versions/soversions/etc. assumes a x.y.z scheme only and not x.y.z.v. I don't think it's a bad thing. 3.0.0.1 is only a CALLIGRA_VERSION_STRING. Numerically our version is 3.0.0. So next stable would be 3.0.1 and "alpha 3.1.0 unstable" is 3.0.89 - it's probably the time to update CMakeLists.txt in master to it. But I can't spot the calligra/3.0 branch which shall be set to 3.0.0 version... > > > >But then we would go backwards to Release: 1 when releasing, > >and after that we go to Release: 89 again and we can't see > >what 3.0.89 actually means as it will crop up for every new 3.0 release. > >Is it just me being confused, or... > > No, that's something that's been confusing me in other projects too. > > FWIW, KDevelop 5.1 will be released soon, up from 5.0.3 . Their current > version (in CMakeLists.txt and the git tag) is 5.0.80. Who knows, maybe > that'll become 5.0.99 for the gold release candidate whatever version. > > So what would be wrong with 3.0.0.89? Conveys clearly enough the message > that it's not just a patch release, and that it's closer to 3.0.1 than to > 3.0.0 . > > R. > -- regards, Jaroslaw Staniek KDE: : A world-wide network of software engineers, artists, writers, translators : and facilitators committed to Free Software development - http://kde.org Calligra Suite: : A graphic art and office suite - http://calligra.org Kexi: : A visual database apps builder - http://calligra.org/kexi Qt Certified Specialist: : http://www.linkedin.com/in/jstaniek
Re: Version stuff in CMakeLists.txt
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!
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 by Dag Andersen: (Release script: Fix typos) change: edit devtools/release/create_tarball.rb Revision a75f03cca7d19957216fd171fb3832dfed6d36fb by Dag Andersen: (New year) change: edit CMakeLists.txt JUNIT RESULTS Name: (root) Failed: 4 test(s), Passed: 150 test(s), Skipped: 0 test(s), Total: 154 test(s)Failed: TestSuite.libs-koodf-TestNumberStyleFailed: TestSuite.libs-pigment-TestColorConversionSystemFailed: TestSuite.sheets-ValueConverterFailed: TestSuite.sheets-ValueParser COBERTURA RESULTS Cobertura Coverage Report PACKAGES 144/171 (84%)FILES 1202/2604 (46%)CLASSES 1202/2604 (46%)LINE 77555/259049 (30%)CONDITIONAL 51598/282118 (18%) By packages braindump.braindumpcore FILES 0/4 (0%)CLASSES 0/4 (0%)LINE 0/134 (0%)CONDITIONAL 0/98 (0%) braindump.plugins.stateshape FILES 4/14 (29%)CLASSES 4/14 (29%)LINE 24/280 (9%)CONDITIONAL 3/140 (2%) braindump.plugins.webshape FILES 4/9 (44%)CLASSES 4/9 (44%)LINE 22/295 (7%)CONDITIONAL 1/114 (1%) braindump.src FILES 0/1 (0%)CLASSES 0/1 (0%)LINE 0/3 (0%)CONDITIONAL 0/0 (100%) devtools.rng2cpp FILES 1/1 (100%)CLASSES 1/1 (100%)LINE 600/693 (87%)CONDITIONAL 596/814 (73%) filters.libmso FILES 10/12 (83%)CLASSES 10/12 (83%)LINE 880/7716 (11%)CONDITIONAL 2165/19897 (11%) filters.libmso.generated FILES 3/3 (100%)CLASSES 3/3 (100%)LINE 4193/12624 (33%)CONDITIONAL 3969/23069 (17%) filters.libmsooxml FILES 2/35 (6%)CLASSES 2/35 (6%)LINE 3/8010 (0%)CONDITIONAL 2/24349 (0%) filters.libmsooxml.generated FILES 0/1 (0%)CLASSES 0/1 (0%)LINE 0/743 (0%)CONDITIONAL 0/3336 (0%) filters.libodf2 FILES 6/29 (21%)CLASSES 6/29 (21%)LINE 97/1606 (6%)CONDITIONAL 82/2174 (4%) filters.libodf2.chart FILES 0/3 (0%)CLASSES 0/3 (0%)LINE 0/582 (0%)CONDITIONAL 0/1321 (0%) filters.sheets.excel.sidewinder FILES 1/1 (100%)CLASSES 1/1 (100%)LINE 654/685 (95%)CONDITIONAL 1918/3502 (55%) filters.sheets.xlsx FILES 4/5 (80%)CLASSES 4/5 (80%)LINE 111/281 (40%)CONDITIONAL 67/460 (15%) filters.stage.powerpoint FILES 9/10 (90%)CLASSES 9/10 (90%)LINE 1651/2710 (61%)CONDITIONAL 1999/6134 (33%) filters.stage.powerpoint.tests FILES 2/2 (100%)CLASSES 2/2 (100%)LINE 56/58 (97%)CONDITIONAL 92/194 (47%) interfaces FILES 4/4 (100%)CLASSES 4/4 (100%)LINE 54/61 (89%)CONDITIONAL 36/73 (49%) libs.basicflakes.plugin FILES 4/4 (100%)CLASSES 4/4 (100%)LINE 23/31 (74%)CONDITIONAL 1/8 (13%) libs.basicflakes.tools FILES 0/4 (0%)CLASSES 0/4 (0%)LINE 0/819 (0%)CONDITIONAL 0/413 (0%) libs.flake FILES 111/180 (62%)CLASSES 111/180 (62%)LINE 5273/13803 (38%)CONDITIONAL 2895/9878 (29%) libs.flake.commands FILES 19/49 (39%)CLASSES 19/49 (39%)LINE 805/2153 (37%)CONDITIONAL 410/1380 (30%) libs.flake.svg FILES 1/20 (5%)CLASSES 1/20 (5%)LINE 8/2480 (0%)CONDITIONAL 1/1706 (0%) libs.flake.tests FILES 49/49 (100%)CLASSES 49/49 (100%)LINE 3740/3773 (99%)CONDITIONAL 1718/3394 (51%) libs.flake.tools FILES 9/43 (21%)CLASSES 9/43 (21%)LINE 155/1625 (10%)CONDITIONAL 45/952 (5%) libs.kundo2 FILES 5/10 (50%)CLASSES 5/10 (50%)LINE 205/730 (28%)CONDITIONAL 69/390 (18%) libs.main FILES 27/74 (36%)CLASSES 27/74 (36%)LINE 709/7217 (10%)CONDITIONAL 771/17161 (4%) libs.main.config FILES 0/3 (0%)CLASSES 0/3 (0%)LINE 0/218 (0%)CONDITIONAL 0/478 (0%) libs.main.gemini FILES 0/1 (0%)CLASSES 0/1 (0%)LINE 0/2 (0%)CONDITIONAL 0/0 (100%) libs.main.tests FILES 7/7 (100%)CLASSES 7/7 (100%)LINE 258/271 (95%)CONDITIONAL 138/236 (58%) libs.odf FILES 39/46 (85%)CLASSES 39/46 (85%)LINE 2087/5584 (37%)CONDITIONAL 1318/4284 (31%) libs.odf.tests FILES 17/17 (100%)CLASSES 17/17 (100%)LINE 4854/5100 (95%)CONDITIONAL 3516/7158 (49%) libs.odf.writeodf FILES 3/3 (100%)CLASSES 3/3 (100%)LINE 77/106 (73%)CONDITIONAL 29/59 (49%) libs.pageapp FILES 15/35 (43%)CLASSES 15/35 (43%)LINE 543/3106 (17%)CONDITIONAL 271/1791 (15%) libs.pageapp.commands FILES 3/7 (43%)CLASSES 3/7 (43%)LINE 97/180 (54%)CONDITIONAL 63/124 (51%) libs.pageapp.dialogs F
Jenkins-kde-ci: calligra master kf5-qt5 » Linux,gcc - Build # 184 - Still Unstable!
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 9da8f979ef5811aa9cfcc146b1ebb3d6cd4821ce by Dag Andersen: (Plan: Do not rely on translatable strings in unit tests) change: edit plan/libs/models/tests/FlatProxyModelTester.cpp JUNIT RESULTS Name: (root) Failed: 4 test(s), Passed: 150 test(s), Skipped: 0 test(s), Total: 154 test(s)Failed: TestSuite.libs-koodf-TestNumberStyleFailed: TestSuite.libs-pigment-TestColorConversionSystemFailed: TestSuite.sheets-ValueConverterFailed: TestSuite.sheets-ValueParser COBERTURA RESULTS Cobertura Coverage Report PACKAGES 144/171 (84%)FILES 1202/2604 (46%)CLASSES 1202/2604 (46%)LINE 77559/259049 (30%)CONDITIONAL 51610/282118 (18%) By packages braindump.braindumpcore FILES 0/4 (0%)CLASSES 0/4 (0%)LINE 0/134 (0%)CONDITIONAL 0/98 (0%) braindump.plugins.stateshape FILES 4/14 (29%)CLASSES 4/14 (29%)LINE 24/280 (9%)CONDITIONAL 3/140 (2%) braindump.plugins.webshape FILES 4/9 (44%)CLASSES 4/9 (44%)LINE 22/295 (7%)CONDITIONAL 1/114 (1%) braindump.src FILES 0/1 (0%)CLASSES 0/1 (0%)LINE 0/3 (0%)CONDITIONAL 0/0 (100%) devtools.rng2cpp FILES 1/1 (100%)CLASSES 1/1 (100%)LINE 600/693 (87%)CONDITIONAL 596/814 (73%) filters.libmso FILES 10/12 (83%)CLASSES 10/12 (83%)LINE 880/7716 (11%)CONDITIONAL 2165/19897 (11%) filters.libmso.generated FILES 3/3 (100%)CLASSES 3/3 (100%)LINE 4193/12624 (33%)CONDITIONAL 3969/23069 (17%) filters.libmsooxml FILES 2/35 (6%)CLASSES 2/35 (6%)LINE 3/8010 (0%)CONDITIONAL 2/24349 (0%) filters.libmsooxml.generated FILES 0/1 (0%)CLASSES 0/1 (0%)LINE 0/743 (0%)CONDITIONAL 0/3336 (0%) filters.libodf2 FILES 6/29 (21%)CLASSES 6/29 (21%)LINE 97/1606 (6%)CONDITIONAL 82/2174 (4%) filters.libodf2.chart FILES 0/3 (0%)CLASSES 0/3 (0%)LINE 0/582 (0%)CONDITIONAL 0/1321 (0%) filters.sheets.excel.sidewinder FILES 1/1 (100%)CLASSES 1/1 (100%)LINE 654/685 (95%)CONDITIONAL 1918/3502 (55%) filters.sheets.xlsx FILES 4/5 (80%)CLASSES 4/5 (80%)LINE 111/281 (40%)CONDITIONAL 67/460 (15%) filters.stage.powerpoint FILES 9/10 (90%)CLASSES 9/10 (90%)LINE 1651/2710 (61%)CONDITIONAL 1999/6134 (33%) filters.stage.powerpoint.tests FILES 2/2 (100%)CLASSES 2/2 (100%)LINE 56/58 (97%)CONDITIONAL 92/194 (47%) interfaces FILES 4/4 (100%)CLASSES 4/4 (100%)LINE 54/61 (89%)CONDITIONAL 36/73 (49%) libs.basicflakes.plugin FILES 4/4 (100%)CLASSES 4/4 (100%)LINE 23/31 (74%)CONDITIONAL 1/8 (13%) libs.basicflakes.tools FILES 0/4 (0%)CLASSES 0/4 (0%)LINE 0/819 (0%)CONDITIONAL 0/413 (0%) libs.flake FILES 111/180 (62%)CLASSES 111/180 (62%)LINE 5273/13803 (38%)CONDITIONAL 2895/9878 (29%) libs.flake.commands FILES 19/49 (39%)CLASSES 19/49 (39%)LINE 805/2153 (37%)CONDITIONAL 410/1380 (30%) libs.flake.svg FILES 1/20 (5%)CLASSES 1/20 (5%)LINE 8/2480 (0%)CONDITIONAL 1/1706 (0%) libs.flake.tests FILES 49/49 (100%)CLASSES 49/49 (100%)LINE 3740/3773 (99%)CONDITIONAL 1718/3394 (51%) libs.flake.tools FILES 9/43 (21%)CLASSES 9/43 (21%)LINE 155/1625 (10%)CONDITIONAL 45/952 (5%) libs.kundo2 FILES 5/10 (50%)CLASSES 5/10 (50%)LINE 205/730 (28%)CONDITIONAL 69/390 (18%) libs.main FILES 27/74 (36%)CLASSES 27/74 (36%)LINE 709/7217 (10%)CONDITIONAL 771/17161 (4%) libs.main.config FILES 0/3 (0%)CLASSES 0/3 (0%)LINE 0/218 (0%)CONDITIONAL 0/478 (0%) libs.main.gemini FILES 0/1 (0%)CLASSES 0/1 (0%)LINE 0/2 (0%)CONDITIONAL 0/0 (100%) libs.main.tests FILES 7/7 (100%)CLASSES 7/7 (100%)LINE 258/271 (95%)CONDITIONAL 138/236 (58%) libs.odf FILES 39/46 (85%)CLASSES 39/46 (85%)LINE 2087/5584 (37%)CONDITIONAL 1318/4284 (31%) libs.odf.tests FILES 17/17 (100%)CLASSES 17/17 (100%)LINE 4854/5100 (95%)CONDITIONAL 3516/7158 (49%) libs.odf.writeodf FILES 3/3 (100%)CLASSES 3/3 (100%)LINE 77/106 (73%)CONDITIONAL 29/59 (49%) libs.pageapp FILES 15/35 (43%)CLASSES 15/35 (43%)LINE 543/3106 (17%)CONDITIONAL 271/1791 (15%) libs.pageapp.commands FILES 3/7 (43%)CLASSES 3/7 (43%)LINE 97/180 (54%)CONDITIONAL 63/124 (51%) libs.pageapp.dialogs FILES 0/4 (0%)CLASSES 0/4 (0%)LINE 0/99 (0%)CONDITIONAL 0/16
Re: Version stuff in CMakeLists.txt
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. If you add a conditional compile e.g in 3.0.1 you cannot test in an unstable release, but that would not be often, I think. Alternatives: 1) Add a unstable release number as proposed by Rene. 2) Drop the special unstable numbers (89, 90..) and use the release number as a sequential number. E.g: We released stable 3.0.0, so now the unstable will get 3.0.1 (string could be 3.0.1 Alpha) and when we make a new release it would be 3.0.2. This will give unique and increasing version numbers, with the drawback that you can not see from version alone if it is unstable or stable, but we can use version string for that. Opinions? Dag skrev den 2017-01-04 10:45: 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 see what 3.0.89 actually means as it will crop up for every new 3.0 release. Is it just me being confused, or... Anybody?
