Re: http://lilypond.org/help-us.html afunctional
On Thu, Jul 05, 2018 at 08:49:12PM +0200, David Kastrup wrote: > Graham Percival writes: > > I suspect that the issue is that we only want a string in the form > > "2.19", and it was easier to create such a string by concatenating > > MAJOR_VERSION and MINOR_VERSION, instead of taking VERSION_STABLE > > of "2.19.65" and removing the final ".xy" > > Hm. I've done a change using VERSION_DEVEL locally but I am not sure > whether there is one valid strategy for both development and stable > releases. > > I am not sure I understand the problem. Sorry, I'm not certain if this is still an issue. Here's the problem as I recall it. 1) The regular MAJOR_VERSION / MINOR_VERSION / PATCH_LEVEL points to the *next* lilypond release in git master. This is so that if a developer compiles the binary, there's a distinction between ./lilypond --version and lilypond --version (assuming that she has an officially released lilypond in her $PATH). 2) Pages like http://lilypond.org/unix.html http://lilypond.org/development.html are generated from Documentation/web/download.itexi Documentation/web/community.itexi from git master. These need to point to the latest *released* versions, not the "n+1" version that one gets from compiling. To see exactly how VERSION_STABLE and VERSION_DEVEL are used, $ git grep versionStable -- Documentation/web $ git grep versionDevel -- Documentation/web Cheers, - Graham ___ lilypond-user mailing list lilypond-user@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-user
Re: http://lilypond.org/help-us.html afunctional
Graham Percival writes: > On Wed, Jul 04, 2018 at 08:21:25PM +0200, David Kastrup wrote: >> "Phil Holmes" writes: >> > I'm slightly surprised that the build picks up the location of those >> > pages from that part of the version, but obviously it does. A simple >> > fix for the next build would be to align the versions given by the two >> > expressions, but could you have a think about why those pages pick up >> > different locations from all the others? >> >> I am just as surprised as you are. I would have thought that the >> VERSION_STABLE and VERSION_DEVEL lines are exactly used for figuring out >> the web sites to link to while MAJOR_VERSION/MINOR_VERSION/PATCH_LEVEL >> is what gets baked into the binary. > > Commit 70adadcf60fa2571d3148115af5d7e96d80d57a5. > > I suspect that the issue is that we only want a string in the form > "2.19", and it was easier to create such a string by concatenating > MAJOR_VERSION and MINOR_VERSION, instead of taking VERSION_STABLE > of "2.19.65" and removing the final ".xy" Hm. I've done a change using VERSION_DEVEL locally but I am not sure whether there is one valid strategy for both development and stable releases. I am not sure I understand the problem. -- David Kastrup ___ lilypond-user mailing list lilypond-user@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-user
Re: http://lilypond.org/help-us.html afunctional
Graham Percival writes: > On Wed, Jul 04, 2018 at 08:21:25PM +0200, David Kastrup wrote: >> "Phil Holmes" writes: >> > I'm slightly surprised that the build picks up the location of those >> > pages from that part of the version, but obviously it does. A simple >> > fix for the next build would be to align the versions given by the two >> > expressions, but could you have a think about why those pages pick up >> > different locations from all the others? >> >> I am just as surprised as you are. I would have thought that the >> VERSION_STABLE and VERSION_DEVEL lines are exactly used for figuring out >> the web sites to link to while MAJOR_VERSION/MINOR_VERSION/PATCH_LEVEL >> is what gets baked into the binary. > > Commit 70adadcf60fa2571d3148115af5d7e96d80d57a5. > > I suspect that the issue is that we only want a string in the form > "2.19", and it was easier to create such a string by concatenating > MAJOR_VERSION and MINOR_VERSION, instead of taking VERSION_STABLE > of "2.19.65" and removing the final ".xy" Thanks for the pointer. I try to use Make's "basename" function for removing the final .xy . That's hackish, so what. -- David Kastrup ___ lilypond-user mailing list lilypond-user@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-user
Re: http://lilypond.org/help-us.html afunctional
On Wed, Jul 04, 2018 at 08:21:25PM +0200, David Kastrup wrote: > "Phil Holmes" writes: > > I'm slightly surprised that the build picks up the location of those > > pages from that part of the version, but obviously it does. A simple > > fix for the next build would be to align the versions given by the two > > expressions, but could you have a think about why those pages pick up > > different locations from all the others? > > I am just as surprised as you are. I would have thought that the > VERSION_STABLE and VERSION_DEVEL lines are exactly used for figuring out > the web sites to link to while MAJOR_VERSION/MINOR_VERSION/PATCH_LEVEL > is what gets baked into the binary. Commit 70adadcf60fa2571d3148115af5d7e96d80d57a5. I suspect that the issue is that we only want a string in the form "2.19", and it was easier to create such a string by concatenating MAJOR_VERSION and MINOR_VERSION, instead of taking VERSION_STABLE of "2.19.65" and removing the final ".xy" Cheers, - Graham ___ lilypond-user mailing list lilypond-user@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-user
Re: http://lilypond.org/help-us.html afunctional
"Phil Holmes" writes: > - Original Message - > From: "Federico Bruni" > To: "Bernhard Kleine" > Cc: > Sent: Wednesday, July 04, 2018 4:44 PM > Subject: Re: http://lilypond.org/help-us.html afunctional > > >> >> >> Il giorno ven 29 giu 2018 alle 17:21, Bernhard Kleine >> <"bernhard.kleine"@gmx.net> ha scritto: >>> all the links in the "simple tasks" compartment on this site end in >>> error 404 not found. This site is announced in the 2.19 docu, should >>> work or links to something appropriate, not end in error. >> >> It's linking to 2.21 pages (instead of 2.19) which have not been >> uploaded to the server. >> >> Phil, can you shed some light? >> This is what I see in current master, but I don't know the release >> procedure. >> >> $ cat VERSION >> PACKAGE_NAME=LilyPond >> MAJOR_VERSION=2 >> MINOR_VERSION=21 >> PATCH_LEVEL=0 >> MY_PATCH_LEVEL= >> VERSION_STABLE=2.18.2 >> VERSION_DEVEL=2.19.82 > > > I'm slightly surprised that the build picks up the location of those > pages from that part of the version, but obviously it does. A simple > fix for the next build would be to align the versions given by the two > expressions, but could you have a think about why those pages pick up > different locations from all the others? dak@lola:/usr/local/tmp/lilypond$ git show release/2.19.82-1:VERSION PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=19 PATCH_LEVEL=82 MY_PATCH_LEVEL= VERSION_STABLE=2.18.2 VERSION_DEVEL=2.19.82 dak@lola:/usr/local/tmp/lilypond$ git show origin:VERSION PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=21 PATCH_LEVEL=0 MY_PATCH_LEVEL= VERSION_STABLE=2.18.2 VERSION_DEVEL=2.19.82 I am just as surprised as you are. I would have thought that the VERSION_STABLE and VERSION_DEVEL lines are exactly used for figuring out the web sites to link to while MAJOR_VERSION/MINOR_VERSION/PATCH_LEVEL is what gets baked into the binary. But I never actively checked. -- David Kastrup ___ lilypond-user mailing list lilypond-user@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-user
Re: http://lilypond.org/help-us.html afunctional
- Original Message - From: "Federico Bruni" To: "Bernhard Kleine" Cc: Sent: Wednesday, July 04, 2018 4:44 PM Subject: Re: http://lilypond.org/help-us.html afunctional Il giorno ven 29 giu 2018 alle 17:21, Bernhard Kleine <"bernhard.kleine"@gmx.net> ha scritto: all the links in the "simple tasks" compartment on this site end in error 404 not found. This site is announced in the 2.19 docu, should work or links to something appropriate, not end in error. It's linking to 2.21 pages (instead of 2.19) which have not been uploaded to the server. Phil, can you shed some light? This is what I see in current master, but I don't know the release procedure. $ cat VERSION PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=21 PATCH_LEVEL=0 MY_PATCH_LEVEL= VERSION_STABLE=2.18.2 VERSION_DEVEL=2.19.82 I'm slightly surprised that the build picks up the location of those pages from that part of the version, but obviously it does. A simple fix for the next build would be to align the versions given by the two expressions, but could you have a think about why those pages pick up different locations from all the others? Thanks. -- Phil Holmes ___ lilypond-user mailing list lilypond-user@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-user
Re: http://lilypond.org/help-us.html afunctional
Il giorno ven 29 giu 2018 alle 17:21, Bernhard Kleine <"bernhard.kleine"@gmx.net> ha scritto: all the links in the "simple tasks" compartment on this site end in error 404 not found. This site is announced in the 2.19 docu, should work or links to something appropriate, not end in error. It's linking to 2.21 pages (instead of 2.19) which have not been uploaded to the server. Phil, can you shed some light? This is what I see in current master, but I don't know the release procedure. $ cat VERSION PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=21 PATCH_LEVEL=0 MY_PATCH_LEVEL= VERSION_STABLE=2.18.2 VERSION_DEVEL=2.19.82 ___ lilypond-user mailing list lilypond-user@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-user
