From df76bfc1a38ac95470d76263bdbd3ac9084c8d47 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Mon, 5 Feb 2018 02:29:11 +0100 Subject: [PATCH] update INSTALL on release --- scripts/release.pl | 5 +++++ scripts/update-news.pl | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/release.pl b/scripts/release.pl index 534d07f7c8a..4a104c09068 100755 --- a/scripts/release.pl +++ b/scripts/release.pl @@ -166,6 +166,11 @@ run( "scripts/create_changelog.sh", "create_changelog.sh failed" ); unless( $dopoint ) { run( "scripts/update-news.pl $newmajor $newminor '$newreleasename'", "could not update news" ) if $major>2 || ($major==2 && $minor>14); + run( "perl -i -pe 's/qgis-dev-deps/qgis-ltr-deps/;' doc/msvc.t2t" ) if $doltr; + run( "perl -i -pe 's/qgis-dev-deps/qgis-rel-deps/;' doc/msvc.t2t" ) unless $doltr; + run( "txt2tags --encoding=utf-8 -odoc/INSTALL.html -t html doc/INSTALL.t2t" ); + run( "txt2tags --encoding=utf-8 -oINSTALL -t txt doc/INSTALL.t2t" ); + run( "git commit -n -a -m \"changelog and news update for $release\"", "could not commit changelog and news update" ); print "Creating and checking out branch...\n"; diff --git a/scripts/update-news.pl b/scripts/update-news.pl index ecb6b650fc3..c2db5365126 100755 --- a/scripts/update-news.pl +++ b/scripts/update-news.pl @@ -59,8 +59,8 @@ close $in; copy($tempfile, "doc/news.t2t"); -system "txt2tags -odoc/news.html -t html doc/news.t2t"; -system "txt2tags -oNEWS -t txt 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"; =head1 NAME