Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4a4abd4

Browse files
committed
Generate index.html as the root file name of the documentation set,
rather than making index.html a symlink to the autogenerated name.Fixes fatal problems with tar programs that don't handle symlinksvery well (MacOS X).(The names user.html, admin.html, etc. are still available as maketargets, but they aren't packaged anymore.)Use the manifest file that the stylesheets generate as the file listfor packaging. Put graphics in the right place while building, notwhile packaging, so you can actually look at them after building.
1 parent89fa551 commit4a4abd4

File tree

4 files changed

+23
-37
lines changed

4 files changed

+23
-37
lines changed

‎doc/src/Makefile

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
# Postgres documentation makefile
2-
# $Header: /cvsroot/pgsql/doc/src/Makefile,v 1.21 2001/09/17 23:00:27 petere Exp $
2+
# $Header: /cvsroot/pgsql/doc/src/Makefile,v 1.22 2001/09/18 12:08:26 petere Exp $
33

44
subdir = doc/src
55
top_builddir = ../..
66
include$(top_builddir)/src/Makefile.global
77

88
ZIPSUFFIX= gz
9-
TAREXCLUDE= --exclude=Makefile --exclude='*.sgml' --exclude=ref
109

11-
SRC= admin developer reference programmer tutorial user postgres
10+
BOOKS= admin developer reference programmer tutorial user postgres
1211

13-
TARGETS=$(SRC:%=%.tar.$(ZIPSUFFIX))
12+
TARGETS=$(BOOKS:%=%.tar.$(ZIPSUFFIX))
1413

1514
.PRECIOUS:
1615
.PHONY: install all sources clean distclean
@@ -33,33 +32,12 @@ sources:
3332
sources.tar:
3433
$(TAR) -cf$@ sgml graphics
3534

36-
admin.tardeveloper.tarreference.taruser.tar:
35+
$(addsuffix.tar,$(BOOKS)):
3736
$(MAKE) -C sgml clean
3837
$(MAKE) -C sgml$(basename$@).html
39-
$(MAKE) -C sgml$(basename$@).html
40-
cd sgml&&$(TAR) -cf ../$@$(TAREXCLUDE)*.html*.css
41-
42-
programmer.tar:
43-
$(MAKE) -C sgml clean
44-
$(MAKE) -C sgml programmer.html
45-
$(MAKE) -C sgml programmer.html
46-
abssrcdir=`cd$(srcdir)&& pwd`;\
47-
cd sgml&&$(TAR) -cf ../$@$(TAREXCLUDE)*.html*.css -C$$abssrcdir/graphics catalogs.gif connections.gif
48-
49-
tutorial.tar:
50-
$(MAKE) -C sgml clean
51-
$(MAKE) -C sgml tutorial.html
52-
$(MAKE) -C sgml tutorial.html
53-
abssrcdir=`cd$(srcdir)&& pwd`;\
54-
cd sgml&&$(TAR) -cf ../$@$(TAREXCLUDE)*.html*.css -C$$abssrcdir/graphics clientserver.gif
55-
56-
postgres.tar:
57-
$(MAKE) -C sgml clean
58-
$(MAKE) -C sgml postgres.html
59-
$(MAKE) -C sgml postgres.html
60-
abssrcdir=`cd$(srcdir)&& pwd`;\
61-
cd sgml&&$(TAR) -cf ../$@$(TAREXCLUDE)*.html*.css -C$$abssrcdir/graphics catalogs.gif clientserver.gif connections.gif
38+
$(MAKE) -C sgml$(basename$@).html JADEFLAGS='-V html-manifest'
39+
cd sgml&&$(TAR) -c -f ../$@ -T HTML.manifest*.gif*.css
6240

6341
man.tar:
6442
$(MAKE) -C sgml man
65-
$(TAR) -cf$@ -C sgml man1 man$(sqlmansect_dummy)
43+
$(TAR) -c -f$@ -C sgml man1 man$(sqlmansect_dummy)

