Revert "Cmake export tests: Add epub-format to be tested"

Revert the addition of epub tests for now since a lot of them are
failing (and are not regressions).

This reverts commit 983d327fe3.
This commit is contained in:
Scott Kostyshak 2021-02-17 11:51:18 -05:00
parent 80cb0650e4
commit 894977b62e
3 changed files with 8 additions and 10 deletions

View File

@ -59,26 +59,24 @@ macro(getoutputformats filepath varname format_set)
file(STRINGS "${filepath}" lines)
# What should we test, if default_output_format is not defined?
# For now we test everything ...
set(out_formats "xhtml" "docbook5" "epub" ${DVI_FORMATS} ${PDF_FORMATS})
set(out_formats "xhtml" "docbook5" ${DVI_FORMATS} ${PDF_FORMATS})
foreach(_l IN LISTS lines)
if(_l MATCHES "^\\\\default_output_format +\([^ ]+\)")
set(_format ${CMAKE_MATCH_1})
if(_format STREQUAL "default")
set(out_formats "xhtml" "docbook5" "epub" ${DVI_FORMATS} ${PDF_FORMATS})
set(out_formats "xhtml" "docbook5" ${DVI_FORMATS} ${PDF_FORMATS})
else()
set(${format_set} ${_format})
if(_format STREQUAL "pdf2" AND "${filepath}" MATCHES "/doc/")
set(out_formats "xhtml" "docbook5" "epub" ${DVI_FORMATS} ${PDF_FORMATS})
set(out_formats "xhtml" "docbook5" ${DVI_FORMATS} ${PDF_FORMATS})
elseif(_format MATCHES "pdf$")
set(out_formats "xhtml" "docbook5" "epub" ${PDF_FORMATS})
set(out_formats "xhtml" "docbook5" ${PDF_FORMATS})
elseif(_format MATCHES "dvi$")
set(out_formats "xhtml" "docbook5" "epub" ${DVI_FORMATS})
set(out_formats "xhtml" "docbook5" ${DVI_FORMATS})
elseif(_format MATCHES "docbook5")
set(out_formats "docbook5")
elseif(_format MATCHES "xhtml")
set(out_formats "xhtml")
elseif(_format MATCHES "epub")
set(out_formats "epub")
else()
# Respect all other output formats
# like "eps3"

View File

@ -7,8 +7,8 @@
# LYX_ROOT = ${TOP_SRC_DIR}/lib/{doc,examples,templates,tabletemplates}
# LYX_USERDIR_VER = Name of environment variable for the user directory
# lyx =
# format = lyx16x|lyx20x|lyx21x|lyx22x|xhtml|docbook5|epub
# extension = 16.lyx|20.lyx|21.lyx|22.lyx|xhtml|xml|epub
# format = lyx16x|lyx20x|lyx21x|lyx22x|xhtml|docbook5
# extension = 16.lyx|20.lyx|21.lyx|22.lyx|xhtml|xml
# file = xxx
#
# Script should be called like:

View File

@ -203,7 +203,7 @@ sub interpretedCopy($$$$)
my $ext = $isrel[1];
if ($rStatus->{"filetype"} eq "prefix_only") {
$f = getNewNameOf("$sourcedir/$f", $rFiles);
if ($format =~ /^(docbook5|epub)$/) {
if ($format eq "docbook5") {
$rF->[1] = join(',', @{$filelist});
$l = join('', @$rF);
}