From 01183c0cb76645813ee0283ed9c1a0d2bae784d3 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre.labastie@neuf.fr>
Date: Tue, 21 Sep 2021 13:31:44 +0200
Subject: [PATCH] general.ent: Add conditionals for release, rc, dev

WIP, needs some testing. But committing to be able to checkout
trunk and back...
---
 general.ent | 82 +++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 60 insertions(+), 22 deletions(-)

diff --git a/general.ent b/general.ent
index 6cb34ee97..3f2a4f929 100644
--- a/general.ent
+++ b/general.ent
@@ -1,33 +1,76 @@
-<!-- Automatically generated by git-version.sh -->
+<!-- Editing  up to the line of ==== should be enough
+     to generate a book for development, release, or rc-->
+<!ENTITY % development "IGNORE"><!-- set to INCLUDE for development,
+                                      set to IGNORE for release or rc -->
+<!ENTITY % release     "INCLUDE"> <!-- set to INCLUDE for release,
+                                      set to IGNORE for development or rc -->
+<!ENTITY % rc          "IGNORE"> <!-- set to INCLUDE for rc,
+                                      set to IGNORE for development or
+                                       release -->
+<!ENTITY % relnum "11.1"><!-- must be given for release or rc -->
+<!ENTITY % reldate "March 1st, 2022"><!-- must ve given for release or rc -->
+<!ENTITY % crdate "1999-2022"><!-- must ve given for release or rc -->
+<!ENTITY % rcnum  "2"><!-- must be given only for rc -->
+<!-- ================================================================== -->
+<!-- Do not change anything below unless the www or book layouts change -->
+
+<!-- Automatically generated by git-version.sh. Used for release or dev -->
 <!ENTITY % conditional-entities SYSTEM "conditional.ent">
 %conditional-entities;
 
-<!-- version info automatically generated by git
-     comment out the following two lines for release -->
+<![ %development; [
+<!-- version info automatically generated by git -->
 <!ENTITY % version-entities SYSTEM "version.ent">
 %version-entities;
-
-<!-- uncomment and edit the following four lines
-     for releases (including -rc) -->
-<!--
 <![ %sysv; [
-<!ENTITY version         "10.2-rc1">
+<!ENTITY short-version   "svn">    <!-- Used below in &blfs-book; -->
+<!ENTITY errata          "&lfs-root;lfs/errata/development/">
 ]]>
 <![ %systemd; [
-<!ENTITY version         "10.2-systemd-rc1">
+<!ENTITY short-version  "systemd"> <!-- Used below in &blfs-book; -->
+<!ENTITY errata          "&lfs-root;lfs/errata/systemd/">
 ]]>
-<!ENTITY releasedate     "August 26th, 2021">
-<!ENTITY copyrightdate   "1999-2021">
--->
+<!ENTITY generic-version "development"> <!-- Used below in
+                                             &patches-root;,
+                                             &donwloads-root;, and
+                                             &test-results; -->
+]]><!-- End %development -->
 
+<![ %release; [
 <![ %sysv; [
-<!ENTITY short-version   "svn">  <!-- Used below in &blfs-book;
-                                      Change to x.y for release but not -rc releases -->
+<!ENTITY version         "%relnum;">
+<!ENTITY short-version   "%relnum;">  <!-- Used below in &blfs-book; -->
 ]]>
 <![ %systemd; [
-<!ENTITY short-version  "systemd">  <!--Change to stable-systemd for release  -->
+<!ENTITY version         "%relnum;-systemd">
+<!ENTITY short-version   "%relnum;-systemd"> <!-- Used below in &blfs-book; -->
+]]>
+<!ENTITY errata          "&lfs-root;lfs/errata/&version;/">
+<!ENTITY generic-version "%relnum;"> <!-- Used below in
+                                          &patches-root;,
+                                          &donwloads-root;, and
+                                          &test-results; -->
+<!ENTITY releasedate     "%reldate;">
+<!ENTITY copyrightdate   "%crdate;">
+]]>
+
+<![ %rc; [
+<![ %sysv; [
+<!ENTITY version         "%relnum;-rc%rcnum;">
+<!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; -->
+]]>
+<![ %systemd; [
+<!ENTITY version         "%relnum;-systemd-rc%rcnum;">
+<!ENTITY short-version   "systemd">  <!-- Used below in &blfs-book; -->
+]]>
+<!ENTITY errata          "&lfs-root;lfs/errata/&version;/">
+<!ENTITY generic-version "%relnum;-rc%rcnum;"> <!-- Used below in
+                                                    &patches-root;,
+                                                    &downloads-root;, and
+                                                    &test-results; -->
+<!ENTITY releasedate     "%reldate;">
+<!ENTITY copyrightdate   "%crdate;">
 ]]>
-<!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
 <!ENTITY lfs-root        "https://www.linuxfromscratch.org/">
 <!ENTITY blfs-root       "&lfs-root;blfs/">
@@ -36,15 +79,10 @@
 <!ENTITY hints-root      "&lfs-root;hints/downloads/files/">
 <!ENTITY hints-index     "&lfs-root;hints/list.html">
 <!ENTITY patches-root    "&lfs-root;patches/lfs/&generic-version;/">
+<!-- Only used for sysv (lfs-bootscripts): -->
 <!ENTITY downloads-root  "&lfs-root;lfs/downloads/&generic-version;/">
 <!ENTITY livecd-root     "&lfs-root;livecd/">
 <!ENTITY test-results    "&lfs-root;lfs/build-logs/&generic-version;/">
-<![ %sysv; [
-<!ENTITY errata          "&lfs-root;lfs/errata/&generic-version;/">
-]]>
-<![ %systemd; [
-<!ENTITY errata          "&lfs-root;lfs/errata/&short-version;/">
-]]>
 <!ENTITY secadv          "&lfs-root;lfs/advisories/">
 <!ENTITY min-kernel      "3.2">
 <!--