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

Commit5b5e8a2

Browse files
committed
Revert "Improve docs syntax checking"
This reverts commitb292256.Further discussion is neededDiscussion:https://postgr.es/m/0198ec0f-0269-4cf4-b4a7-22c05b3047cb@eisentraut.org
1 parentb93172c commit5b5e8a2

File tree

4 files changed

+15
-106
lines changed

4 files changed

+15
-106
lines changed

‎.cirrus.tasks.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -627,8 +627,6 @@ task:
627627
TEST_JOBS:8
628628
IMAGE:ghcr.io/cirruslabs/macos-runner:sonoma
629629

630-
XML_CATALOG_FILES:/opt/local/share/xml/docbook/4.5/catalog.xml
631-
632630
CIRRUS_WORKING_DIR:${HOME}/pgsql/
633631
CCACHE_DIR:${HOME}/ccache
634632
MACPORTS_CACHE:${HOME}/macports-cache
@@ -643,7 +641,6 @@ task:
643641
644642
MACOS_PACKAGE_LIST:>-
645643
ccache
646-
docbook-xml-4.5
647644
icu
648645
kerberos5
649646
lz4

‎doc/src/sgml/Makefile‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ ifeq ($(STYLE),website)
124124
XSLTPROC_HTML_FLAGS += --param website.stylesheet 1
125125
endif
126126

127-
html:checkhtml-stamp
127+
html: html-stamp
128128

129129
html-stamp: stylesheet.xsl postgres-full.xml$(ALL_IMAGES)
130130
$(XSLTPROC)$(XMLINCLUDE)$(XSLTPROCFLAGS)$(XSLTPROC_HTML_FLAGS)$(wordlist 1,2,$^)
@@ -200,8 +200,8 @@ MAKEINFO = makeinfo
200200
##
201201

202202
# Quick syntax check without style processing
203-
check: postgres.sgml$(ALL_SGML)
204-
$(PERL)$(srcdir)/sgml_syntax_check.pl --xmllint"$(XMLLINT)" --srcdir$(srcdir)
203+
check: postgres.sgml$(ALL_SGML) check-tabs check-nbsp
204+
$(XMLLINT)$(XMLINCLUDE) --noout --valid$<
205205

206206

207207
##
@@ -261,6 +261,18 @@ clean-man:
261261

262262
endif# sqlmansectnum != 7
263263

264+
# tabs are harmless, but it is best to avoid them in SGML files
265+
check-tabs:
266+
@(! grep''$(wildcard$(srcdir)/*.sgml$(srcdir)/func/*.sgml$(srcdir)/ref/*.sgml$(srcdir)/*.xsl) )||\
267+
(echo"Tabs appear in SGML/XML files"1>&2;exit 1)
268+
269+
# Non-breaking spaces are harmless, but it is best to avoid them in SGML files.
270+
# Use perl command because non-GNU grep or sed could not have hex escape sequence.
271+
check-nbsp:
272+
@ ($(PERL) -ne'/\xC2\xA0/ and print("$$ARGV:$$_"),$$n++; END {exit($$n>0)}' \
273+
$(wildcard$(srcdir)/*.sgml$(srcdir)/func/*.sgml$(srcdir)/ref/*.sgml$(srcdir)/*.xsl$(srcdir)/images/*.xsl) )||\
274+
(echo"Non-breaking spaces appear in SGML/XML files"1>&2;exit 1)
275+
264276
##
265277
## Clean
266278
##

‎doc/src/sgml/meson.build‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -306,26 +306,3 @@ endif
306306
if alldocs.length()!=0
307307
alias_target('alldocs', alldocs)
308308
endif
309-
310-
sgml_syntax_check=files(
311-
'sgml_syntax_check.pl'
312-
)
313-
314-
test(
315-
'sgml_syntax_check',
316-
perl,
317-
protocol:'exitcode',
318-
suite:'doc',
319-
args: [
320-
sgml_syntax_check,
321-
'--xmllint',
322-
'@0@ --nonet'.format(xmllint_bin.full_path()),
323-
'--srcdir',
324-
meson.current_source_dir(),
325-
'--builddir',
326-
meson.current_build_dir(),
327-
],
328-
depends: doc_generated
329-
)
330-
331-
testprep_targets+= doc_generated

‎doc/src/sgml/sgml_syntax_check.pl‎

Lines changed: 0 additions & 77 deletions
This file was deleted.

0 commit comments

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