[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, simp, updated. 271d1f963630b9cb390baf1ee2d8bdfe7d14e340
git
git at cross-lfs.org
Sat Jun 4 08:31:15 PDT 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, simp has been updated
via 271d1f963630b9cb390baf1ee2d8bdfe7d14e340 (commit)
via 622df7bce88614bc00e7b5fc34d0213b715daab6 (commit)
via 04b4d8a4a193bb89351e12ba1addc503a815c8ba (commit)
via 7782c77fdb6ab0eacbd49f9554f7ff82086ee063 (commit)
via d63b7ee45ccde55b4133d65cfdcb0eabf5254b14 (commit)
via 2b066c1f7bc4be9ca6914ec65ccd806345294959 (commit)
via 4e6e50b07d56c6ba1940df8ecb790f6d67f01fe7 (commit)
via 4d23d06c05de2c36ff80dae387964c0cdd149d64 (commit)
via ccbf4fb572ea53974fef9b708c3762b9c71a6fab (commit)
from 0230c0a0f03e1205bd95528f9b525c9b27066f8a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 271d1f963630b9cb390baf1ee2d8bdfe7d14e340
Merge: 0230c0a 622df7b
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sat Jun 4 11:28:21 2011 -0400
Merge branch 'master' into simp
Conflicts:
BOOK/Makefile
diff --cc BOOK/Makefile
index 8e154b9,2c8f503..da6d919
--- a/BOOK/Makefile
+++ b/BOOK/Makefile
@@@ -75,52 -61,24 +75,52 @@@ ARCHS_VD_XML := $(ARCHS:%=%-validate_du
.PHONY: $(ARCHS_VD_XML)
$(ARCHS_VD_XML): override arch = $(@:%-validate_dump-xml=%)
$(ARCHS_VD_XML):
- @echo "Validating $(arch) book..."
+ @echo "Validating $(arch) against the CLFS Schema..."
$(Q)mkdir -p $(VALIDATEDIR)
$(Q)xmllint --nonet --noent --xinclude \
- --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
+ --relaxng $(TOP)/schema/clfs/0.1/rng/clfs.rng \
-o $(VALIDATEDIR)/$(arch)-full.xml \
- $(PWD)/$(arch)-index.xml \
- $(TOP)/$(arch)-index.xml
++ $(TOP)/$(arch)-index.xml \
+ 2>&1 | grep -v " validates$$"; \
+ if test $${?} -ne 0; then true; else false; fi
+
+ARCHS_DB_XML := $(ARCHS:%=%-db-xml)
+.PHONY: $(ARCHS_DB_XML)
+$(ARCHS_DB_XML): override arch = $(@:%-db-xml=%)
+$(ARCHS_DB_XML):
+ @$(MAKE) --no-print-directory $(arch)-validate_dump-xml
+ @echo "Generating DocBook XML for $(arch)..."
+ $(Q)mkdir -p $(DBXMLDIR)
+ $(Q)xsltproc --nonet \
+ --stringparam clfs.arch "$(arch)" \
+ --stringparam clfs.multilib "$($(arch)_ML)" \
+ --output $(DBXMLDIR)/$(arch)-db.xml \
- $(PWD)/stylesheets/clfs-profile.xsl \
++ $(TOP)/stylesheets/clfs-profile.xsl \
+ $(VALIDATEDIR)/$(arch)-full.xml
ARCHS_P_XML := $(ARCHS:%=%-profiled-xml)
.PHONY: $(ARCHS_P_XML)
$(ARCHS_P_XML): override arch = $(@:%-profiled-xml=%)
$(ARCHS_P_XML):
- @$(MAKE) --no-print-directory $(arch)-validate_dump-xml
- @echo "Generating profiled $(arch) book..."
+ @$(MAKE) --no-print-directory $(arch)-db-xml
+ @echo "Profiling $(arch) for rendering..."
$(Q)mkdir -p $(PROFILEDIR)
- $(Q)xsltproc --nonet --stringparam profile.condition html \
+ $(Q)xsltproc --nonet \
+ --stringparam profile.condition html \
--output $(PROFILEDIR)/$(arch)-html.xml \
- $(PWD)/stylesheets/lfs-xsl/profile.xsl \
+ $(TOP)/stylesheets/lfs-xsl/profile.xsl \
- $(VALIDATEDIR)/$(arch)-full.xml
+ $(DBXMLDIR)/$(arch)-db.xml
+
+ARCHS_VDB_XML := $(ARCHS:%=%-validate_db-xml)
+.PHONY: $(ARCHS_VDB_XML)
+$(ARCHS_VDB_XML): override arch = $(@:%-validate_db-xml=%)
+$(ARCHS_VDB_XML):
+ @echo "Validating $(arch) against the DocBook Schema..."
+ $(Q)xmllint --noout --nonet \
+ --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
+ $(PROFILEDIR)/$(arch)-html.xml \
+ 2>&1 | grep -v " validates$$"; \
+ if test $${?} -ne 0; then true; else false; fi
ARCHS_HTML := $(ARCHS:%=%-html)
.PHONY: html render $(ARCHS_HTML)
@@@ -197,12 -152,10 +197,12 @@@ ARCHS_VALIDATE := $(ARCHS:%=%-validate
validate: $(ARCHS_VALIDATE)
$(ARCHS_VALIDATE): override arch = $(@:%-validate=%)
$(ARCHS_VALIDATE):
- @echo "Validating $(arch)..."
+ @echo "Validating $(arch) against the CLFS Schema..."
$(Q)xmllint --xinclude --noout --nonet \
- --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
- $(TOP)/$(arch)-index.xml
+ --relaxng $(TOP)/schema/clfs/0.1/rng/clfs.rng \
- $(PWD)/$(arch)-index.xml \
++ $(TOP)/$(arch)-index.xml \
+ 2>&1 | grep -v " validates$$"; \
+ if test $${?} -ne 0; then true; else false; fi
ARCHS_TROUBLE := $(ARCHS:%=%-trouble)
.PHONY: trouble $(ARCHS_TROUBLE)
@@@ -212,16 -165,12 +212,16 @@@ $(ARCHS_TROUBLE)
@echo "Troubleshooting $(arch)..."
@mkdir -p $(TROUBLEDIR)
$(Q)xmllint --xinclude --nonet \
- --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
+ --relaxng $(TOP)/schema/clfs/0.1/rng/clfs.rng \
-o $(TROUBLEDIR)/dump-$(arch) \
- $(PWD)/$(arch)-index.xml \
- $(TOP)/$(arch)-index.xml
++ $(TOP)/$(arch)-index.xml \
+ 2>&1 | grep -v " validates$$"; \
+ if test $${?} -ne 0; then true; else false; fi
$(Q)xmllint --xinclude --noout --nonet \
- --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
- $(TROUBLEDIR)/dump-$(arch)
+ --relaxng $(TOP)/schema/clfs/0.1/rng/clfs.rng \
+ $(TROUBLEDIR)/dump-$(arch) \
+ 2>&1 | grep -v " validates$$"; \
+ if test $${?} -ne 0; then true; else false; fi
@echo "You can now look at $(TROUBLEDIR)/dump-$(arch) to see the errors"
ARCHS_DUMP := $(ARCHS:%=%-dump)
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 1 +
BOOK/Makefile | 34 ++++++++++++++++----------------
BOOK/boot/64/e2fsprogs.xml | 6 ++--
BOOK/boot/64/util-linux.xml | 15 +++----------
BOOK/boot/common/e2fsprogs.xml | 5 ++-
BOOK/boot/common/util-linux.xml | 20 ++++--------------
BOOK/boot/multilib/e2fsprogs.xml | 5 +--
BOOK/boot/multilib/util-linux.xml | 20 ++++--------------
BOOK/boot/ppc64/e2fsprogs-libs.xml | 5 +--
BOOK/boot/ppc64/e2fsprogs.xml | 5 +--
BOOK/general.ent | 6 ++--
BOOK/introduction/common/changelog.xml | 9 ++++++++
BOOK/packages.ent | 12 +++++-----
13 files changed, 62 insertions(+), 81 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list