‎doc/src/sgml/Makefile

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#
99
#
1010
# IDENTIFICATION
11-
# $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.38 2001/08/29 19:14:39 petere Exp $
11+
# $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.39 2001/09/18 12:08:26 petere Exp $
1212
#
1313
#----------------------------------------------------------------------------
1414

@@ -82,12 +82,17 @@ JADE.html = $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) -c $(CATALOG) -d stylesheet.dsl
8282
postgres.html: postgres.sgml$(ALLSGML) stylesheet.dsl
8383
@rm -f*.html
8484
$(JADE.html)$<
85-
ln -sf$@index.html
85+
ln -sf index.html$@
8686

8787
$(addsuffix .html,$(ALLBOOKS)):%.html:%.sgml$(ALLSGML) stylesheet.dsl
8888
@rm -f*.html
8989
$(JADE.html) book-decl.sgml$<
90-
ln -sf$@ index.html
90+
ln -sf index.html$@
91+
92+
tutorial.html: clientserver.gif
93+
programmer.html: catalogs.gif connections.gif
94+
postgres.html: clientserver.gif catalogs.gif connections.gif
95+
9196

9297
COLLATEINDEX =$(PERL)$(DOCBOOKSTYLE)/bin/collateindex.pl -f -g -t 'Index'
9398

@@ -134,7 +139,7 @@ $(addsuffix .tex, $(ALLBOOKS)): %.tex: %.sgml $(ALLSGML) stylesheet.dsl
134139
# Graphics
135140

136141
%.gif:
137-
cp-p../graphics/$@.
142+
cp$(srcdir)/../graphics/$@.
138143

139144

140145
##
@@ -179,7 +184,7 @@ check-postgres: postgres.sgml
179184

180185
cleandistcleanmaintainer-clean:
181186
# HTML
182-
rm -f HTML.manifest *.html
187+
rm -f HTML.manifest *.html *.gif
183188
# man
184189
rm -rf *.1 *.$(DEFAULTSECTION) man1 man$(DEFAULTSECTION) manpage.refs manpage.links manpage.log
185190
# print

‎doc/src/sgml/plsql.sgml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/Attic/plsql.sgml,v 2.39 2001/09/13 15:55:23 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/Attic/plsql.sgml,v 2.40 2001/09/18 12:08:26 petere Exp $
33
-->
44

55
<chapter id="plpgsql">
@@ -1715,13 +1715,15 @@ CREATE FUNCTION c_overpaid (EMP, integer) RETURNS boolean AS '
17151715
</address>
17161716
</affiliation>
17171717
</author>
1718-
1718+
<!--
1719+
Breaks HTML manifest file
17191720
<legalnotice>
17201721
<para>
17211722
Except for portions of this document quoted from other sources,
17221723
this document is licensed under the BSD License.
17231724
</para>
17241725
</legalnotice>
1726+
-->
17251727
</sect1info>
17261728

17271729
<title>Porting from Oracle PL/SQL</title>

‎doc/src/sgml/stylesheet.dsl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/stylesheet.dsl,v1.10 2001/09/1500:48:59 petere Exp $ -->
1+
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/stylesheet.dsl,v1.11 2001/09/18 12:08:27 petere Exp $ -->
22
<!DOCTYPE style-sheet PUBLIC"-//James Clark//DTD DSSSL Style Sheet//EN" [
33

44
<!-- must turn on one of these with -i on the jade command line -->
@@ -44,6 +44,7 @@
4444
(define %section-autolabel% #t)
4545
(define %generate-legalnotice-link% #t)
4646
(define %html-ext%".html")
47+
(define %root-filename%"index")
4748
(define %link-mailto-url% (string-append"mailto:" pgsql-docs-list))
4849
(define %use-id-as-filename% #t)
4950
(define %stylesheet%"stylesheet.css")

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp