# HG changeset patch
# User diego
# Date 1074641245 0
# Node ID 19919e913e3d889de4493030646c2e1e2e3ba000
# Parent 637af9175b65a92f07036ee1582dd1cd705a6cb1
Shiny new build system by Torinthiel, polished and improved by myself.
diff -r 637af9175b65 -r 19919e913e3d DOCS/xml/Makefile
--- a/DOCS/xml/Makefile Tue Jan 20 19:28:35 2004 +0000
+++ b/DOCS/xml/Makefile Tue Jan 20 23:27:25 2004 +0000
@@ -26,7 +26,7 @@
.PHONY: build-html-chunked
build-html-chunked: xsltproc.sh xmllint.sh
- test -d $(HTML_CHUNKED) || mkdir $(HTML_CHUNKED)
+ @test -d $(HTML_CHUNKED) || mkdir $(HTML_CHUNKED)
@for dir in $(SUBDIRS); do\
test -f $$dir/Makefile &&\
(test -d $(HTML_CHUNKED)/$$dir || mkdir $(HTML_CHUNKED)/$$dir) &&\
@@ -35,7 +35,7 @@
.PHONY: build-html-single
build-html-single: xsltproc.sh xmllint.sh
- test -d $(HTML_SINGLE) || mkdir $(HTML_SINGLE)
+ @test -d $(HTML_SINGLE) || mkdir $(HTML_SINGLE)
@for dir in $(SUBDIRS); do\
test -f $$dir/Makefile &&\
(test -d $(HTML_SINGLE)/$$dir || mkdir $(HTML_SINGLE)/$$dir) &&\
@@ -44,11 +44,11 @@
.PHONY: clean-html-chunked
clean-html-chunked:
- -rm -rf $(HTML_CHUNKED)
+ @-rm -rf $(HTML_CHUNKED)
.PHONY: clean-html-single
clean-html-single:
- -rm -rf $(HTML_SINGLE)
+ @-rm -rf $(HTML_SINGLE)
.PHONY: distclean
distclean: clean-html-chunked clean-html-single
@@ -56,9 +56,9 @@
test -f $$dir/Makefile &&\
if $(MAKE) HTMLDIR=../$(HTML_CHUNKED)/$$dir -C $$dir distclean ; then :; else exit 1; fi;\
done
- -rm -f html-chunk.xsl html-single.xsl xsltproc.sh xmllint.sh
+ @-rm -f html-chunk.xsl html-single.xsl xsltproc.sh xmllint.sh
xsltproc.sh xmllint.sh:
- sh configure
+ @sh configure
clean: clean-html-chunked clean-html-single
diff -r 637af9175b65 -r 19919e913e3d DOCS/xml/Makefile.inc
--- a/DOCS/xml/Makefile.inc Tue Jan 20 19:28:35 2004 +0000
+++ b/DOCS/xml/Makefile.inc Tue Jan 20 23:27:25 2004 +0000
@@ -36,7 +36,7 @@
html-chunked: $(HTMLDIR)/index.html
html-single: $(HTMLFILE)
-$(HTMLDIR)/index.html: documentation.xml $(CHUNK_XSL_DEPS)
+$(HTMLDIR)/index.html: main.xml $(CHUNK_XSL_DEPS)
@if test "$(HTMLDIR)" = "" ; then \
echo "Error: HTMLDIR not set!!!"; \
echo "Typically this means, that you've run make from a subdir of DOCS/xml."; \
@@ -50,12 +50,12 @@
fi ; \
done ; \
fi
- -rm -f $(HTMLDIR)/*
- ../xmllint.sh $<
- cp -f $(HTML_STYLESHEET) $(HTMLDIR)/
- ../xsltproc.sh $(HTMLDIR)/ $(HTML_CHUNK_XSL) $<
+ @-rm -f $(HTMLDIR)/*
+ @../xmllint.sh $<
+ @cp -f $(HTML_STYLESHEET) $(HTMLDIR)/
+ @../xsltproc.sh $(HTMLDIR)/ $(HTML_CHUNK_XSL) $<
-$(HTMLFILE): documentation.xml $(XSL_DEPS)
+$(HTMLFILE): main.xml $(XSL_DEPS)
@if test "$(HTMLFILE)" = "" ; then \
echo "Error: HTMLFILE not set!!!"; \
echo "Typically this means, that you've run make from a subdir of DOCS/xml."; \
@@ -69,15 +69,16 @@
fi ; \
done ; \
fi
- -rm -f $(HTMLFILE)
- ../xmllint.sh $<
- cp -f $(HTML_STYLESHEET) `dirname $(HTMLFILE)`
- ../xsltproc.sh $(HTMLFILE) $(HTML_SINGLE_XSL) $<
+ @-rm -f $(HTMLFILE)
+ @../xmllint.sh $<
+ @cp -f $(HTML_STYLESHEET) `dirname $(HTMLFILE)`
+ @../xsltproc.sh $(HTMLFILE) $(HTML_SINGLE_XSL) $<
-../html-chunk.xsl ../html-single.xsl:
+../html-chunk.xsl ../html-single.xsl main.xml:
cd .. && sh configure
distclean:
+ @rm -f main.xml
@if test "$(USE_SYMLINKS)" = "yes" ; then \
rm -f `find *.xml -type l`; \
fi
diff -r 637af9175b65 -r 19919e913e3d DOCS/xml/configure
--- a/DOCS/xml/configure Tue Jan 20 19:28:35 2004 +0000
+++ b/DOCS/xml/configure Tue Jan 20 23:27:25 2004 +0000
@@ -6,6 +6,7 @@
_xsltwrapper="xsltproc.sh"
_xmllintwrapper="xmllint.sh"
+echo "Searching for XML catalogs..."
for _try_catalog in /etc/sgml/catalog /usr/share/sgml/docbook/xml-dtd-4.1.2/xmlcatalog /usr/share/apps/ksgmltools2/customization/en/catalog /usr/share/sgml/catalog /usr/local/share/sgml/catalog /usr/lib/sgml/catalog /usr/local/lib/sgml/catalog /usr/share/docbook-xml42/catalog.xml /usr/share/sgml/docbook/xmlcatalog
do
if test -f "$_try_catalog"
@@ -93,7 +94,44 @@
EOF
+echo "Searching for DTD..."
+for _try_dtd in /usr/share/sgml/docbook/dtd/xml/4.1.2/docbookx.dtd /usr/share/docbook-xml42/docbookx.dtd /usr/share/sgml/docbook/xml-dtd-4.1.2/docbookx.dtd
+do
+ if test -f "$_try_dtd"
+ then
+ _dtd=$_try_dtd
+ break
+ fi
+done
+if test -z "$_dtd"
+then
+ _dtd=/usr/share/sgml/docbook/dtd/xml/4.1.2/docbookx.dtd
+ echo "Not found. Using default ($_dtd)."
+else
+ echo "Found docbookx.dtd at $_dtd"
+fi
+
+for lang in `grep 'SUBDIRS =' Makefile|cut -d= -f2`; do
+ cat > $lang/main.xml << EOF
+
+' >> $lang/main.xml
+ done
+
+ cat >> $lang/main.xml << EOF
+]>
+
+&documentation.xml;
+
+EOF
+
+done
echo "Looking for a valid XSLT processor..."
# Checks for xsltproc, then checks for the Saxon processor (it needs Java).
@@ -250,7 +288,7 @@
do
if command -v $_try_xmllint > /dev/null 2>&1
then
- echo "Found: $_try_xmllint"
+ echo "Found $_try_xmllint"
if test -n "$_catalog"
then
_xmllint_command="$_try_xmllint --noout --noent --postvalid --catalogs \$*"
diff -r 637af9175b65 -r 19919e913e3d DOCS/xml/en/.cvsignore
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/DOCS/xml/en/.cvsignore Tue Jan 20 23:27:25 2004 +0000
@@ -0,0 +1,1 @@
+main.xml
diff -r 637af9175b65 -r 19919e913e3d DOCS/xml/en/documentation.xml
--- a/DOCS/xml/en/documentation.xml Tue Jan 20 19:28:35 2004 +0000
+++ b/DOCS/xml/en/documentation.xml Tue Jan 20 23:27:25 2004 +0000
@@ -1,31 +1,6 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-]>
-
<application>MPlayer</application> - The Movie Player for LINUX
@@ -208,4 +183,3 @@
&skin.xml;
&users-vs-dev.xml;
&patches.xml;
-
diff -r 637af9175b65 -r 19919e913e3d DOCS/xml/es/.cvsignore
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/DOCS/xml/es/.cvsignore Tue Jan 20 23:27:25 2004 +0000
@@ -0,0 +1,1 @@
+main.xml
diff -r 637af9175b65 -r 19919e913e3d DOCS/xml/es/documentation.xml
--- a/DOCS/xml/es/documentation.xml Tue Jan 20 19:28:35 2004 +0000
+++ b/DOCS/xml/es/documentation.xml Tue Jan 20 23:27:25 2004 +0000
@@ -1,31 +1,6 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-]>
-
MPlayer - El reproductor de Películas para LINUX
@@ -209,4 +184,3 @@
&skin.xml;
&users-vs-dev.xml;
&patches.xml;
-
diff -r 637af9175b65 -r 19919e913e3d DOCS/xml/fr/.cvsignore
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/DOCS/xml/fr/.cvsignore Tue Jan 20 23:27:25 2004 +0000
@@ -0,0 +1,1 @@
+main.xml
diff -r 637af9175b65 -r 19919e913e3d DOCS/xml/fr/documentation.xml
--- a/DOCS/xml/fr/documentation.xml Tue Jan 20 19:28:35 2004 +0000
+++ b/DOCS/xml/fr/documentation.xml Tue Jan 20 23:27:25 2004 +0000
@@ -1,32 +1,6 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-]>
-
MPlayer - Le lecteur vidéo pour LINUX
@@ -204,4 +178,3 @@
&skin.xml;
&users-vs-dev.xml;
&patches.xml;
-
diff -r 637af9175b65 -r 19919e913e3d DOCS/xml/pl/.cvsignore
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/DOCS/xml/pl/.cvsignore Tue Jan 20 23:27:25 2004 +0000
@@ -0,0 +1,1 @@
+main.xml
diff -r 637af9175b65 -r 19919e913e3d DOCS/xml/pl/documentation.xml
--- a/DOCS/xml/pl/documentation.xml Tue Jan 20 19:28:35 2004 +0000
+++ b/DOCS/xml/pl/documentation.xml Tue Jan 20 23:27:25 2004 +0000
@@ -1,31 +1,5 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-]>
-
-
<application>MPlayer</application> - Odtwarzacz filmów dla LINUKSA
@@ -215,4 +189,3 @@
&skin.xml;
&users-vs-dev.xml;
&patches.xml;
-
diff -r 637af9175b65 -r 19919e913e3d DOCS/xml/ru/.cvsignore
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/DOCS/xml/ru/.cvsignore Tue Jan 20 23:27:25 2004 +0000
@@ -0,0 +1,1 @@
+main.xml
diff -r 637af9175b65 -r 19919e913e3d DOCS/xml/ru/documentation.xml
--- a/DOCS/xml/ru/documentation.xml Tue Jan 20 19:28:35 2004 +0000
+++ b/DOCS/xml/ru/documentation.xml Tue Jan 20 23:27:25 2004 +0000
@@ -1,31 +1,6 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-]>
-
+
<application>MPlayer</application> - The Movie Player for LINUX
@@ -211,4 +186,3 @@
&skin.xml;
&users-vs-dev.xml;
&patches.xml;
-