Skip to content

Commit 13ac043

Browse files
committed
creatensis.pl: use passed in version number
(cherry picked from commit 88540c1)
1 parent 7884e50 commit 13ac043

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

ms-windows/osgeo4w/creatensis.pl

+5-2
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,9 @@ sub getDeps {
355355

356356
$version = "$major.$minor.$patch" unless defined $version;
357357

358+
my($pmajor,$pminor,$ppatch) = $version =~ /^(\d+)\.(\d+)\.(\d+)$/;
359+
die "Invalid version $version" unless defined $ppatch;
360+
358361
unless( defined $binary ) {
359362
if( -f "binary$archpostfix-$version" ) {
360363
open P, "binary$archpostfix-$version";
@@ -440,8 +443,8 @@ sub getDeps {
440443
$cmd .= " -DVERSION_NAME='$releasename'";
441444
$cmd .= " -DVERSION_NUMBER='$version'";
442445
$cmd .= " -DBINARY_REVISION=$binary";
443-
$cmd .= sprintf( " -DVERSION_INT='%d%02d%02d%02d'", $major, $minor, $patch, $binary );
444-
$cmd .= sprintf( " -DQGIS_BASE='$packagename %d.%d'", $major, $minor );
446+
$cmd .= sprintf( " -DVERSION_INT='%d%02d%02d%02d'", $pmajor, $pminor, $ppatch, $binary );
447+
$cmd .= sprintf( " -DQGIS_BASE='$packagename %d.%d'", $pmajor, $pminor );
445448
$cmd .= " -DINSTALLER_NAME='$packagename-OSGeo4W-$version-$binary-Setup$archpostfix.exe'";
446449
$cmd .= " -DDISPLAYED_NAME='$packagename \'$releasename\' ($version)'";
447450
$cmd .= " -DSHORTNAME='$shortname'";

0 commit comments

Comments
 (0)