Skip to content
Permalink
Browse files

Fix build with txt2tags >= 3.5

  • Loading branch information
lbartoletti authored and nyalldawson committed Feb 9, 2020
1 parent 40ab96f commit c23d37cd965aca8b99ee1b82b8e34241fa39950e
Showing with 9 additions and 9 deletions.
  1. +2 −2 cmake/Txt2Tags.cmake
  2. +2 −2 doc/INSTALL.t2t
  3. +1 −1 doc/news.t2t
  4. +2 −2 scripts/release.pl
  5. +2 −2 scripts/update-news.pl
@@ -42,15 +42,15 @@ MACRO(ADD_TXT2TAGS_FILES _sources)
ADD_CUSTOM_COMMAND(
OUTPUT ${_out}
COMMAND ${TXT2TAGS_EXECUTABLE}
ARGS --encoding=utf-8 -o${_out} -t txt ${_in}
ARGS -o${_out} -t txt ${_in}.tmp
DEPENDS ${_in}
COMMENT "Building ${_out} from ${_in}"
)

ADD_CUSTOM_COMMAND(
OUTPUT ${_out}.html
COMMAND ${TXT2TAGS_EXECUTABLE}
ARGS --encoding=utf-8 -o${_out}.html -t html ${_in}
ARGS -o${_out}.html -t html ${_in}.tmp
DEPENDS ${_in}
COMMENT "Building ${_out}.html from ${_in}"
)
@@ -11,7 +11,7 @@ Building QGIS from source - step by step
%! PostProc(html): \(R\) ®
% Next line will replace tabs with 2 spaces in txt generated outputs
%! PostProc(txt): '(?i)(\t)' ' '
%! encoding: iso-8859-1
%! encoding: utf-8
%
% Tex processing
%
@@ -36,7 +36,7 @@ Building QGIS from source - step by step
%! PostProc(tex): NEWPAGE '\\newpage'
% Give alternating table rows different colors and use a smaller font in tables (\tiny)
%! PostProc(tex): '\\begin{tabular}' '\\rowcolors{2}{tableShade}{white} \n\\tiny\\begin{tabular}'
%! encoding: iso-8859-1
%! encoding: utf-8

%! PostProc(tex): WALLPAPER-IMAGE 'qgis-footer.png'
% These are comments and will not be generated in any output
@@ -10,7 +10,7 @@ Change history for the QGIS Project
%! PostProc(html): '(?i)(</pre>)' '\1</div>'
% Next line will replace tabs with 2 spaces in txt generated outputs
%! PostProc(txt): '(?i)(\t)' ' '
%! encoding: iso-8859-1
%! encoding: utf-8
%
% These are comments and will not be generated in any output
% -------------------
@@ -182,8 +182,8 @@ ($$)
unless( $dopoint ) {
run( "perl -i -pe 's/qgis-dev-deps/qgis-ltr-deps/;' doc/msvc.t2t", "could not update osgeo4w deps package" ) if $doltr;
run( "perl -i -pe 's/qgis-dev-deps/qgis-rel-deps/;' doc/msvc.t2t", "could not update osgeo4w deps package" ) unless $doltr;
run( "txt2tags --encoding=utf-8 -odoc/INSTALL.html -t html doc/INSTALL.t2t", "could not update INSTALL.html" );
run( "txt2tags --encoding=utf-8 -oINSTALL -t txt doc/INSTALL.t2t", "could not update INSTALL" );
run( "txt2tags -odoc/INSTALL.html -t html doc/INSTALL.t2t", "could not update INSTALL.html" );
run( "txt2tags -oINSTALL -t txt doc/INSTALL.t2t", "could not update INSTALL" );

run( "cp -v images/splash/splash-$newmajor.$newminor.png images/splash/splash.png", "splash png switch failed" );
run( "convert -resize 164x314 ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.png BMP3:ms-windows/Installer-Files/WelcomeFinishPage.bmp", "installer bitmap switch failed" );
@@ -61,8 +61,8 @@

copy($tempfile, "doc/news.t2t");

system "txt2tags --encoding=utf-8 -odoc/news.html -t html doc/news.t2t";
system "txt2tags --encoding=utf-8 -oNEWS -t txt doc/news.t2t";
system "txt2tags -odoc/NEWS.html -t html doc/NEWS.t2t";
system "txt2tags -oNEWS -t txt doc/NEWS.t2t";

=head1 NAME

0 comments on commit c23d37c

Please sign in to comment.
You can’t perform that action at this time.