[MPlayer-DOCS] Build system [patch]
Torinthiel
torinthiel at wp.pl
Wed Dec 24 22:44:07 CET 2003
On Wed, Dec 24, 2003 at 08:08:05PM +0100, Diego Biurrun wrote:
> Torinthiel writes:
> > Ok, here is the newest wersion of my build system patch. It incudes
> > newest sync, so applies cleanly on todays CVS. And I get more info it is
> > needed - you place the DTD in
> > /usr/share/sgml/docbook/dtd/xml/4.1.2/docbookx.dtd,
> > on Cygwin it is in usr/share/docbook-xml42/docbookx.dtd,
> > on PLD in /usr/share/sgml/docbook/xml-dtd-4.1.2/docbookx.dtd,
> > on Gentoo in /usr/share/sgml/docbook/xml-dtd-4.1.2/docbookx.dtd
> > So it's getting more and more needed.
> > Please test and comment, I'll apply when it's acceptable.
>
> I have some small suggestions below. Also please test it under Cygwin
> as that was the original motivation for the build system change. If
> you cannot test it yourself, send it to the mplayer-cygwin list,
> somebody there should be able to help you out. I'd test it myself,
> but I do not currently have access to a Windows box I can fiddle with.
Ok, applied almost all, except for one. Sent here, and I will send it to
-cygwin as soon as I subscribe it, as I don't use it. And I'll even
subscribe (for a brief period of time) to -os2 and -users, to ask if
anybody has a different DTD location. Is there a list for MinGW? I think
I should also ask there.
> > distclean:
> > + rm -f main.xml
>
> That's unnecessary in Makefile.inc, it's already removed from within
> Makefile upon distclean. Remove this.
No, it is not the same main.xml file. There is one in xml directory,
which contains LANG_CODE, and one in each language subdirectory that
contains LANG_CODE sedded to appropriate code. And each one needs to be
removed during make. Maybe I should rename the root file to something
indicating it's not usable without changing, but I don't have any
sensible idea. Anyway, this is only cosmetics.
Torinthiel
--
Waclaw "Torinthiel" Schiller GG#: 542916, 3073512
torinthiel(at)wp(dot)pl
gpg: B06901F1 fpr: FAA3 559F CAE9 34DE CDC8 7346 2B6E 39F2 B069 01F1
"No classmates may be used during this examination"
-------------- next part --------------
Index: .cvsignore
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/.cvsignore,v
retrieving revision 1.3
diff -u -r1.3 .cvsignore
--- .cvsignore 21 Oct 2003 11:07:02 -0000 1.3
+++ .cvsignore 26 Nov 2003 22:36:33 -0000
@@ -2,3 +2,4 @@
html-single.xsl
xsltproc.sh
xmllint.sh
+main.xml
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile 16 Nov 2003 00:57:47 -0000 1.14
+++ Makefile 26 Nov 2003 22:36:33 -0000
@@ -56,7 +56,7 @@
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 main.xml
xsltproc.sh xmllint.sh:
sh configure
Index: Makefile.inc
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/Makefile.inc,v
retrieving revision 1.12
diff -u -r1.12 Makefile.inc
--- Makefile.inc 25 Nov 2003 12:41:56 -0000 1.12
+++ Makefile.inc 26 Nov 2003 22:36:33 -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."; \
@@ -55,7 +55,7 @@
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."; \
@@ -74,10 +74,14 @@
cp -f $(HTML_STYLESHEET) `dirname $(HTMLFILE)`
../xsltproc.sh $(HTMLFILE) $(HTML_SINGLE_XSL) $<
-../html-chunk.xsl ../html-single.xsl:
+main.xml: ../main.xml
+ @sed -e 's/LANG_CODE/$(XML_LANG)/' ../main.xml > main.xml
+
+../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
Index: README.maintainers
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/README.maintainers,v
retrieving revision 1.12
diff -u -r1.12 README.maintainers
--- README.maintainers 21 Oct 2003 14:57:41 -0000 1.12
+++ README.maintainers 26 Nov 2003 22:36:33 -0000
@@ -27,7 +27,7 @@
2) Make sure to create a 'Makefile' for the translation -- you can
use 'en/Makefile' as an example.
-3) Set <book lang="XX"> to your language code if the DocBook XSL
+3) Set XML_LANG=XX in the Makefile to your language code if the DocBook XSL
stylesheets support it.
4) If you want to use a customized XSL stylesheet, create one and name it
Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/configure,v
retrieving revision 1.8
diff -u -r1.8 configure
--- configure 16 Nov 2003 00:57:47 -0000 1.8
+++ configure 26 Nov 2003 22:36:33 -0000
@@ -93,7 +93,41 @@
</xsl:stylesheet>
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 /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
+
+cat > main.xml << EOF
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+ "$_dtd"
+[
+EOF
+
+for file in `find en -name \*.xml -exec basename \{\} \; | sort`; do
+ echo '<!ENTITY '$file' SYSTEM "'$file'">' >> main.xml
+done
+
+cat >>main.xml <<EOF
+]>
+<book id="index" lang="LANG_CODE">
+&documentation.xml;
+</book>
+EOF
echo "Looking for a valid XSLT processor..."
# Checks for xsltproc, then checks for the Saxon processor (it needs Java).
Index: en/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/en/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- en/Makefile 20 Oct 2003 09:56:43 -0000 1.3
+++ en/Makefile 26 Nov 2003 22:36:33 -0000
@@ -3,6 +3,9 @@
# Set if you are using your own HTML stylesheet...
#HTML_STYLESHEET = mystyle.css
+# Set to the XML language code of your language.
+XML_LANG = en
+
# Change to yes to enable symlinking missing files to English master versions
USE_SYMLINKS = no
Index: en/documentation.xml
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/en/documentation.xml,v
retrieving revision 1.6
diff -u -r1.6 documentation.xml
--- en/documentation.xml 21 Sep 2003 13:05:42 -0000 1.6
+++ en/documentation.xml 26 Nov 2003 22:36:33 -0000
@@ -1,32 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $Revision: 1.7 $ -->
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
- "/usr/share/sgml/docbook/dtd/xml/4.1.2/docbookx.dtd"
-[
-<!ENTITY audio.xml SYSTEM "audio.xml">
-<!ENTITY bugreports.xml SYSTEM "bugreports.xml">
-<!ENTITY bugs.xml SYSTEM "bugs.xml">
-<!ENTITY cd-dvd.xml SYSTEM "cd-dvd.xml">
-<!ENTITY codecs.xml SYSTEM "codecs.xml">
-<!ENTITY edl.xml SYSTEM "edl.xml">
-<!ENTITY faq.xml SYSTEM "faq.xml">
-<!ENTITY features.xml SYSTEM "features.xml">
-<!ENTITY formats.xml SYSTEM "formats.xml">
-<!ENTITY history.xml SYSTEM "history.xml">
-<!ENTITY install.xml SYSTEM "install.xml">
-<!ENTITY mail-lists.xml SYSTEM "mail-lists.xml">
-<!ENTITY mencoder.xml SYSTEM "mencoder.xml">
-<!ENTITY patches.xml SYSTEM "patches.xml">
-<!ENTITY ports.xml SYSTEM "ports.xml">
-<!ENTITY skin.xml SYSTEM "skin.xml">
-<!ENTITY tvinput.xml SYSTEM "tvinput.xml">
-<!ENTITY usage.xml SYSTEM "usage.xml">
-<!ENTITY users-vs-dev.xml SYSTEM "users-vs-dev.xml">
-<!ENTITY video-filters.xml SYSTEM "video-filters.xml">
-<!ENTITY video.xml SYSTEM "video.xml">
-]>
-<book id="index" lang="en">
<bookinfo id="toc">
<title><application>MPlayer</application> - The Movie Player for LINUX</title>
<subtitle><ulink url="http://www.mplayerhq.hu"></ulink></subtitle>
@@ -209,4 +182,3 @@
&skin.xml;
&users-vs-dev.xml;
&patches.xml;
-</book>
Index: es/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/es/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- es/Makefile 20 Oct 2003 09:56:44 -0000 1.4
+++ es/Makefile 26 Nov 2003 22:36:33 -0000
@@ -3,6 +3,9 @@
# Set if you are using your own HTML stylesheet...
#HTML_STYLESHEET = mystyle.css
+# Set to the XML language code of your language.
+XML_LANG = es
+
# Change to yes to enable symlinking missing files to English master versions
USE_SYMLINKS = no
Index: es/documentation.xml
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/es/documentation.xml,v
retrieving revision 1.6
diff -u -r1.6 documentation.xml
--- es/documentation.xml 8 Oct 2003 01:06:50 -0000 1.6
+++ es/documentation.xml 26 Nov 2003 22:36:33 -0000
@@ -1,32 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- synced with 1.6 -->
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
- "/usr/share/sgml/docbook/dtd/xml/4.1.2/docbookx.dtd"
-[
-<!ENTITY audio.xml SYSTEM "audio.xml">
-<!ENTITY bugreports.xml SYSTEM "bugreports.xml">
-<!ENTITY bugs.xml SYSTEM "bugs.xml">
-<!ENTITY cd-dvd.xml SYSTEM "cd-dvd.xml">
-<!ENTITY codecs.xml SYSTEM "codecs.xml">
-<!ENTITY edl.xml SYSTEM "edl.xml">
-<!ENTITY faq.xml SYSTEM "faq.xml">
-<!ENTITY features.xml SYSTEM "features.xml">
-<!ENTITY formats.xml SYSTEM "formats.xml">
-<!ENTITY history.xml SYSTEM "history.xml">
-<!ENTITY install.xml SYSTEM "install.xml">
-<!ENTITY mail-lists.xml SYSTEM "mail-lists.xml">
-<!ENTITY mencoder.xml SYSTEM "mencoder.xml">
-<!ENTITY patches.xml SYSTEM "patches.xml">
-<!ENTITY ports.xml SYSTEM "ports.xml">
-<!ENTITY skin.xml SYSTEM "skin.xml">
-<!ENTITY tvinput.xml SYSTEM "tvinput.xml">
-<!ENTITY usage.xml SYSTEM "usage.xml">
-<!ENTITY users-vs-dev.xml SYSTEM "users-vs-dev.xml">
-<!ENTITY video-filters.xml SYSTEM "video-filters.xml">
-<!ENTITY video.xml SYSTEM "video.xml">
-]>
-<book lang="es">
<bookinfo id="toc">
<title>MPlayer - El reproductor de Películas para LINUX</title>
<subtitle><ulink url="http://www.mplayerhq.hu"></ulink></subtitle>
@@ -210,4 +184,3 @@
&skin.xml;
&users-vs-dev.xml;
&patches.xml;
-</book>
Index: fr/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/fr/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- fr/Makefile 20 Oct 2003 09:56:45 -0000 1.3
+++ fr/Makefile 26 Nov 2003 22:36:33 -0000
@@ -3,6 +3,9 @@
# Set if you are using your own HTML stylesheet...
#HTML_STYLESHEET = mystyle.css
+# Set to the XML language code of your language.
+XML_LANG = fr
+
# Change to yes to enable symlinking missing files to English master versions
USE_SYMLINKS = no
Index: fr/documentation.xml
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/fr/documentation.xml,v
retrieving revision 1.5
diff -u -r1.5 documentation.xml
--- fr/documentation.xml 12 Oct 2003 09:46:57 -0000 1.5
+++ fr/documentation.xml 26 Nov 2003 22:36:34 -0000
@@ -1,32 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- synced with 1.6 -->
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
- "/usr/share/sgml/docbook/dtd/xml/4.1.2/docbookx.dtd"
-[
-<!ENTITY audio.xml SYSTEM "audio.xml">
-<!ENTITY bugreports.xml SYSTEM "bugreports.xml">
-<!ENTITY bugs.xml SYSTEM "bugs.xml">
-<!ENTITY cd-dvd.xml SYSTEM "cd-dvd.xml">
-<!ENTITY codecs.xml SYSTEM "codecs.xml">
-<!ENTITY edl.xml SYSTEM "edl.xml">
-<!ENTITY faq.xml SYSTEM "faq.xml">
-<!ENTITY features.xml SYSTEM "features.xml">
-<!ENTITY formats.xml SYSTEM "formats.xml">
-<!ENTITY history.xml SYSTEM "history.xml">
-<!ENTITY install.xml SYSTEM "install.xml">
-<!ENTITY mail-lists.xml SYSTEM "mail-lists.xml">
-<!ENTITY mencoder.xml SYSTEM "mencoder.xml">
-<!ENTITY patches.xml SYSTEM "patches.xml">
-<!ENTITY ports.xml SYSTEM "ports.xml">
-<!ENTITY skin.xml SYSTEM "skin.xml">
-<!ENTITY tvinput.xml SYSTEM "tvinput.xml">
-<!ENTITY usage.xml SYSTEM "usage.xml">
-<!ENTITY users-vs-dev.xml SYSTEM "users-vs-dev.xml">
-<!ENTITY video-filters.xml SYSTEM "video-filters.xml">
-<!ENTITY video.xml SYSTEM "video.xml">
-]>
-<book id="index" lang="fr">
<bookinfo id="toc">
<title>MPlayer - Le lecteur vidéo pour LINUX</title>
<subtitle><ulink url="http://www.mplayerhq.hu"></ulink></subtitle>
@@ -204,4 +178,3 @@
&skin.xml;
&users-vs-dev.xml;
&patches.xml;
-</book>
Index: pl/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/pl/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- pl/Makefile 20 Oct 2003 09:56:47 -0000 1.2
+++ pl/Makefile 26 Nov 2003 22:36:34 -0000
@@ -3,6 +3,9 @@
# Set if you are using your own HTML stylesheet...
#HTML_STYLESHEET = mystyle.css
+# Set to the XML language code of your language.
+XML_LANG = pl
+
# Change to yes to enable symlinking missing files to English master versions
USE_SYMLINKS = yes
Index: pl/documentation.xml
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/pl/documentation.xml,v
retrieving revision 1.1
diff -u -r1.1 documentation.xml
--- pl/documentation.xml 15 Oct 2003 16:37:42 -0000 1.1
+++ pl/documentation.xml 26 Nov 2003 22:36:34 -0000
@@ -1,32 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!-- synced with 1.7 -->
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
- "/usr/share/sgml/docbook/dtd/xml/4.1.2/docbookx.dtd"
-[
-<!ENTITY audio.xml SYSTEM "audio.xml">
-<!ENTITY bugreports.xml SYSTEM "bugreports.xml">
-<!ENTITY bugs.xml SYSTEM "bugs.xml">
-<!ENTITY cd-dvd.xml SYSTEM "cd-dvd.xml">
-<!ENTITY codecs.xml SYSTEM "codecs.xml">
-<!ENTITY edl.xml SYSTEM "edl.xml">
-<!ENTITY faq.xml SYSTEM "faq.xml">
-<!ENTITY features.xml SYSTEM "features.xml">
-<!ENTITY formats.xml SYSTEM "formats.xml">
-<!ENTITY history.xml SYSTEM "history.xml">
-<!ENTITY install.xml SYSTEM "install.xml">
-<!ENTITY mail-lists.xml SYSTEM "mail-lists.xml">
-<!ENTITY mencoder.xml SYSTEM "mencoder.xml">
-<!ENTITY patches.xml SYSTEM "patches.xml">
-<!ENTITY ports.xml SYSTEM "ports.xml">
-<!ENTITY skin.xml SYSTEM "skin.xml">
-<!ENTITY tvinput.xml SYSTEM "tvinput.xml">
-<!ENTITY usage.xml SYSTEM "usage.xml">
-<!ENTITY users-vs-dev.xml SYSTEM "users-vs-dev.xml">
-<!ENTITY video-filters.xml SYSTEM "video-filters.xml">
-<!ENTITY video.xml SYSTEM "video.xml">
-]>
-
-<book id="index" lang="pl">
<bookinfo id="toc">
<title><application>MPlayer</application> - Odtwarzacz filmów dla LINUKSA</title>
<subtitle><ulink url="http://www.mplayerhq.hu"></ulink></subtitle>
@@ -216,4 +189,3 @@
&skin.xml;
&users-vs-dev.xml;
&patches.xml;
-</book>
Index: ru/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/ru/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- ru/Makefile 20 Oct 2003 09:56:48 -0000 1.3
+++ ru/Makefile 26 Nov 2003 22:36:34 -0000
@@ -3,6 +3,9 @@
# Set if you are using your own HTML stylesheet...
#HTML_STYLESHEET = mystyle.css
+# Set to the XML language code of your language.
+XML_LANG = ru
+
# Change to yes to enable symlinking missing files to English master versions
USE_SYMLINKS = yes
Index: ru/documentation.xml
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/ru/documentation.xml,v
retrieving revision 1.9
diff -u -r1.9 documentation.xml
--- ru/documentation.xml 8 Oct 2003 01:40:57 -0000 1.9
+++ ru/documentation.xml 26 Nov 2003 22:36:34 -0000
@@ -1,31 +1,6 @@
-<?xml version="1.0" encoding="KOI8-R" standalone="no"?>
+<?xml version="1.0" encoding="KOI8-R"?>
<!-- synced with 1.7 -->
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
- "/usr/share/sgml/docbook/dtd/xml/4.1.2/docbookx.dtd"
-[
-<!ENTITY audio.xml SYSTEM "audio.xml">
-<!ENTITY bugreports.xml SYSTEM "bugreports.xml">
-<!ENTITY bugs.xml SYSTEM "bugs.xml">
-<!ENTITY cd-dvd.xml SYSTEM "cd-dvd.xml">
-<!ENTITY codecs.xml SYSTEM "codecs.xml">
-<!ENTITY edl.xml SYSTEM "edl.xml">
-<!ENTITY faq.xml SYSTEM "faq.xml">
-<!ENTITY features.xml SYSTEM "features.xml">
-<!ENTITY formats.xml SYSTEM "formats.xml">
-<!ENTITY history.xml SYSTEM "history.xml">
-<!ENTITY install.xml SYSTEM "install.xml">
-<!ENTITY mail-lists.xml SYSTEM "mail-lists.xml">
-<!ENTITY mencoder.xml SYSTEM "mencoder.xml">
-<!ENTITY patches.xml SYSTEM "patches.xml">
-<!ENTITY ports.xml SYSTEM "ports.xml">
-<!ENTITY skin.xml SYSTEM "skin.xml">
-<!ENTITY tvinput.xml SYSTEM "tvinput.xml">
-<!ENTITY usage.xml SYSTEM "usage.xml">
-<!ENTITY users-vs-dev.xml SYSTEM "users-vs-dev.xml">
-<!ENTITY video-filters.xml SYSTEM "video-filters.xml">
-<!ENTITY video.xml SYSTEM "video.xml">
-]>
-<book id="index" lang="ru">
+
<bookinfo id="toc">
<title><application>MPlayer</application> - The Movie Player for LINUX</title>
<subtitle><ulink url="http://www.mplayerhq.hu"></ulink></subtitle>
@@ -211,4 +185,3 @@
&skin.xml;
&users-vs-dev.xml;
&patches.xml;
-</book>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-docs/attachments/20031224/d90a37a0/attachment.pgp>
More information about the MPlayer-DOCS
mailing list