Changeset 17c9da8

Timestamp:

04/15/2021 09:31:50 AM (3 years ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

11.0, 11.1, 11.2, 11.3, 12.0, kea, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/python-mods, qt5new, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

84de88e

Parents:

1adab68

Message:

generate version info from git

Files:

• .gitignore (added)
• Makefile (modified) (9 diffs)
• book/bookinfo.xml (modified) (1 diff)
• general.ent (modified) (1 diff)
• git-version.sh (added)

Makefile

@@ -56 +56 @@
 
 html: $(BASEDIR)/index.html
-$(BASEDIR)/index.html: $(RENDERTMP)/$(BLFSHTML)
+$(BASEDIR)/index.html: $(RENDERTMP)/$(BLFSHTML) version
         @echo "Generating chunked XHTML files..."
         $(Q)xsltproc --nonet                                    \
@@ -89 +89 @@
 
 nochunks: $(BASEDIR)/$(NOCHUNKS_OUTPUT)
-$(BASEDIR)/$(NOCHUNKS_OUTPUT): $(RENDERTMP)/$(BLFSHTML)
+$(BASEDIR)/$(NOCHUNKS_OUTPUT): $(RENDERTMP)/$(BLFSHTML) version
         @echo "Generating non-chunked XHTML file..."
         $(Q)xsltproc --nonet                                \
@@ -112 +112 @@
 
 validate: $(RENDERTMP)/$(BLFSFULL)
-$(RENDERTMP)/$(BLFSFULL): general.ent packages.ent $(ALLXML) $(ALLXSL)
+$(RENDERTMP)/$(BLFSFULL): general.ent packages.ent $(ALLXML) $(ALLXSL) version
         $(Q)[ -d $(RENDERTMP) ] || mkdir -p $(RENDERTMP)
 
@@ -131 +131 @@
 
 profile-html: $(RENDERTMP)/$(BLFSHTML)
-$(RENDERTMP)/$(BLFSHTML): $(RENDERTMP)/$(BLFSFULL)
+$(RENDERTMP)/$(BLFSHTML): $(RENDERTMP)/$(BLFSFULL) version
         @echo "Generating profiled XML for XHTML..."
         $(Q)xsltproc --nonet                              \
@@ -144 +144 @@
           blfs-patches.sh > blfs-patch-list
 
-blfs-patches.sh: $(RENDERTMP)/$(BLFSFULL)
+blfs-patches.sh: $(RENDERTMP)/$(BLFSFULL) version
         @echo "Generating blfs patch script..."
         $(Q)xsltproc --nonet                     \
@@ -152 +152 @@
 
 wget-list: $(BASEDIR)/wget-list
-$(BASEDIR)/wget-list: $(RENDERTMP)/$(BLFSFULL)
+$(BASEDIR)/wget-list: $(RENDERTMP)/$(BLFSFULL) version
         @echo "Generating wget list for $(REV) at $(BASEDIR)/wget-list ..."
         $(Q)mkdir -p $(BASEDIR)
@@ -161 +161 @@
 
 test-links: $(BASEDIR)/test-links
-$(BASEDIR)/test-links: $(RENDERTMP)/$(BLFSFULL)
+$(BASEDIR)/test-links: $(RENDERTMP)/$(BLFSFULL) version
         @echo "Generating test-links file..."
         $(Q)mkdir -p $(BASEDIR)
@@ -213 +213 @@
 
 dump-commands: $(DUMPDIR)
-$(DUMPDIR): $(RENDERTMP)/$(BLFSFULL)
+$(DUMPDIR): $(RENDERTMP)/$(BLFSFULL) version
         @echo "Dumping book commands..."
         $(Q)xsltproc --output $(DUMPDIR)/          \
@@ -222 +222 @@
 .PHONY: blfs all world html nochunks tmpdir clean  \
    validate profile-html blfs-patch-list wget-list test-links \
-   dump-commands  bootscripts systemd-units
-
-
+   dump-commands  bootscripts systemd-units version
+
+version:
+        $(Q)./git-version.sh

book/bookinfo.xml

@@ -49 +49 @@
   <revhistory>
     <revision>
-      <revnumber>&version;</revnumber>
+      <revnumber>&short-version;</revnumber>
       <date>&pubdate;</date>
       <revremark>Ongoing Release</revremark>

general.ent

@@ -1 @@
-<!-- $LastChangedBy$ $Date$ -->
+<!-- version info generated from git commit,
+     comment out the following two lines for release. -->
+<!ENTITY % version-entities SYSTEM "version.ent">
+%version-entities;
 
-<!ENTITY day          "15">                   <!-- Always 2 digits -->
-<!ENTITY month        "04">                   <!-- Always 2 digits -->
-<!ENTITY year         "2021">
-<!ENTITY copyrightdate "2001-&year;">
+<!-- uncomment the following entities and modify them for release,
+     month and year should be always 2 digits. -->
+<!--
+<!ENTITY day            "01">
+<!ENTITY month          "09">
+<!ENTITY year           "2021">
+<!ENTITY copyrightdate  "2001-2021">
+<!ENTITY version        "10.2">
+<!ENTITY releasedate    "September 1st, &year;">
+<!ENTITY pubdate        "&year;-&month;-&day;">
+<!ENTITY short-version "&version;">
+-->
+
 <!ENTITY copyholder   "The BLFS Development Team">
-<!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "April 15th, &year;">
-<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development -->
 <!ENTITY lfs-versiond "systemd">              <!-- x.y-systemd|systemd -->
-<!ENTITY last-commit  "$Date$"> <!-- Automatic update -->
 <!ENTITY lfs-domainname       "linuxfromscratch.org">