Changeset 59483809

Timestamp:

04/06/2021 05:01:01 PM (2 years ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, arm, ml-11.0, multilib, s6-init, trunk, xry111/arm64, xry111/clfs-ng, xry111/glibc-2.34, xry111/glibc-2.37, xry111/kcfg-revise, xry111/lfs-next, xry111/pip3, xry111/queue-11.3, xry111/rust-wip-20221008, xry111/tester-nohack, xry111/usr-move

Children:

7e80757

Parents:

275f313

Message:

automatically generate version info from git HEAD

Files:

• .gitignore (modified) (1 diff)
• Makefile (modified) (3 diffs)
• chapter01/changelog.xml (modified) (1 diff)
• general.ent (modified) (1 diff)
• git-version.sh (added)

.gitignore

@@ -1 +1 @@
 lfs-bootscripts-*.tar.xz
+version.ent

Makefile

@@ -120 +120 @@
         $(Q)rm -f $(RENDERTMP)/*pdf.fo
 
-validate: tmpdir
+validate: tmpdir version
         @echo "Processing bootscripts..."
         $(Q)bash process-scripts.sh
@@ -188 +188 @@
        $(BASEDIR)/md5sums
 
+version:
+        $(Q)./git-version.sh
+
 #dump-commands: validate
 #       @echo "Dumping book commands..."
@@ -205 +208 @@
 all: book nochunks pdf # dump-commands
 
-.PHONY : all book dump-commands nochunks pdf profile-html tmpdir validate md5sums wget-list
-
+.PHONY : all book dump-commands nochunks pdf profile-html tmpdir validate md5sums wget-list version
+

chapter01/changelog.xml

@@ -43 +43 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
+
     <listitem>
       <para>2021-03-26</para>

general.ent

@@ -1 @@
-<!ENTITY version         "SVN-20210326">
+<!-- version info automatically generated by git
+     comment the following two lines for release -->
+<!ENTITY % version-entities SYSTEM "version.ent">
+%version-entities;
+
+<!-- uncomment and edit the following four lines
+     for releases (including -rc) -->
+<!--
+<!ENTITY version         "10.2-rc1">
+<!ENTITY versiond        "10.2-rc1">
+<!ENTITY releasedate     "August 26th, 2021">
+<!ENTITY copyrightdate   "1999-2021">
+-->
+<!-- jhalfs needs a literal dash, not &ndash; -->
+
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20210326-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
-
-<!ENTITY releasedate     "March 26th, 2021">
-
-<!ENTITY copyrightdate   "1999-2021"><!-- jhalfs needs a literal dash, not &ndash; -->
 
 <!ENTITY lfs-root        "http://www.linuxfromscratch.org/">