anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Rather than revert the added epub tests, it makes more sense to
ignore them. That way it is easier to flip the switch to enable
them.

Thanks to Kornel.

This reverts commit 894977b62e.
This commit is contained in:
Scott Kostyshak 2021-02-17 22:40:02 -05:00
parent 6df4597e02
commit c21cd7dc2b
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
development/autotests/ExportTests.cmake
View File

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

4
development/autotests/export.cmake
View File

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

2
development/autotests/useSystemFonts.pl
View File

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