emilytrau/lix
1
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* XInclude all the way.

Browse source
This commit is contained in:
Eelco Dolstra 2005-03-15 13:55:41 +00:00
parent b376565b86
commit e301334696
8 changed files with 43 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
doc/manual/Makefile.am
View file

@ -1,4 +1,4 @@
ENV = SGML_CATALOG_FILES=$(docbookcatalog):$(docbookebnfcatalog) ENV = SGML_CATALOG_FILES=$(docbookcatalog)
XMLLINT = $(ENV) $(xmllint) $(xmlflags) --catalogs XMLLINT = $(ENV) $(xmllint) $(xmlflags) --catalogs
XSLTPROC = $(ENV) $(xsltproc) $(xmlflags) --catalogs \ XSLTPROC = $(ENV) $(xsltproc) $(xmlflags) --catalogs \
@ -20,18 +20,18 @@ SOURCES = manual.xml introduction.xml installation.xml \
troubleshooting.xml bugs.xml opt-common.xml opt-common-syn.xml \ troubleshooting.xml bugs.xml opt-common.xml opt-common-syn.xml \
quick-start.xml nix-lang-ref.xml style.css images quick-start.xml nix-lang-ref.xml style.css images
manual.is-valid: $(SOURCES) version.xml manual.is-valid: $(SOURCES) version.txt
$(XMLLINT) --noout --valid manual.xml $(XMLLINT) --xinclude $< | $(XMLLINT) --noout --valid -
touch $@ touch $@
version.xml: version.txt:
echo -n $(VERSION) > version.xml echo -n $(VERSION) > version.txt
man $(MANS): $(SOURCES) manual.is-valid man $(MANS): $(SOURCES) manual.is-valid
$(XSLTPROC) $(docbookxsl)/manpages/docbook.xsl manual.xml $(XSLTPROC) --xinclude $(docbookxsl)/manpages/docbook.xsl manual.xml
manual.html: $(SOURCES) manual.is-valid images manual.html: $(SOURCES) manual.is-valid images
$(XSLTPROC) --output manual.html $(docbookxsl)/html/docbook.xsl manual.xml $(XSLTPROC) --xinclude --output manual.html $(docbookxsl)/html/docbook.xsl manual.xml
all-local: manual.html all-local: manual.html
@ -50,7 +50,7 @@ images:
cp $(docbookxsl)/images/callouts/*.png images/callouts cp $(docbookxsl)/images/callouts/*.png images/callouts
chmod +w -R images chmod +w -R images
KEEP = manual.html manual.is-valid version.xml $(MANS) KEEP = manual.html manual.is-valid version.txt $(MANS)
EXTRA_DIST = $(SOURCES) $(FIGURES) $(KEEP) EXTRA_DIST = $(SOURCES) $(FIGURES) $(KEEP)

55
doc/manual/manual.xml
View file

@ -3,31 +3,14 @@
PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip" "http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip"
[ [
<!ENTITY introduction SYSTEM "introduction.xml">
<!ENTITY quick-start SYSTEM "quick-start.xml">
<!ENTITY installation SYSTEM "installation.xml">
<!ENTITY package-management SYSTEM "package-management.xml">
<!ENTITY writing-nix-expressions SYSTEM "writing-nix-expressions.xml">
<!ENTITY build-farm SYSTEM "build-farm.xml">
<!ENTITY opt-common SYSTEM "opt-common.xml">
<!ENTITY opt-common-syn SYSTEM "opt-common-syn.xml">
<!ENTITY nix-env SYSTEM "nix-env.xml">
<!ENTITY nix-store SYSTEM "nix-store.xml">
<!ENTITY nix-instantiate SYSTEM "nix-instantiate.xml">
<!ENTITY nix-collect-garbage SYSTEM "nix-collect-garbage.xml">
<!ENTITY nix-push SYSTEM "nix-push.xml">
<!ENTITY nix-pull SYSTEM "nix-pull.xml">
<!ENTITY nix-prefetch-url SYSTEM "nix-prefetch-url.xml">
<!-- <!ENTITY nix-lang-ref SYSTEM "nix-lang-ref.xml"> -->
<!ENTITY troubleshooting SYSTEM "troubleshooting.xml">
<!ENTITY bugs SYSTEM "bugs.xml">
<!ENTITY version SYSTEM "version.xml">
]> ]>
<book> <book>
<title>Nix User's Guide</title> <title>Nix User's Guide</title>
<subtitle>Draft (Version &version;)</subtitle> <subtitle>Draft (Version <xi:include
xmlns:xi="http://www.w3.org/2001/XInclude"
href="version.txt" parse="text" />)</subtitle>
<bookinfo> <bookinfo>
<author> <author>
@ -41,48 +24,48 @@
</copyright> </copyright>
</bookinfo> </bookinfo>
&introduction; <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction.xml" />
&quick-start; <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="quick-start.xml" />
&installation; <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installation.xml" />
&package-management; <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="package-management.xml" />
&writing-nix-expressions; <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="writing-nix-expressions.xml" />
&build-farm; <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="build-farm.xml" />
<appendix> <appendix>
<title>Command Reference</title> <title>Command Reference</title>
<sect1> <sect1>
<title>nix-env</title> <title>nix-env</title>
&nix-env; <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nix-env.xml" />
</sect1> </sect1>
<sect1> <sect1>
<title>nix-store</title> <title>nix-store</title>
&nix-store; <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nix-store.xml" />
</sect1> </sect1>
<sect1> <sect1>
<title>nix-instantiate</title> <title>nix-instantiate</title>
&nix-instantiate; <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nix-instantiate.xml" />
</sect1> </sect1>
<sect1> <sect1>
<title>nix-collect-garbage</title> <title>nix-collect-garbage</title>
&nix-collect-garbage; <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nix-collect-garbage.xml" />
</sect1> </sect1>
<sect1> <sect1>
<title>nix-push</title> <title>nix-push</title>
&nix-push; <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nix-push.xml" />
</sect1> </sect1>
<sect1> <sect1>
<title>nix-pull</title> <title>nix-pull</title>
&nix-pull; <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nix-pull.xml" />
</sect1> </sect1>
<sect1> <sect1>
<title>nix-prefetch-url</title> <title>nix-prefetch-url</title>
&nix-prefetch-url; <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nix-prefetch-url.xml" />
</sect1> </sect1>
</appendix> </appendix>
<!-- &nix-lang-ref; --> <!-- &nix-lang-ref; -->
&troubleshooting; <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="troubleshooting.xml" />
&bugs; <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bugs.xml" />
</book> </book>

4
doc/manual/nix-env.xml
View file

@ -7,7 +7,7 @@
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>nix-env</command> <command>nix-env</command>
&opt-common-syn; <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opt-common-syn.xml#xpointer(/nop/*)" />
<arg> <arg>
<group choice='req'> <group choice='req'>
<arg choice='plain'><option>--file</option></arg> <arg choice='plain'><option>--file</option></arg>
@ -79,7 +79,7 @@
<variablelist> <variablelist>
&opt-common; <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opt-common.xml#xpointer(/nop/*)" />
<varlistentry> <varlistentry>
<term><option>--file</option> / <option>-f</option></term> <term><option>--file</option> / <option>-f</option></term>

4
doc/manual/nix-instantiate.xml
View file

@ -7,7 +7,7 @@
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>nix-instantiate</command> <command>nix-instantiate</command>
&opt-common-syn; <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opt-common-syn.xml#xpointer(/nop/*)" />
<group choice='opt'> <group choice='opt'>
<arg choice='plain'><option>--parse-only</option></arg> <arg choice='plain'><option>--parse-only</option></arg>
<arg choice='plain'><option>--eval-only</option></arg> <arg choice='plain'><option>--eval-only</option></arg>
@ -41,7 +41,7 @@
<variablelist> <variablelist>
&opt-common; <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opt-common.xml#xpointer(/nop/*)" />
<varlistentry> <varlistentry>
<term><option>--parse-only</option></term> <term><option>--parse-only</option></term>

4
doc/manual/nix-store.xml
View file

@ -7,7 +7,7 @@
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>nix-store</command> <command>nix-store</command>
&opt-common-syn; <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opt-common-syn.xml#xpointer(/nop/*)" />
<arg choice='plain'><replaceable>operation</replaceable></arg> <arg choice='plain'><replaceable>operation</replaceable></arg>
<arg rep='repeat'><replaceable>options</replaceable></arg> <arg rep='repeat'><replaceable>options</replaceable></arg>
<arg rep='repeat'><replaceable>arguments</replaceable></arg> <arg rep='repeat'><replaceable>arguments</replaceable></arg>
@ -46,7 +46,7 @@
<variablelist> <variablelist>
&opt-common; <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opt-common.xml#xpointer(/nop/*)" />
</variablelist> </variablelist>

4
doc/manual/opt-common-syn.xml
View file

@ -1,3 +1,5 @@
<nop>
<arg><option>--help</option></arg> <arg><option>--help</option></arg>
<arg><option>--version</option></arg> <arg><option>--version</option></arg>
<arg rep='repeat'><option>--verbose</option></arg> <arg rep='repeat'><option>--verbose</option></arg>
@ -17,3 +19,5 @@
<arg><option>-K</option></arg> <arg><option>-K</option></arg>
<arg><option>--fallback</option></arg> <arg><option>--fallback</option></arg>
<arg><option>--readonly-mode</option></arg> <arg><option>--readonly-mode</option></arg>
</nop>

4
doc/manual/opt-common.xml
View file

@ -1,3 +1,5 @@
<nop>
<varlistentry> <varlistentry>
<term><option>--help</option></term> <term><option>--help</option></term>
<listitem> <listitem>
@ -182,3 +184,5 @@
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</nop>

2
doc/manual/writing-nix-expressions.xml
View file

@ -383,7 +383,7 @@ some fragments of
that can be built by Nix (since when we fill in the arguments of that can be built by Nix (since when we fill in the arguments of
the function, what we get is its body, which is the call to the function, what we get is its body, which is the call to
<varname>stdenv.mkDerivation</varname> in <xref <varname>stdenv.mkDerivation</varname> in <xref
linkend='ex-hello-nix ' />).</para> linkend='ex-hello-nix' />).</para>
</callout> </callout>