Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport release-3_10] Fix build with txt2tags >= 3.5 #34388

Closed
wants to merge 1 commit into from
Closed

[Backport release-3_10] Fix build with txt2tags >= 3.5 #34388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions cmake/Txt2Tags.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,23 @@ MACRO(ADD_TXT2TAGS_FILES _sources)
ADD_CUSTOM_COMMAND(
OUTPUT ${_out}
COMMAND ${TXT2TAGS_EXECUTABLE}
<<<<<<< HEAD
ARGS --encoding=utf-8 -o${_out} -t txt ${_in}
=======
ARGS -o${_out} -t txt ${_in}.tmp
>>>>>>> 58f1206748... Fix build with txt2tags >= 3.5
DEPENDS ${_in}
COMMENT "Building ${_out} from ${_in}"
)

ADD_CUSTOM_COMMAND(
OUTPUT ${_out}.html
COMMAND ${TXT2TAGS_EXECUTABLE}
<<<<<<< HEAD
ARGS --encoding=utf-8 -o${_out}.html -t html ${_in}
=======
ARGS -o${_out}.html -t html ${_in}.tmp
>>>>>>> 58f1206748... Fix build with txt2tags >= 3.5
DEPENDS ${_in}
COMMENT "Building ${_out}.html from ${_in}"
)
Expand Down
4 changes: 2 additions & 2 deletions doc/INSTALL.t2t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Building QGIS from source - step by step
%! PostProc(html): \(R\) &reg;
% 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
%
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/news.t2t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
% -------------------
Expand Down
4 changes: 2 additions & 2 deletions scripts/release.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" );
Expand Down
5 changes: 5 additions & 0 deletions scripts/update-news.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,13 @@

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

<<<<<<< HEAD
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";
>>>>>>> 58f1206748... Fix build with txt2tags >= 3.5

=head1 NAME

Expand Down