@@ -75,6 +75,7 @@ sub updateCMakeLists {
75
75
76
76
my $release = " $newmajor .$newminor " ;
77
77
my $relbranch = " release-${newmajor} _${newminor} " ;
78
+ my $reltag = " final-${newmajor} _${newminor} _0" ;
78
79
79
80
print " Creating branch...\n " ;
80
81
system (" git checkout -b $relbranch " ) == 0 or die " git checkout release branch failed" ;
@@ -85,9 +86,10 @@ sub updateCMakeLists {
85
86
system ( " dch --newversion $newmajor .$newminor .0 'Release of $release '" ) == 0 or die " dch failed" ;
86
87
system ( " cp debian/changelog /tmp" ) == 0 or die " backup changelog failed" ;
87
88
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" ;
88
90
89
91
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" ;
91
93
system ( " md5sum qgis-$newmajor .$newminor .0.tar.bz2 >qgis-$release .0.tar.bz2.md5" ) == 0 or die " md5sum failed" ;
92
94
93
95
$newminor ++;
@@ -101,9 +103,9 @@ sub updateCMakeLists {
101
103
system ( " git commit -a -m 'Bump version to $newmajor .$newminor '" ) == 0 or die " bump version failed" ;
102
104
103
105
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" ;
105
107
106
- print " Now manually push and upload the tarballs :\n\t git push origin master $relbranch \n\t rsync qgis-$release .0.tar.bz2* qgis.org:/var/www/downloads/\n\n " ;
108
+ print " Now manually push and upload the tarballs :\n\t git push origin master $relbranch $reltag \n\t rsync qgis-$release .0.tar.bz2* qgis.org:/var/www/downloads/\n\n " ;
107
109
108
110
=head1 NAME
109
111
0 commit comments