Skip to content
Permalink
Browse files

update OSGeo4W deps in INSTALL only in release branch

  • Loading branch information
jef-n committed Sep 4, 2018
1 parent 9d36c4c commit 42aea6c97cd83c56b314ce8a0443721ee6d76fe1
Showing with 6 additions and 6 deletions.
  1. +1 −1 doc/msvc.t2t
  2. +5 −5 scripts/release.pl
@@ -31,7 +31,7 @@ For the QGIS build you need to install following packages from cygwin:

and from OSGeo4W (select //Advanced Installation//):

- qgis-rel-deps
- qgis-dev-deps
-

This will also select packages the above packages depend on.
@@ -168,11 +168,6 @@ ($$)
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", "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( "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";
@@ -187,6 +182,11 @@ ($$)
run( "cp debian/changelog /tmp", "backup changelog failed" );

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( "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" );
run( "git commit -n -a -m 'Release of $release ($newreleasename)'", "release commit failed" );

0 comments on commit 42aea6c

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