Skip to content

Commit

Permalink
Update change log, version number for DAPS 3.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Stefan Knorr committed Jun 10, 2021
1 parent 32f414c commit 1fb7c44
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 151 deletions.
27 changes: 27 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
-------------------------------------------------------------------
Thu Jun 10 10:00:00 UTC 2021 - [email protected]

Stable release DAPS 3.2.0:

* New features:
- Added config file compatible with xmlformat 1.9 (from
github.com/someth2say/xmlformat)
- Added DocBook table validation script (must be run manually
currently)

* Bug fixes:
- Properly enabled `--validate-ids` and `--validate-images`
validation options
- For consistency/compatibility, output PDFNAME deprecation
message to stderr
- In AsciiDoc postprocess stylesheet, fixed handling of
subtitles
- Removed remaining references to Ghostscript (#614)

* Removed features:
- Remove `html --jsp` target that was unused for years (#609)
- Removed the `online-docs` target and associated DocBook 5-to-4
conversion stylesheets (#610)
- Removed code to query SVN properties that was unused for years
(#611)

-------------------------------------------------------------------
Fri May 21 15:00:00 UTC 2021 - [email protected]

Expand Down
92 changes: 20 additions & 72 deletions Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# Generate catalogs and install daps
#
#
# TODO:
# TODO:
# Stylesheets for building xhtml need to be packaged in src tar


Expand Down Expand Up @@ -114,9 +114,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
$(dist_emacssite_DATA) $(dist_fopconf_DATA) \
$(dist_hyphen_DATA) $(dist_template_DATA) $(dist_xepconf_DATA) \
$(dist_xsltasciidoc_DATA) $(dist_xsltcommon_DATA) \
$(dist_xsltcontrib_DATA) $(dist_xsltdb5todb4_DATA) \
$(dist_xsltdesktop_DATA) $(dist_xsltepub_DATA) \
$(dist_xsltindex_DATA) $(dist_xsltjsp_DATA) \
$(dist_xsltcontrib_DATA) $(dist_xsltdesktop_DATA) \
$(dist_xsltepub_DATA) $(dist_xsltindex_DATA) \
$(dist_xsltlib_DATA) $(dist_xsltmallard_DATA) \
$(dist_xsltmigrate_DATA) $(dist_xsltprofiling_DATA) \
$(dist_xsltrelnotes_DATA) $(dist_xsltxhtml_DATA) \
Expand Down Expand Up @@ -161,9 +160,8 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dapslibexecdir)" \
"$(DESTDIR)$(fopconfdir)" "$(DESTDIR)$(hyphendir)" \
"$(DESTDIR)$(templatedir)" "$(DESTDIR)$(xepconfdir)" \
"$(DESTDIR)$(xsltasciidocdir)" "$(DESTDIR)$(xsltcommondir)" \
"$(DESTDIR)$(xsltcontribdir)" "$(DESTDIR)$(xsltdb5todb4dir)" \
"$(DESTDIR)$(xsltdesktopdir)" "$(DESTDIR)$(xsltepubdir)" \
"$(DESTDIR)$(xsltindexdir)" "$(DESTDIR)$(xsltjspdir)" \
"$(DESTDIR)$(xsltcontribdir)" "$(DESTDIR)$(xsltdesktopdir)" \
"$(DESTDIR)$(xsltepubdir)" "$(DESTDIR)$(xsltindexdir)" \
"$(DESTDIR)$(xsltlibdir)" "$(DESTDIR)$(xsltmallarddir)" \
"$(DESTDIR)$(xsltmigratedir)" "$(DESTDIR)$(xsltprofilingdir)" \
"$(DESTDIR)$(xsltrelnotesdir)" "$(DESTDIR)$(xsltxhtmldir)" \
Expand Down Expand Up @@ -206,9 +204,8 @@ DATA = $(dist_bashcompletion_DATA) $(dist_catalog_DATA) \
$(dist_fopconf_DATA) $(dist_hyphen_DATA) $(dist_template_DATA) \
$(dist_xepconf_DATA) $(dist_xsltasciidoc_DATA) \
$(dist_xsltcommon_DATA) $(dist_xsltcontrib_DATA) \
$(dist_xsltdb5todb4_DATA) $(dist_xsltdesktop_DATA) \
$(dist_xsltepub_DATA) $(dist_xsltindex_DATA) \
$(dist_xsltjsp_DATA) $(dist_xsltlib_DATA) \
$(dist_xsltdesktop_DATA) $(dist_xsltepub_DATA) \
$(dist_xsltindex_DATA) $(dist_xsltlib_DATA) \
$(dist_xsltmallard_DATA) $(dist_xsltmigrate_DATA) \
$(dist_xsltprofiling_DATA) $(dist_xsltrelnotes_DATA) \
$(dist_xsltxhtml_DATA) $(dist_xsltyelp_DATA)
Expand Down Expand Up @@ -317,7 +314,6 @@ ECHO_T = @ECHO_T@
EPUBCHECK = @EPUBCHECK@
EXIFTOOL = @EXIFTOOL@
GREP = @GREP@
GS = @GS@
HAVE_PYMOD_LXML = @HAVE_PYMOD_LXML@
INKSCAPE = @INKSCAPE@
INSTALL = @INSTALL@
Expand Down Expand Up @@ -505,11 +501,9 @@ xsltcontribdir = $(xsltdir)/contrib
xsltdesktopdir = $(xsltdir)/desktop
xsltepubdir = $(xsltdir)/epub
xsltindexdir = $(xsltdir)/index
xsltjspdir = $(xsltdir)/jsp
xsltlibdir = $(xsltdir)/lib
xsltmallarddir = $(xsltdir)/mallard
xsltmigratedir = $(xsltdir)/migrate
xsltdb5todb4dir = $(xsltdir)/migrate/db5to4
xsltprofilingdir = $(xsltdir)/profiling
xsltrelnotesdir = $(xsltdir)/relnotes
xsltxhtmldir = $(xsltdir)/xhtml
Expand All @@ -525,6 +519,8 @@ dist_dapslibexec_SCRIPTS = $(filter-out $(wildcard libexec/daps-jing.*),$(wildca

# CONFIG files
dist_dapsconf_DATA = etc/config etc/docbook-xmlformat.conf \
etc/docbook-xmlformat-1.04.conf \
etc/docbook-xmlformat-1.9.conf \
etc/CatalogManager.properties

dist_fopconf_DATA = etc/fop/fop-daps.xml
Expand All @@ -536,7 +532,7 @@ dist_hyphen_DATA = $(wildcard etc/xep/hyphen/*.tex) \
dist_bashcompletion_DATA = bash_completion/daps

# DATA
@CATALOG_EDIT_FALSE@dist_catalog_DATA = $(DAPS_CATALOG)
@CATALOG_EDIT_FALSE@dist_catalog_DATA = $(DAPS_CATALOG)
dist_dapslib_DATA = $(wildcard lib/*)
dist_emacssite_DATA = misc/docbook_macros.el
dist_dapsmake_DATA = $(wildcard make/*.mk)
Expand All @@ -550,11 +546,9 @@ dist_xsltcontrib_DATA = $(wildcard daps-xslt/contrib/*.xsl)
dist_xsltdesktop_DATA = $(wildcard daps-xslt/desktop/*.xsl)
dist_xsltepub_DATA = $(wildcard daps-xslt/epub/*.xsl)
dist_xsltindex_DATA = $(wildcard daps-xslt/index/*.xsl)
dist_xsltjsp_DATA = $(wildcard daps-xslt/jsp/*.xsl)
dist_xsltlib_DATA = $(wildcard daps-xslt/lib/*.xsl)
dist_xsltmallard_DATA = $(wildcard daps-xslt/mallard/*.xsl)
dist_xsltmigrate_DATA = $(wildcard daps-xslt/migrate/*.xsl)
dist_xsltdb5todb4_DATA = $(wildcard daps-xslt/migrate/db5to4/*.xsl)
dist_xsltprofiling_DATA = $(wildcard daps-xslt/profiling/*.xsl)
dist_xsltrelnotes_DATA = $(wildcard daps-xslt/relnotes/*.xsl)
dist_xsltxhtml_DATA = $(wildcard daps-xslt/xhtml/*.xsl)
Expand Down Expand Up @@ -1014,27 +1008,6 @@ uninstall-dist_xsltcontribDATA:
@list='$(dist_xsltcontrib_DATA)'; test -n "$(xsltcontribdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(xsltcontribdir)'; $(am__uninstall_files_from_dir)
install-dist_xsltdb5todb4DATA: $(dist_xsltdb5todb4_DATA)
@$(NORMAL_INSTALL)
@list='$(dist_xsltdb5todb4_DATA)'; test -n "$(xsltdb5todb4dir)" || list=; \
if test -n "$$list"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(xsltdb5todb4dir)'"; \
$(MKDIR_P) "$(DESTDIR)$(xsltdb5todb4dir)" || exit 1; \
fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(xsltdb5todb4dir)'"; \
$(INSTALL_DATA) $$files "$(DESTDIR)$(xsltdb5todb4dir)" || exit $$?; \
done

uninstall-dist_xsltdb5todb4DATA:
@$(NORMAL_UNINSTALL)
@list='$(dist_xsltdb5todb4_DATA)'; test -n "$(xsltdb5todb4dir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(xsltdb5todb4dir)'; $(am__uninstall_files_from_dir)
install-dist_xsltdesktopDATA: $(dist_xsltdesktop_DATA)
@$(NORMAL_INSTALL)
@list='$(dist_xsltdesktop_DATA)'; test -n "$(xsltdesktopdir)" || list=; \
Expand Down Expand Up @@ -1098,27 +1071,6 @@ uninstall-dist_xsltindexDATA:
@list='$(dist_xsltindex_DATA)'; test -n "$(xsltindexdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(xsltindexdir)'; $(am__uninstall_files_from_dir)
install-dist_xsltjspDATA: $(dist_xsltjsp_DATA)
@$(NORMAL_INSTALL)
@list='$(dist_xsltjsp_DATA)'; test -n "$(xsltjspdir)" || list=; \
if test -n "$$list"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(xsltjspdir)'"; \
$(MKDIR_P) "$(DESTDIR)$(xsltjspdir)" || exit 1; \
fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(xsltjspdir)'"; \
$(INSTALL_DATA) $$files "$(DESTDIR)$(xsltjspdir)" || exit $$?; \
done

uninstall-dist_xsltjspDATA:
@$(NORMAL_UNINSTALL)
@list='$(dist_xsltjsp_DATA)'; test -n "$(xsltjspdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(xsltjspdir)'; $(am__uninstall_files_from_dir)
install-dist_xsltlibDATA: $(dist_xsltlib_DATA)
@$(NORMAL_INSTALL)
@list='$(dist_xsltlib_DATA)'; test -n "$(xsltlibdir)" || list=; \
Expand Down Expand Up @@ -1574,7 +1526,7 @@ check: check-recursive
all-am: Makefile $(SCRIPTS) $(MANS) $(DATA) all-local
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dapslibexecdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(bashcompletiondir)" "$(DESTDIR)$(catalogdir)" "$(DESTDIR)$(dapsconfdir)" "$(DESTDIR)$(dapslibdir)" "$(DESTDIR)$(dapsmakedir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(emacssitedir)" "$(DESTDIR)$(fopconfdir)" "$(DESTDIR)$(hyphendir)" "$(DESTDIR)$(templatedir)" "$(DESTDIR)$(xepconfdir)" "$(DESTDIR)$(xsltasciidocdir)" "$(DESTDIR)$(xsltcommondir)" "$(DESTDIR)$(xsltcontribdir)" "$(DESTDIR)$(xsltdb5todb4dir)" "$(DESTDIR)$(xsltdesktopdir)" "$(DESTDIR)$(xsltepubdir)" "$(DESTDIR)$(xsltindexdir)" "$(DESTDIR)$(xsltjspdir)" "$(DESTDIR)$(xsltlibdir)" "$(DESTDIR)$(xsltmallarddir)" "$(DESTDIR)$(xsltmigratedir)" "$(DESTDIR)$(xsltprofilingdir)" "$(DESTDIR)$(xsltrelnotesdir)" "$(DESTDIR)$(xsltxhtmldir)" "$(DESTDIR)$(xsltyelpdir)"; do \
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dapslibexecdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(bashcompletiondir)" "$(DESTDIR)$(catalogdir)" "$(DESTDIR)$(dapsconfdir)" "$(DESTDIR)$(dapslibdir)" "$(DESTDIR)$(dapsmakedir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(emacssitedir)" "$(DESTDIR)$(fopconfdir)" "$(DESTDIR)$(hyphendir)" "$(DESTDIR)$(templatedir)" "$(DESTDIR)$(xepconfdir)" "$(DESTDIR)$(xsltasciidocdir)" "$(DESTDIR)$(xsltcommondir)" "$(DESTDIR)$(xsltcontribdir)" "$(DESTDIR)$(xsltdesktopdir)" "$(DESTDIR)$(xsltepubdir)" "$(DESTDIR)$(xsltindexdir)" "$(DESTDIR)$(xsltlibdir)" "$(DESTDIR)$(xsltmallarddir)" "$(DESTDIR)$(xsltmigratedir)" "$(DESTDIR)$(xsltprofilingdir)" "$(DESTDIR)$(xsltrelnotesdir)" "$(DESTDIR)$(xsltxhtmldir)" "$(DESTDIR)$(xsltyelpdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
Expand Down Expand Up @@ -1636,9 +1588,8 @@ install-data-am: install-data-local install-dist_bashcompletionDATA \
install-dist_fopconfDATA install-dist_hyphenDATA \
install-dist_templateDATA install-dist_xepconfDATA \
install-dist_xsltasciidocDATA install-dist_xsltcommonDATA \
install-dist_xsltcontribDATA install-dist_xsltdb5todb4DATA \
install-dist_xsltdesktopDATA install-dist_xsltepubDATA \
install-dist_xsltindexDATA install-dist_xsltjspDATA \
install-dist_xsltcontribDATA install-dist_xsltdesktopDATA \
install-dist_xsltepubDATA install-dist_xsltindexDATA \
install-dist_xsltlibDATA install-dist_xsltmallardDATA \
install-dist_xsltmigrateDATA install-dist_xsltprofilingDATA \
install-dist_xsltrelnotesDATA install-dist_xsltxhtmlDATA \
Expand Down Expand Up @@ -1698,9 +1649,8 @@ uninstall-am: uninstall-dist_bashcompletionDATA \
uninstall-dist_fopconfDATA uninstall-dist_hyphenDATA \
uninstall-dist_templateDATA uninstall-dist_xepconfDATA \
uninstall-dist_xsltasciidocDATA uninstall-dist_xsltcommonDATA \
uninstall-dist_xsltcontribDATA uninstall-dist_xsltdb5todb4DATA \
uninstall-dist_xsltdesktopDATA uninstall-dist_xsltepubDATA \
uninstall-dist_xsltindexDATA uninstall-dist_xsltjspDATA \
uninstall-dist_xsltcontribDATA uninstall-dist_xsltdesktopDATA \
uninstall-dist_xsltepubDATA uninstall-dist_xsltindexDATA \
uninstall-dist_xsltlibDATA uninstall-dist_xsltmallardDATA \
uninstall-dist_xsltmigrateDATA \
uninstall-dist_xsltprofilingDATA \
Expand Down Expand Up @@ -1728,9 +1678,8 @@ uninstall-man: uninstall-man1
install-dist_hyphenDATA install-dist_templateDATA \
install-dist_xepconfDATA install-dist_xsltasciidocDATA \
install-dist_xsltcommonDATA install-dist_xsltcontribDATA \
install-dist_xsltdb5todb4DATA install-dist_xsltdesktopDATA \
install-dist_xsltepubDATA install-dist_xsltindexDATA \
install-dist_xsltjspDATA install-dist_xsltlibDATA \
install-dist_xsltdesktopDATA install-dist_xsltepubDATA \
install-dist_xsltindexDATA install-dist_xsltlibDATA \
install-dist_xsltmallardDATA install-dist_xsltmigrateDATA \
install-dist_xsltprofilingDATA install-dist_xsltrelnotesDATA \
install-dist_xsltxhtmlDATA install-dist_xsltyelpDATA \
Expand All @@ -1749,9 +1698,8 @@ uninstall-man: uninstall-man1
uninstall-dist_fopconfDATA uninstall-dist_hyphenDATA \
uninstall-dist_templateDATA uninstall-dist_xepconfDATA \
uninstall-dist_xsltasciidocDATA uninstall-dist_xsltcommonDATA \
uninstall-dist_xsltcontribDATA uninstall-dist_xsltdb5todb4DATA \
uninstall-dist_xsltdesktopDATA uninstall-dist_xsltepubDATA \
uninstall-dist_xsltindexDATA uninstall-dist_xsltjspDATA \
uninstall-dist_xsltcontribDATA uninstall-dist_xsltdesktopDATA \
uninstall-dist_xsltepubDATA uninstall-dist_xsltindexDATA \
uninstall-dist_xsltlibDATA uninstall-dist_xsltmallardDATA \
uninstall-dist_xsltmigrateDATA \
uninstall-dist_xsltprofilingDATA \
Expand Down Expand Up @@ -1779,7 +1727,7 @@ bin/daps bin/daps-xmlformat etc/config $(FOP_CONFIG) $(JING_WRAPPER): $(USERGUID

all-local: $(USERGUIDE) $(QUICKSTART) $(dist_man1_MANS) $(DAPS_CATALOG)

install-data-local: $(INSTALLDIRS) autobuild/daps-autobuild
install-data-local: $(INSTALLDIRS) autobuild/daps-autobuild
install-data-local: TMP_CATALOG := $(shell mktemp -q $(BUILD_ROOT)/daps_catalog.XXXXX)
install-data-local:
for BOOK in $(MANUALS); do \
Expand Down
Loading

0 comments on commit 1fb7c44

Please sign in to comment.