Changeset e3047fd

Timestamp:

01/25/2023 12:01:41 PM (15 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/xf86-video-removal

Children:

2c0a093

Parents:

4653242

Message:

Restore the render system to what it was before pythonhosted changes

Files:

• Makefile (modified) (12 diffs)
• git-version.sh (modified) (3 diffs)

Makefile

@@ -10 +10 @@
 SHELL        = /bin/bash
 
-#PYHOSTED = general/prog/python-dependencies/pythonhosted.xml
-#ALLXML := $(filter-out $(RENDERTMP)/%, \
-#       $(filter-out $(PYHOSTED), \
-#       $(wildcard *.xml */*.xml */*/*.xml */*/*/*.xml */*/*/*/*.xml)))
 ALLXML := $(filter-out $(RENDERTMP)/%, \
-            $(wildcard *.xml */*.xml */*/*.xml */*/*/*.xml */*/*/*/*.xml))
+        $(wildcard *.xml */*.xml */*/*.xml */*/*/*.xml */*/*/*/*.xml))
 ALLXSL := $(filter-out $(RENDERTMP)/%, \
-            $(wildcard *.xsl */*.xsl */*/*.xsl */*/*/*.xsl */*/*/*/*.xsl))
+        $(wildcard *.xsl */*.xsl */*/*.xsl */*/*/*.xsl */*/*/*/*.xsl))
 
 ifdef V
@@ -34 +30 @@
   endif
 endif
-
-# Let's get the previous REV: it'll be used to see if we should
-# rebuild version.ent
-PREVREV != if [ -f conditional.ent ]; then \
-              gawk '/INCLUDE/{ print $$3 }' conditional.ent; \
-           fi
 
 ifeq ($(REV), sysv)
@@ -58 +48 @@
 endif
 
+
 blfs: html wget-list
 
@@ -110 +101 @@
 
 html: $(BASEDIR)/index.html
-$(BASEDIR)/index.html: $(RENDERTMP)/$(BLFSHTML)
+$(BASEDIR)/index.html: $(RENDERTMP)/$(BLFSHTML) version
         @echo "Generating chunked XHTML files..."
         $(Q)xsltproc --nonet                                    \
@@ -144 +135 @@
 
 nochunks: $(BASEDIR)/$(NOCHUNKS_OUTPUT)
-$(BASEDIR)/$(NOCHUNKS_OUTPUT): $(RENDERTMP)/$(BLFSHTML)
+$(BASEDIR)/$(NOCHUNKS_OUTPUT): $(RENDERTMP)/$(BLFSHTML) version
         @echo "Generating non-chunked XHTML file..."
         $(Q)xsltproc --nonet                                \
@@ -167 +158 @@
 
 validate: $(RENDERTMP)/$(BLFSFULL)
-#$(RENDERTMP)/$(BLFSFULL): $(PYHOSTED) version.ent
-$(RENDERTMP)/$(BLFSFULL): version.ent
+$(RENDERTMP)/$(BLFSFULL): general.ent packages.ent $(ALLXML) $(ALLXSL) version
         $(Q)[ -d $(RENDERTMP) ] || mkdir -p $(RENDERTMP)
 
@@ -187 +177 @@
 
 profile-html: $(RENDERTMP)/$(BLFSHTML)
-$(RENDERTMP)/$(BLFSHTML): $(RENDERTMP)/$(BLFSFULL)
+$(RENDERTMP)/$(BLFSHTML): $(RENDERTMP)/$(BLFSFULL) version
         @echo "Generating profiled XML for XHTML..."
         $(Q)xsltproc --nonet                              \
@@ -200 +190 @@
           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                     \
@@ -208 +198 @@
 
 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)
@@ -217 +207 @@
 
 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)
@@ -269 +259 @@
 
 dump-commands: $(DUMPDIR)
-$(DUMPDIR): $(RENDERTMP)/$(BLFSFULL)
+$(DUMPDIR): $(RENDERTMP)/$(BLFSFULL) version
         @echo "Dumping book commands..."
         $(Q)xsltproc --output $(DUMPDIR)/          \
@@ -276 +266 @@
         $(Q)touch $(DUMPDIR)
 
-.PHONY: blfs all world html nochunks tmpdir clean  \
-   validate profile-html blfs-patch-list wget-list \
-        test-links dump-commands  bootscripts systemd-units
-
-# make version.ent unconditionally if we have changed REV
-ifneq ($(REV), $(PREVREV))
-   .PHONY: version.ent
-endif
-
-version.ent: git-version.sh general.ent packages.ent gnome.ent $(ALLXML) $(ALLXSL) Makefile
-        $(Q)./$< $(REV) $^
-
-#ALL_PYTHON_DEPS := $(filter-out $(PYHOSTED), \
-#                   $(wildcard general/prog/python-dependencies/*.xml))
-#
-#PYTHONHOSTED_MODS := requests sphinx_rtd_theme pytest gi-docgen
-#
-#PYTHONHOSTED_MOD_PAGES := $(addprefix general/prog/python-modules/,\
-#                          $(addsuffix .xml,$(PYTHONHOSTED_MODS)))
-#
-#$(PYHOSTED): $(ALL_PYTHON_DEPS)           \
-#             $(PYTHONHOSTED_MOD_PAGES)    \
-#             stylesheets/pyhosted-inc.xsl \
-#             stylesheets/pythonhosted.xsl | version.ent
-#       @echo Generating pythonhosted.xml; \
-#   if [ ! -f $@ ]; then               \
-#      cp dummy.xml $(PYHOSTED);       \
-#   fi
-#       $(Q)xsltproc --xinclude                                    \
-#                --output temp.xml                             \
-#                --stringparam packages "$(PYTHONHOSTED_MODS)" \
-#                stylesheets/pythonhosted.xsl                  \
-#                general/prog/python-modules.xml
-#       $(Q)mv temp.xml $@
+.PHONY: blfs all world html nochunks tmpdir clean             \
+   validate profile-html blfs-patch-list wget-list test-links \
+   dump-commands  bootscripts systemd-units version
+
+version:
+        $(Q)./git-version.sh $(REV)

git-version.sh

@@ -11 +11 @@
     exit 1
 fi
-
-shift 1
 
 echo "<!ENTITY % sysv    \"$SYSV\">"     >  conditional.ent
@@ -30 +28 @@
 export TZ=America/Chicago
 
-sha=$(git log -s --format=format:"%H" --date=local -1 $*)
-commit_date=$(git log -s --format=format:"%cd" --date=local -1 $*)
+commit_date=$(git show -s --format=format:"%cd" --date=local)
 short_date=$(date --date "$commit_date" "+%Y-%m-%d")
 
@@ -48 +45 @@
 full_date="$month $day$suffix, $year"
 
-sha="$(git describe --abbrev=1 $sha)"
+sha="$(git describe --abbrev=1)"
 version=$(echo "$sha" | sed 's/-g[^-]*$//')
+
+if [ "$(git diff HEAD | wc -l)" != "0" ]; then
+    version="$version+"
+fi
 
 echo "<!ENTITY year              \"$year\">"               >  version.ent