Changeset 1118b17 for Makefile

Timestamp:

05/24/2016 09:24:59 PM (8 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 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, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

77ab7f3

Parents:

11ebea6

Message:

Create branches/merge in svn repo fo rtesting of merged LFS books

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/merge@11073 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

• Makefile (modified) (5 diffs)

Makefile

@@ -1 +1 @@
 BASEDIR = ~/lfs-book
+SYSDDIR = ~/lfs-systemd
 DUMPDIR = ~/lfs-commands
 RENDERTMP = $(HOME)/tmp
@@ -14 +15 @@
 endif
 
-lfs: validate profile-html
+sysv: validate profile-html
+        $(Q)xsltproc --nonet                   \
+      --output $(RENDERTMP)/lfs-html2.xml \
+      --stringparam profile.revision sysv \
+      stylesheets/lfs-xsl/profile.xsl     \
+      $(RENDERTMP)/lfs-html.xml
+
         @echo "Generating chunked XHTML files..."
-        $(Q)xsltproc --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \
-          -stringparam rootid "$(ROOT_ID)" -stringparam base.dir $(BASEDIR)/ \
-          stylesheets/lfs-chunked.xsl $(RENDERTMP)/lfs-html.xml
+        $(Q)xsltproc --nonet                          \
+      --stringparam chunk.quietly $(CHUNK_QUIET) \
+      --stringparam rootid "$(ROOT_ID)"          \
+      --stringparam base.dir $(BASEDIR)/         \
+      stylesheets/lfs-chunked.xsl                \
+      $(RENDERTMP)/lfs-html2.xml
 
         @echo "Copying CSS code and images..."
@@ -38 +48 @@
           true; \
           /bin/bash obfuscate.sh $$filename; \
-          sed -i -e "s@text/html@application/xhtml+xml@g" $$filename; \
+          sed -e "s@text/html@application/xhtml+xml@g" \
+         -e "s/\xa9/\©/ "                    \
+         -i $$filename; \
         done;
 
         $(Q)$(MAKE) $(BASEDIR)/wget-list $(BASEDIR)/md5sums
+
+systemd: validated profile-html
+        $(Q)xsltproc --nonet                      \
+      --output $(RENDERTMP)/lfs-html2.xml    \
+      --stringparam profile.revision systemd \
+      stylesheets/lfs-xsl/profile.xsl        \
+      $(RENDERTMP)/lfs-html.xml
+
+        @echo "Generating chunked XHTML files..."
+        $(Q)xsltproc --nonet                          \
+      --stringparam chunk.quietly $(CHUNK_QUIET) \
+      --stringparam rootid "$(ROOT_ID)"          \
+      --stringparam base.dir $(SYSDDIR)/         \
+      stylesheets/lfs-chunked.xsl                \
+      $(RENDERTMP)/lfs-html2.xml
+
+        @echo "Copying CSS code and images..."
+        $(Q)if [ ! -e $(SYSDDIR)/stylesheets ]; then \
+          mkdir -p $(SYSDDIR)/stylesheets; \
+        fi;
+        $(Q)cp stylesheets/lfs-xsl/*.css $(SYSDDIR)/stylesheets
+
+        $(Q)if [ ! -e $(SYSDDIR)/images ]; then \
+          mkdir -p $(SYSDDIR)/images; \
+        fi;
+        $(Q)cp images/*.png $(SYSDDIR)/images
+
+        @echo "Running Tidy and obfuscate.sh..."
+        $(Q)for filename in `find $(SYSDDIR) -name "*.html"`; do \
+          tidy -config tidy.conf $$filename; \
+          true; \
+          /bin/bash obfuscate.sh $$filename; \
+          sed -e "s@text/html@application/xhtml+xml@g" \
+         -e "s/\xa9/\©/ "                    \
+         -i $$filename; \
+        done;
+
+#       $(Q)$(MAKE) $(SYSDDIR)/wget-list $(SYSDDIR)/md5sumsd
 
 pdf: validate
@@ -95 +145 @@
         @echo "Validation complete."
 
-profile-html: validate
+validated: tmpdir
+        @echo "Validating the book..."
+        $(Q)xmllint --nonet --noent --xinclude --postvalid \
+          -o $(RENDERTMP)/lfs-full.xml indexd.xml
+        @echo "Validation complete."
+
+profile-html: 
         @echo "Generating profiled XML for XHTML..."
         $(Q)xsltproc --nonet --stringparam profile.condition html \
@@ -118 +174 @@
        $(BASEDIR)/md5sums
 
+md5sumsd: $(SYSDDIR)/md5sumsd
+$(SYSDDIR)/md5sumsd: stylesheets/wget-list.xsl chapter03/chapter03.xml packages.ent patches.ent
+        @echo "Generating md5sum file..."
+        $(Q)mkdir -p $(SYSDDIR)
+        $(Q)xsltproc --xinclude --nonet --output $(SYSDDIR)/md5sums \
+            stylesheets/md5sum.xsl chapter03/chapter03.xml
+
 dump-commands: validate
         @echo "Dumping book commands..."