summaryrefslogtreecommitdiffstats
path: root/handbook
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-09-29 14:26:29 (GMT)
committerRichard Purdie <rpurdie@linux.intel.com>2010-09-29 14:27:04 (GMT)
commit2624b6181411fe722c73ec95aba9ea8c3d92bca5 (patch)
treebb3c5db53c6c5fbbdb086c90a644ece12cda8e21 /handbook
parent1e0e6f11850c7014700604f7e24f9579d8d19102 (diff)
downloadpoky-2624b6181411fe722c73ec95aba9ea8c3d92bca5.tar.gz
poky-doc-tools: Remove unnecessary autotools usage and simplfy structure
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'handbook')
-rw-r--r--handbook/Makefile11
-rw-r--r--handbook/bsp-guide.xml4
-rw-r--r--handbook/poky-doc-tools/AUTHORS0
-rw-r--r--handbook/poky-doc-tools/COPYING0
-rw-r--r--handbook/poky-doc-tools/ChangeLog30
-rw-r--r--handbook/poky-doc-tools/INSTALL236
-rw-r--r--handbook/poky-doc-tools/Makefile.am24
-rw-r--r--handbook/poky-doc-tools/NEWS0
-rw-r--r--handbook/poky-doc-tools/README19
-rwxr-xr-xhandbook/poky-doc-tools/autogen.sh3
-rw-r--r--handbook/poky-doc-tools/common/Makefile.am21
-rw-r--r--handbook/poky-doc-tools/configure.ac27
-rw-r--r--handbook/poky-handbook.xml2
-rw-r--r--handbook/template/Vera.ttf (renamed from handbook/poky-doc-tools/common/Vera.ttf)bin65932 -> 65932 bytes
-rw-r--r--handbook/template/Vera.xml (renamed from handbook/poky-doc-tools/common/Vera.xml)0
-rw-r--r--handbook/template/VeraMoBd.ttf (renamed from handbook/poky-doc-tools/common/VeraMoBd.ttf)bin49052 -> 49052 bytes
-rw-r--r--handbook/template/VeraMoBd.xml (renamed from handbook/poky-doc-tools/common/VeraMoBd.xml)0
-rw-r--r--handbook/template/VeraMono.ttf (renamed from handbook/poky-doc-tools/common/VeraMono.ttf)bin49224 -> 49224 bytes
-rw-r--r--handbook/template/VeraMono.xml (renamed from handbook/poky-doc-tools/common/VeraMono.xml)0
-rw-r--r--handbook/template/draft.png (renamed from handbook/poky-doc-tools/common/draft.png)bin24847 -> 24847 bytes
-rw-r--r--handbook/template/fop-config.xml (renamed from handbook/poky-doc-tools/common/fop-config.xml.in)4
-rw-r--r--handbook/template/ohand-color.svg (renamed from handbook/poky-doc-tools/common/ohand-color.svg)0
-rw-r--r--handbook/template/poky-db-pdf.xsl (renamed from handbook/poky-doc-tools/common/poky-db-pdf.xsl)0
-rw-r--r--handbook/template/poky-handbook.png (renamed from handbook/poky-doc-tools/common/poky-handbook.png)bin32145 -> 32145 bytes
-rw-r--r--handbook/template/poky.svg (renamed from handbook/poky-doc-tools/common/poky.svg)0
-rw-r--r--handbook/template/titlepage.templates.xml (renamed from handbook/poky-doc-tools/common/titlepage.templates.xml)0
-rwxr-xr-x[-rw-r--r--]handbook/tools/poky-docbook-to-pdf (renamed from handbook/poky-doc-tools/poky-docbook-to-pdf.in)20
27 files changed, 18 insertions, 383 deletions
diff --git a/handbook/Makefile b/handbook/Makefile
index 502c951..ee549f1 100644
--- a/handbook/Makefile
+++ b/handbook/Makefile
@@ -1,10 +1,8 @@
1all: html pdf tarball 1all: html pdf tarball
2 2
3pdf: 3pdf:
4 ./poky-doc-tools/poky-docbook-to-pdf poky-handbook.xml 4 ./tools/poky-docbook-to-pdf poky-handbook.xml ./template
5 ./poky-doc-tools/poky-docbook-to-pdf bsp-guide.xml 5 ./tools/poky-docbook-to-pdf bsp-guide.xml ./template
6# -- old way --
7# dblatex poky-handbook.xml
8 6
9XSLTOPTS = --stringparam html.stylesheet style.css \ 7XSLTOPTS = --stringparam html.stylesheet style.css \
10 --stringparam chapter.autolabel 1 \ 8 --stringparam chapter.autolabel 1 \
@@ -22,8 +20,6 @@ html:
22# See http://www.sagehill.net/docbookxsl/HtmlOutput.html 20# See http://www.sagehill.net/docbookxsl/HtmlOutput.html
23 xsltproc $(XSLTOPTS) -o poky-handbook.html $(XSL_XHTML_URI) poky-handbook.xml 21 xsltproc $(XSLTOPTS) -o poky-handbook.html $(XSL_XHTML_URI) poky-handbook.xml
24 xsltproc $(XSLTOPTS) -o bsp-guide.html $(XSL_XHTML_URI) bsp-guide.xml 22 xsltproc $(XSLTOPTS) -o bsp-guide.html $(XSL_XHTML_URI) bsp-guide.xml
25# -- old way --
26# xmlto xhtml-nochunks poky-handbook.xml
27 23
28tarball: html 24tarball: html
29 tar -cvzf poky-handbook.tgz poky-handbook.html style.css screenshots/ss-sato.png poky-beaver.png poky-handbook.png 25 tar -cvzf poky-handbook.tgz poky-handbook.html style.css screenshots/ss-sato.png poky-beaver.png poky-handbook.png
@@ -36,3 +32,6 @@ SOURCES = *.png *.xml *.css *.svg
36 32
37publish: 33publish:
38 scp -r $(OUTPUTS) $(SOURCES) o-hand.com:/srv/www/pokylinux.org/doc/ 34 scp -r $(OUTPUTS) $(SOURCES) o-hand.com:/srv/www/pokylinux.org/doc/
35
36clean:
37 rm $(OUTPUTS)
diff --git a/handbook/bsp-guide.xml b/handbook/bsp-guide.xml
index e5933d7..ab2043a 100644
--- a/handbook/bsp-guide.xml
+++ b/handbook/bsp-guide.xml
@@ -9,7 +9,7 @@
9 9
10 <mediaobject> 10 <mediaobject>
11 <imageobject> 11 <imageobject>
12 <imagedata fileref='common/poky-handbook.png' 12 <imagedata fileref='template/poky-handbook.png'
13 format='SVG' 13 format='SVG'
14 align='center' scalefit='1' width='100%'/> 14 align='center' scalefit='1' width='100%'/>
15 </imageobject> 15 </imageobject>
@@ -42,7 +42,7 @@
42 42
43 <legalnotice> 43 <legalnotice>
44 <para> 44 <para>
45 Permission is granted to copy, distribute and/or modify this document under 45 Permission is granted to copy, distribute and/or modify pthis document under
46 the terms of the <ulink type="http" url="http://creativecommons.org/licenses/by-nc-sa/2.0/uk/">Creative Commons Attribution-Non-Commercial-Share Alike 2.0 UK: England &amp; Wales</ulink> as published by Creative Commons. 46 the terms of the <ulink type="http" url="http://creativecommons.org/licenses/by-nc-sa/2.0/uk/">Creative Commons Attribution-Non-Commercial-Share Alike 2.0 UK: England &amp; Wales</ulink> as published by Creative Commons.
47 </para> 47 </para>
48 </legalnotice> 48 </legalnotice>
diff --git a/handbook/poky-doc-tools/AUTHORS b/handbook/poky-doc-tools/AUTHORS
deleted file mode 100644
index e69de29..0000000
--- a/handbook/poky-doc-tools/AUTHORS
+++ /dev/null
diff --git a/handbook/poky-doc-tools/COPYING b/handbook/poky-doc-tools/COPYING
deleted file mode 100644
index e69de29..0000000
--- a/handbook/poky-doc-tools/COPYING
+++ /dev/null
diff --git a/handbook/poky-doc-tools/ChangeLog b/handbook/poky-doc-tools/ChangeLog
deleted file mode 100644
index beee679..0000000
--- a/handbook/poky-doc-tools/ChangeLog
+++ /dev/null
@@ -1,30 +0,0 @@
12008-02-15 Matthew Allum <mallum@openedhand.com>
2
3 * common/Makefile.am:
4 * common/poky-handbook.png:
5 Add a PNG image for the manual. Seems our logo SVG
6 is too complex/transparent for PDF
7
82008-02-14 Matthew Allum <mallum@openedhand.com>
9
10 * common/Makefile.am:
11 * common/fop-config.xml.in:
12 * common/poky-db-pdf.xsl:
13 * poky-docbook-to-pdf.in:
14 Font tweakage.
15
162008-01-27 Matthew Allum <mallum@openedhand.com>
17
18 * INSTALL:
19 * Makefile.am:
20 * README:
21 * autogen.sh:
22 * common/Makefile.am:
23 * common/fop-config.xml.in:
24 * common/ohand-color.svg:
25 * common/poky-db-pdf.xsl:
26 * common/poky.svg:
27 * common/titlepage.templates.xml:
28 * configure.ac:
29 * poky-docbook-to-pdf.in:
30 Initial import.
diff --git a/handbook/poky-doc-tools/INSTALL b/handbook/poky-doc-tools/INSTALL
deleted file mode 100644
index 23e5f25..0000000
--- a/handbook/poky-doc-tools/INSTALL
+++ /dev/null
@@ -1,236 +0,0 @@
1Installation Instructions
2*************************
3
4Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
5Software Foundation, Inc.
6
7This file is free documentation; the Free Software Foundation gives
8unlimited permission to copy, distribute and modify it.
9
10Basic Installation
11==================
12
13These are generic installation instructions.
14
15 The `configure' shell script attempts to guess correct values for
16various system-dependent variables used during compilation. It uses
17those values to create a `Makefile' in each directory of the package.
18It may also create one or more `.h' files containing system-dependent
19definitions. Finally, it creates a shell script `config.status' that
20you can run in the future to recreate the current configuration, and a
21file `config.log' containing compiler output (useful mainly for
22debugging `configure').
23
24 It can also use an optional file (typically called `config.cache'
25and enabled with `--cache-file=config.cache' or simply `-C') that saves
26the results of its tests to speed up reconfiguring. (Caching is
27disabled by default to prevent problems with accidental use of stale
28cache files.)
29
30 If you need to do unusual things to compile the package, please try
31to figure out how `configure' could check whether to do them, and mail
32diffs or instructions to the address given in the `README' so they can
33be considered for the next release. If you are using the cache, and at
34some point `config.cache' contains results you don't want to keep, you
35may remove or edit it.
36
37 The file `configure.ac' (or `configure.in') is used to create
38`configure' by a program called `autoconf'. You only need
39`configure.ac' if you want to change it or regenerate `configure' using
40a newer version of `autoconf'.
41
42The simplest way to compile this package is:
43
44 1. `cd' to the directory containing the package's source code and type
45 `./configure' to configure the package for your system. If you're
46 using `csh' on an old version of System V, you might need to type
47 `sh ./configure' instead to prevent `csh' from trying to execute
48 `configure' itself.
49
50 Running `configure' takes awhile. While running, it prints some
51 messages telling which features it is checking for.
52
53 2. Type `make' to compile the package.
54
55 3. Optionally, type `make check' to run any self-tests that come with
56 the package.
57
58 4. Type `make install' to install the programs and any data files and
59 documentation.
60
61 5. You can remove the program binaries and object files from the
62 source code directory by typing `make clean'. To also remove the
63 files that `configure' created (so you can compile the package for
64 a different kind of computer), type `make distclean'. There is
65 also a `make maintainer-clean' target, but that is intended mainly
66 for the package's developers. If you use it, you may have to get
67 all sorts of other programs in order to regenerate files that came
68 with the distribution.
69
70Compilers and Options
71=====================
72
73Some systems require unusual options for compilation or linking that the
74`configure' script does not know about. Run `./configure --help' for
75details on some of the pertinent environment variables.
76
77 You can give `configure' initial values for configuration parameters
78by setting variables in the command line or in the environment. Here
79is an example:
80
81 ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
82
83 *Note Defining Variables::, for more details.
84
85Compiling For Multiple Architectures
86====================================
87
88You can compile the package for more than one kind of computer at the
89same time, by placing the object files for each architecture in their
90own directory. To do this, you must use a version of `make' that
91supports the `VPATH' variable, such as GNU `make'. `cd' to the
92directory where you want the object files and executables to go and run
93the `configure' script. `configure' automatically checks for the
94source code in the directory that `configure' is in and in `..'.
95
96 If you have to use a `make' that does not support the `VPATH'
97variable, you have to compile the package for one architecture at a
98time in the source code directory. After you have installed the
99package for one architecture, use `make distclean' before reconfiguring
100for another architecture.
101
102Installation Names
103==================
104
105By default, `make install' installs the package's commands under
106`/usr/local/bin', include files under `/usr/local/include', etc. You
107can specify an installation prefix other than `/usr/local' by giving
108`configure' the option `--prefix=PREFIX'.
109
110 You can specify separate installation prefixes for
111architecture-specific files and architecture-independent files. If you
112pass the option `--exec-prefix=PREFIX' to `configure', the package uses
113PREFIX as the prefix for installing programs and libraries.
114Documentation and other data files still use the regular prefix.
115
116 In addition, if you use an unusual directory layout you can give
117options like `--bindir=DIR' to specify different values for particular
118kinds of files. Run `configure --help' for a list of the directories
119you can set and what kinds of files go in them.
120
121 If the package supports it, you can cause programs to be installed
122with an extra prefix or suffix on their names by giving `configure' the
123option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
124
125Optional Features
126=================
127
128Some packages pay attention to `--enable-FEATURE' options to
129`configure', where FEATURE indicates an optional part of the package.
130They may also pay attention to `--with-PACKAGE' options, where PACKAGE
131is something like `gnu-as' or `x' (for the X Window System). The
132`README' should mention any `--enable-' and `--with-' options that the
133package recognizes.
134
135 For packages that use the X Window System, `configure' can usually
136find the X include and library files automatically, but if it doesn't,
137you can use the `configure' options `--x-includes=DIR' and
138`--x-libraries=DIR' to specify their locations.
139
140Specifying the System Type
141==========================
142
143There may be some features `configure' cannot figure out automatically,
144but needs to determine by the type of machine the package will run on.
145Usually, assuming the package is built to be run on the _same_
146architectures, `configure' can figure that out, but if it prints a
147message saying it cannot guess the machine type, give it the
148`--build=TYPE' option. TYPE can either be a short name for the system
149type, such as `sun4', or a canonical name which has the form:
150
151 CPU-COMPANY-SYSTEM
152
153where SYSTEM can have one of these forms:
154
155 OS KERNEL-OS
156
157 See the file `config.sub' for the possible values of each field. If
158`config.sub' isn't included in this package, then this package doesn't
159need to know the machine type.
160
161 If you are _building_ compiler tools for cross-compiling, you should
162use the option `--target=TYPE' to select the type of system they will
163produce code for.
164
165 If you want to _use_ a cross compiler, that generates code for a
166platform different from the build platform, you should specify the
167"host" platform (i.e., that on which the generated programs will
168eventually be run) with `--host=TYPE'.
169
170Sharing Defaults
171================
172
173If you want to set default values for `configure' scripts to share, you
174can create a site shell script called `config.site' that gives default
175values for variables like `CC', `cache_file', and `prefix'.
176`configure' looks for `PREFIX/share/config.site' if it exists, then
177`PREFIX/etc/config.site' if it exists. Or, you can set the
178`CONFIG_SITE' environment variable to the location of the site script.
179A warning: not all `configure' scripts look for a site script.
180
181Defining Variables
182==================
183
184Variables not defined in a site shell script can be set in the
185environment passed to `configure'. However, some packages may run
186configure again during the build, and the customized values of these
187variables may be lost. In order to avoid this problem, you should set
188them in the `configure' command line, using `VAR=value'. For example:
189
190 ./configure CC=/usr/local2/bin/gcc
191
192causes the specified `gcc' to be used as the C compiler (unless it is
193overridden in the site shell script). Here is a another example:
194
195 /bin/bash ./configure CONFIG_SHELL=/bin/bash
196
197Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
198configuration-related scripts to be executed by `/bin/bash'.
199
200`configure' Invocation
201======================
202
203`configure' recognizes the following options to control how it operates.
204
205`--help'
206`-h'
207 Print a summary of the options to `configure', and exit.
208
209`--version'
210`-V'
211 Print the version of Autoconf used to generate the `configure'
212 script, and exit.
213
214`--cache-file=FILE'
215 Enable the cache: use and save the results of the tests in FILE,
216 traditionally `config.cache'. FILE defaults to `/dev/null' to
217 disable caching.
218
219`--config-cache'
220`-C'
221 Alias for `--cache-file=config.cache'.
222
223`--quiet'
224`--silent'
225`-q'
226 Do not print messages saying which checks are being made. To
227 suppress all normal output, redirect it to `/dev/null' (any error
228 messages will still be shown).
229
230`--srcdir=DIR'
231 Look for the package's source code in directory DIR. Usually
232 `configure' can determine that directory automatically.
233
234`configure' also accepts some other, not widely useful, options. Run
235`configure --help' for more details.
236
diff --git a/handbook/poky-doc-tools/Makefile.am b/handbook/poky-doc-tools/Makefile.am
deleted file mode 100644
index 4533cd8..0000000
--- a/handbook/poky-doc-tools/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
1SUBDIRS = common
2
3EXTRA_DIST = poky-docbook-to-pdf.in
4
5bin_SCRIPTS = poky-docbook-to-pdf
6
7edit = sed \
8 -e 's,@datadir\@,$(pkgdatadir),g' \
9 -e 's,@prefix\@,$(prefix),g' \
10 -e 's,@version\@,@VERSION@,g'
11
12##
13# These URI should be rewritten by your distribution's xml catalog to
14# match your localy installed XSL stylesheets.
15XSL_BASE_URI="http://docbook.sourceforge.net/release/xsl/current"
16XSL_TEMPLATE_URI = $(XSL_BASE_URI)/template/titlepage.xsl
17
18poky-docbook-to-pdf: poky-docbook-to-pdf.in
19 rm -f poky-docbook-to-pdf
20 $(edit) poky-docbook-to-pdf.in > poky-docbook-to-pdf
21
22clean-local:
23 rm -fr poky-docbook-to-pdf
24 rm -fr poky-pr-docbook-to-pdf \ No newline at end of file
diff --git a/handbook/poky-doc-tools/NEWS b/handbook/poky-doc-tools/NEWS
deleted file mode 100644
index e69de29..0000000
--- a/handbook/poky-doc-tools/NEWS
+++ /dev/null
diff --git a/handbook/poky-doc-tools/README b/handbook/poky-doc-tools/README
deleted file mode 100644
index 54e2d8e..0000000
--- a/handbook/poky-doc-tools/README
+++ /dev/null
@@ -1,19 +0,0 @@
1poky-doc-tools
2==============
3
4Simple tools to wrap fop to create Poky branded PDF's from docbook sources.
5(based on OH doc tools)
6
7Dependencies
8============
9
10Sun Java, make sure the java in your path is the *sun* java.
11
12xlstproc, nwalsh style sheets, fop
13
14FOP, installed - see http://www.sagehill.net/docbookxsl/InstallingAnFO.html.
15Updated to work with (fop > 0.95)
16
17
18
19
diff --git a/handbook/poky-doc-tools/autogen.sh b/handbook/poky-doc-tools/autogen.sh
deleted file mode 100755
index d68a142..0000000
--- a/handbook/poky-doc-tools/autogen.sh
+++ /dev/null
@@ -1,3 +0,0 @@
1#! /bin/sh
2autoreconf -v --install || exit 1
3./configure "$@"
diff --git a/handbook/poky-doc-tools/common/Makefile.am b/handbook/poky-doc-tools/common/Makefile.am
deleted file mode 100644
index c6b154b..0000000
--- a/handbook/poky-doc-tools/common/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
1SUPPORT_FILES = VeraMoBd.ttf VeraMoBd.xml \
2 VeraMono.ttf VeraMono.xml \
3 Vera.ttf Vera.xml \
4 draft.png titlepage.templates.xml \
5 poky-db-pdf.xsl poky.svg \
6 ohand-color.svg poky-handbook.png
7
8commondir = $(pkgdatadir)/common
9common_DATA = $(SUPPORT_FILES) fop-config.xml
10
11EXTRA_DIST = $(SUPPORT_FILES) fop-config.xml.in
12
13edit = sed -e 's,@datadir\@,$(pkgdatadir),g'
14
15fop-config.xml: fop-config.xml.in
16 rm -f fop-config.xml
17 $(edit) fop-config.xml.in > fop-config.xml
18
19
20clean-local:
21 rm -fr fop-config.xml \ No newline at end of file
diff --git a/handbook/poky-doc-tools/configure.ac b/handbook/poky-doc-tools/configure.ac
deleted file mode 100644
index 0d15c81..0000000
--- a/handbook/poky-doc-tools/configure.ac
+++ /dev/null
@@ -1,27 +0,0 @@
1AC_PREREQ(2.53)
2AC_INIT(poky-doc-tools, 0.1, http://o-hand.com)
3AM_INIT_AUTOMAKE()
4
5AC_PATH_PROG(HAVE_XSLTPROC, xsltproc, no)
6if test x$HAVE_XSLTPROC = xno; then
7 AC_MSG_ERROR([Required xsltproc program not found])
8fi
9
10AC_PATH_PROG(HAVE_FOP, fop, no)
11if test x$HAVE_FOP = xno; then
12 AC_MSG_ERROR([Required fop program not found])
13fi
14
15AC_CHECK_FILE([/usr/share/xml/docbook/stylesheet/nwalsh/template/titlepage.xsl],HAVE_NWALSH="yes", HAVE_NWALSH="no")
16if test x$HAVE_FOP = xno; then
17 AC_MSG_ERROR([Required 'nwalsh' docbook stylesheets not found])
18fi
19
20AC_OUTPUT([
21Makefile
22common/Makefile
23])
24
25echo "
26 == poky-doc-tools $VERSION configured successfully. ==
27" \ No newline at end of file
diff --git a/handbook/poky-handbook.xml b/handbook/poky-handbook.xml
index a7b7312..fb2bc80 100644
--- a/handbook/poky-handbook.xml
+++ b/handbook/poky-handbook.xml
@@ -9,7 +9,7 @@
9 9
10 <mediaobject> 10 <mediaobject>
11 <imageobject> 11 <imageobject>
12 <imagedata fileref='common/poky-handbook.png' 12 <imagedata fileref='template/poky-handbook.png'
13 format='SVG' 13 format='SVG'
14 align='center' scalefit='1' width='100%'/> 14 align='center' scalefit='1' width='100%'/>
15 </imageobject> 15 </imageobject>
diff --git a/handbook/poky-doc-tools/common/Vera.ttf b/handbook/template/Vera.ttf
index 58cd6b5..58cd6b5 100644
--- a/handbook/poky-doc-tools/common/Vera.ttf
+++ b/handbook/template/Vera.ttf
Binary files differ
diff --git a/handbook/poky-doc-tools/common/Vera.xml b/handbook/template/Vera.xml
index 3c82043..3c82043 100644
--- a/handbook/poky-doc-tools/common/Vera.xml
+++ b/handbook/template/Vera.xml
diff --git a/handbook/poky-doc-tools/common/VeraMoBd.ttf b/handbook/template/VeraMoBd.ttf
index 9be6547..9be6547 100644
--- a/handbook/poky-doc-tools/common/VeraMoBd.ttf
+++ b/handbook/template/VeraMoBd.ttf
Binary files differ
diff --git a/handbook/poky-doc-tools/common/VeraMoBd.xml b/handbook/template/VeraMoBd.xml
index 9b33107..9b33107 100644
--- a/handbook/poky-doc-tools/common/VeraMoBd.xml
+++ b/handbook/template/VeraMoBd.xml
diff --git a/handbook/poky-doc-tools/common/VeraMono.ttf b/handbook/template/VeraMono.ttf
index 139f0b4..139f0b4 100644
--- a/handbook/poky-doc-tools/common/VeraMono.ttf
+++ b/handbook/template/VeraMono.ttf
Binary files differ
diff --git a/handbook/poky-doc-tools/common/VeraMono.xml b/handbook/template/VeraMono.xml
index 3a0a866..3a0a866 100644
--- a/handbook/poky-doc-tools/common/VeraMono.xml
+++ b/handbook/template/VeraMono.xml
diff --git a/handbook/poky-doc-tools/common/draft.png b/handbook/template/draft.png
index 53051a9..53051a9 100644
--- a/handbook/poky-doc-tools/common/draft.png
+++ b/handbook/template/draft.png
Binary files differ
diff --git a/handbook/poky-doc-tools/common/fop-config.xml.in b/handbook/template/fop-config.xml
index 40cdf9c..7d56223 100644
--- a/handbook/poky-doc-tools/common/fop-config.xml.in
+++ b/handbook/template/fop-config.xml
@@ -10,8 +10,8 @@
10 Set the baseDir so common/openedhand.svg references in plans still 10 Set the baseDir so common/openedhand.svg references in plans still
11 work ok. Note, relative file references to current dir should still work. 11 work ok. Note, relative file references to current dir should still work.
12 --> 12 -->
13 <base>@datadir@</base> 13 <base>template</base>
14 <font-base>@datadir@/common</font-base> 14 <font-base>template</font-base>
15 15
16 <!-- Source resolution in dpi (dots/pixels per inch) for determining the 16 <!-- Source resolution in dpi (dots/pixels per inch) for determining the
17 size of pixels in SVG and bitmap images, default: 72dpi --> 17 size of pixels in SVG and bitmap images, default: 72dpi -->
diff --git a/handbook/poky-doc-tools/common/ohand-color.svg b/handbook/template/ohand-color.svg
index e42ff9c..e42ff9c 100644
--- a/handbook/poky-doc-tools/common/ohand-color.svg
+++ b/handbook/template/ohand-color.svg
diff --git a/handbook/poky-doc-tools/common/poky-db-pdf.xsl b/handbook/template/poky-db-pdf.xsl
index 3dd065a..3dd065a 100644
--- a/handbook/poky-doc-tools/common/poky-db-pdf.xsl
+++ b/handbook/template/poky-db-pdf.xsl
diff --git a/handbook/poky-doc-tools/common/poky-handbook.png b/handbook/template/poky-handbook.png
index 2085edb..2085edb 100644
--- a/handbook/poky-doc-tools/common/poky-handbook.png
+++ b/handbook/template/poky-handbook.png
Binary files differ
diff --git a/handbook/poky-doc-tools/common/poky.svg b/handbook/template/poky.svg
index a4ea5e2..a4ea5e2 100644
--- a/handbook/poky-doc-tools/common/poky.svg
+++ b/handbook/template/poky.svg
diff --git a/handbook/poky-doc-tools/common/titlepage.templates.xml b/handbook/template/titlepage.templates.xml
index ff640fa..ff640fa 100644
--- a/handbook/poky-doc-tools/common/titlepage.templates.xml
+++ b/handbook/template/titlepage.templates.xml
diff --git a/handbook/poky-doc-tools/poky-docbook-to-pdf.in b/handbook/tools/poky-docbook-to-pdf
index b56aee4..8e3d754 100644..100755
--- a/handbook/poky-doc-tools/poky-docbook-to-pdf.in
+++ b/handbook/tools/poky-docbook-to-pdf
@@ -1,7 +1,7 @@
1#!/bin/sh 1#!/bin/sh
2 2
3if [ -z "$1" ]; then 3if [ -z "$1" -o -z "$2" ]; then
4 echo "usage: [-v] $0 <docbook file>" 4 echo "usage: [-v] $0 <docbook file> <templatedir>"
5 echo 5 echo
6 echo "*NOTE* you need xsltproc, fop and nwalsh docbook stylesheets" 6 echo "*NOTE* you need xsltproc, fop and nwalsh docbook stylesheets"
7 echo " installed for this to work!" 7 echo " installed for this to work!"
@@ -9,14 +9,10 @@ if [ -z "$1" ]; then
9 exit 0 9 exit 0
10fi 10fi
11 11
12if [ "$1" = "-v" ]; then
13 echo "Version @version@"
14 exit 1
15fi
16
17BASENAME=`basename $1 .xml` || exit 1 12BASENAME=`basename $1 .xml` || exit 1
18FO="$BASENAME.fo" 13FO="$BASENAME.fo"
19PDF="$BASENAME.pdf" 14PDF="$BASENAME.pdf"
15TEMPLATEDIR=$2
20 16
21## 17##
22# These URI should be rewritten by your distribution's xml catalog to 18# These URI should be rewritten by your distribution's xml catalog to
@@ -26,7 +22,7 @@ XSL_BASE_URI="http://docbook.sourceforge.net/release/xsl/current"
26xsltproc -o /tmp/titlepage.xsl \ 22xsltproc -o /tmp/titlepage.xsl \
27 --xinclude \ 23 --xinclude \
28 $XSL_BASE_URI/template/titlepage.xsl \ 24 $XSL_BASE_URI/template/titlepage.xsl \
29 @datadir@/common/titlepage.templates.xml || exit 1 25 $TEMPLATEDIR/titlepage.templates.xml || exit 1
30 26
31xsltproc --xinclude \ 27xsltproc --xinclude \
32 --stringparam hyphenate false \ 28 --stringparam hyphenate false \
@@ -34,16 +30,16 @@ xsltproc --xinclude \
34 --stringparam ulink.show 1 \ 30 --stringparam ulink.show 1 \
35 --stringparam body.font.master 9 \ 31 --stringparam body.font.master 9 \
36 --stringparam title.font.master 11 \ 32 --stringparam title.font.master 11 \
37 --stringparam draft.watermark.image "@datadir@/common/draft.png" \ 33 --stringparam draft.watermark.image "$TEMPLATEDIR/draft.png" \
38 --output $FO \ 34 --output $FO \
39 @datadir@/common/poky-db-pdf.xsl \ 35 $TEMPLATEDIR/poky-db-pdf.xsl \
40 $1 || exit 1 36 $1 || exit 1
41 37
42fop -c @datadir@/common/fop-config.xml -fo $FO -pdf $PDF || exit 1 38fop -c $TEMPLATEDIR/fop-config.xml -fo $FO -pdf $PDF || exit 1
43 39
44rm -f $FO 40rm -f $FO
45rm -f /tmp/titlepage.xsl 41rm -f /tmp/titlepage.xsl
46 42
47echo 43echo
48echo " #### Success! $PDF ready. ####" 44echo " #### Success! $PDF ready. ####"
49echo \ No newline at end of file 45echo