Page MenuHomeFreeBSD

Update the version of -CURRENT in Porters Handbook
ClosedPublic

Authored by carlavilla on Tue, Nov 5, 8:12 PM.

Details

Summary

Update the number version of -CURRENT in the Porters Handbook.

PR: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=240791

Test Plan

Compile the Porters Handbook

Diff Detail

Repository
rD FreeBSD doc repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

carlavilla created this revision.Tue, Nov 5, 8:12 PM
carlavilla edited the summary of this revision. (Show Details)Tue, Nov 5, 8:13 PM
bcr added a comment.Tue, Nov 5, 8:28 PM

I think we have a variable for the current release: &rel.current;
Can you try that and see if the has the desired effect? That way, we don't have to touch that fine each time when there is a new CURRENT release branch.

In D22248#486357, @bcr wrote:

I think we have a variable for the current release: &rel.current;
Can you try that and see if the has the desired effect? That way, we don't have to touch that fine each time when there is a new CURRENT release branch.

The entity &rel.current makes reference to 12.0
I found all the entities in share/xml/freebsd.ent

bcr added a comment.Wed, Nov 6, 8:28 PM

OK, if we don't have an entity for 13 in there at the moment, I guess we have to either add it there or use your original proposed patch.

mat added a comment.Wed, Nov 6, 9:46 PM

Isn't there some place where this value can come from? Because it feels a bit silly to have to update that every couple of years.

In D22248#486752, @mat wrote:

Isn't there some place where this value can come from? Because it feels a bit silly to have to update that every couple of years.

Yes, that's true. But right now, there's no entity for this value.

We have two options:
a) Create a new value in the share/xml/freebsd.ent file that makes reference to 13.0-CURRENT
b) Change 12.0-CURRENT with 13.0-CURRENT

bcr added a reviewer: gjb.Sat, Nov 9, 8:14 PM

Adding Glen for clarification: Does it make sense to add the 13-CURRENT entity in the file or will that change other references that are using it already?
I think using 13-CURRENT is the right thing to do here and as @mat pointed out, it is easier to just reference it rather than changing it every time the version of CURRENT changes.

gjb accepted this revision.Sat, Nov 9, 9:30 PM

While I agree with mat, please go ahead and commit the change.

The Handbook does not directly use the entities used by the website, which I would like to change to be version-specific, to eliminate some overlap between the two sets of used entities.

For example, see r53534 of share/xml/freebsd.ent, where the 'rel121.current' (and related) entities were added.

To mat's comment, yes, this needs further revisiting, but this at least resolves the immediate problem.

In D22248#487594, @gjb wrote:

While I agree with mat, please go ahead and commit the change.
The Handbook does not directly use the entities used by the website, which I would like to change to be version-specific, to eliminate some overlap between the two sets of used entities.
For example, see r53534 of share/xml/freebsd.ent, where the 'rel121.current' (and related) entities were added.
To mat's comment, yes, this needs further revisiting, but this at least resolves the immediate problem.

So... can I make the commit? I still need the approval of @bcr and @mat

bcr accepted this revision.Tue, Nov 12, 3:56 PM

OK, go ahead. We'll figure out a more elegant solution separately.

This revision was not accepted when it landed; it landed in state Needs Review.Sat, Nov 16, 5:45 PM
This revision was automatically updated to reflect the committed changes.