25
25
my $releasename ;
26
26
my $shortname ;
27
27
my $version ;
28
- my $revision ;
29
28
my $help ;
30
29
31
30
my $result = GetOptions(
32
31
" verbose+" => \$verbose ,
33
32
" keep" => \$keep ,
34
33
" releasename=s" => \$releasename ,
35
34
" version=s" => \$version ,
36
- " revision=s" => \$revision ,
37
35
" packagename=s" => \$packagename ,
38
36
" shortname=s" => \$shortname ,
39
37
" help" => \$help
@@ -234,22 +232,16 @@ sub getDeps {
234
232
}
235
233
close F;
236
234
237
- $version = " $major .$minor .$patch " unless defined $version ;
235
+ $version = " $major .$minor .$patch " unless defined $version ;
238
236
239
- unless ( defined $revision ) {
240
- open F, " svnversion|" ;
241
- $revision = <F>;
242
- $revision =~ s /\D +$// g ;
243
- close F;
244
- }
245
-
246
- $revision = 14615 unless $revision =~ / ^\d +$ / ;
237
+ my $revision = $major * 0x10000 + $minor * 0x100 + $patch ;
247
238
248
239
system " unzip packages/Untgz.zip" unless -d " untgz" ;
249
240
250
241
chdir " .." ;
251
242
252
243
$packagename = " Quantum GIS" unless defined $packagename ;
244
+ my $sha = ` git log -n1 --pretty=format:%h ` ;
253
245
$shortname = " qgis" unless defined $shortname ;
254
246
255
247
my $cmd = " makensis" ;
@@ -258,7 +250,7 @@ sub getDeps {
258
250
$cmd .= " -DVERSION_NAME='$releasename '" ;
259
251
$cmd .= " -DSVN_REVISION='$revision '" ;
260
252
$cmd .= " -DQGIS_BASE='$packagename $releasename '" ;
261
- $cmd .= " -DINSTALLER_NAME='QGIS-OSGeo4W-$version -$revision -Setup.exe'" ;
253
+ $cmd .= " -DINSTALLER_NAME='QGIS-OSGeo4W-$version -$sha -Setup.exe'" ;
262
254
$cmd .= " -DDISPLAYED_NAME='$packagename \' $releasename \' ($version )'" ;
263
255
$cmd .= " -DBINARY_REVISION=1" ;
264
256
$cmd .= " -DSHORTNAME='$shortname '" ;
0 commit comments