Skip to content

Commit e39944c

Browse files
committedFeb 22, 2014
release script: tag release and include prefix in tar ball
1 parent 90aa18a commit e39944c

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed
 

‎scripts/release.pl

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ sub updateCMakeLists {
7575

7676
my $release = "$newmajor.$newminor";
7777
my $relbranch = "release-${newmajor}_${newminor}";
78+
my $reltag = "final-${newmajor}_${newminor}_0";
7879

7980
print "Creating branch...\n";
8081
system("git checkout -b $relbranch" ) == 0 or die "git checkout release branch failed";
@@ -85,9 +86,10 @@ sub updateCMakeLists {
8586
system( "dch --newversion $newmajor.$newminor.0 'Release of $release'" ) == 0 or die "dch failed";
8687
system( "cp debian/changelog /tmp" ) == 0 or die "backup changelog failed";
8788
system( "git commit -a -m 'Release of $release ($releasename)'" ) == 0 or die "release commit failed";
89+
system( "git tag $reltag -m 'Version $release'" ) == 0 or die "tag failed";
8890

8991
print "Producing archive...\n";
90-
system( "git archive --format tar HEAD | bzip2 -c >qgis-$release.0.tar.bz2" ) == 0 or die "git archive failed";
92+
system( "git archive --format tar --prefix=qgis-$release.0/ $reltag | bzip2 -c >qgis-$release.0.tar.bz2" ) == 0 or die "git archive failed";
9193
system( "md5sum qgis-$newmajor.$newminor.0.tar.bz2 >qgis-$release.0.tar.bz2.md5" ) == 0 or die "md5sum failed";
9294

9395
$newminor++;
@@ -101,9 +103,9 @@ sub updateCMakeLists {
101103
system( "git commit -a -m 'Bump version to $newmajor.$newminor'" ) == 0 or die "bump version failed";
102104

103105
print "Push dry-run...\n";
104-
system( "git push -n origin master $relbranch" ) == 0 or die "git push -n failed";
106+
system( "git push -n origin master $relbranch $reltag" ) == 0 or die "git push -n failed";
105107

106-
print "Now manually push and upload the tarballs :\n\tgit push origin master $relbranch\n\trsync qgis-$release.0.tar.bz2* qgis.org:/var/www/downloads/\n\n";
108+
print "Now manually push and upload the tarballs :\n\tgit push origin master $relbranch $reltag\n\trsync qgis-$release.0.tar.bz2* qgis.org:/var/www/downloads/\n\n";
107109

108110
=head1 NAME
109111

0 commit comments

Comments
 (0)
Please sign in to comment.