Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
* update appdata on release
* remove unused splash & banner templates

(cherry picked from commit 9eb8e79)
  • Loading branch information
jef-n committed Jul 1, 2018
1 parent d5a6171 commit 03c21c2
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 8 deletions.
Binary file removed images/splash/splash.xcf.bz2
Binary file not shown.
Binary file removed images/splash/web_banner.xcf.bz2
Binary file not shown.
2 changes: 1 addition & 1 deletion linux/org.qgis.qgis.appdata.xml
Expand Up @@ -17,7 +17,7 @@

<project_group>QGIS</project_group>
<releases>
<release version="3.0" />
<release version="3.2.0" date="2018-06-22" />
</releases>
<launchable type="desktop-id">qgis.desktop</launchable>
<provides>
Expand Down
9 changes: 2 additions & 7 deletions scripts/release.pl
Expand Up @@ -12,6 +12,7 @@
use warnings;
use Getopt::Long;
use Pod::Usage;
use POSIX;

my $dryrun;

Expand Down Expand Up @@ -162,6 +163,7 @@ ($$)

print "Updating changelog...\n";
run( "scripts/create_changelog.sh", "create_changelog.sh failed" );
run( "perl -i -pe 's#<releases>#<releases>\n <release version=\"$newmajor.$newminor.$newpatch\" date=\"" . strftime("%Y-%m-%d", localtime) . "\" />#' linux/org.qgis.qgis.appdata.xml", "appdata update failed" );

unless( $dopoint ) {
run( "scripts/update-news.pl $newmajor $newminor '$newreleasename'", "could not update news" ) if $major>2 || ($major==2 && $minor>14);
Expand All @@ -187,13 +189,6 @@ ($$)
unless( $dopoint ) {
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" );

if( -f "images/splash/splash-release.xcf.bz2" ) {
run( "cp -v images/splash/splash-$newmajor.$newminor.xcf.bz2 images/splash/splash.xcf.bz2", "splash xcf switch failed" );
} else {
print "WARNING: NO images/splash/splash-release.xcf.bz2\n";
}

run( "git commit -n -a -m 'Release of $release ($newreleasename)'", "release commit failed" );
run( "git tag $reltag -m 'Version $release'", "release tag failed" );
} else {
Expand Down

0 comments on commit 03c21c2

Please sign in to comment.