Skip to content
Permalink
Browse files

creatensis.pl: use passed in version number

(cherry picked from commit 88540c1)
  • Loading branch information
jef-n committed Aug 29, 2016
1 parent 7884e50 commit 13ac0434e10fc7edd1eca665ea7c8b6cb5fd212d
Showing with 5 additions and 2 deletions.
  1. +5 −2 ms-windows/osgeo4w/creatensis.pl
@@ -355,6 +355,9 @@ sub getDeps {

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

my($pmajor,$pminor,$ppatch) = $version =~ /^(\d+)\.(\d+)\.(\d+)$/;
die "Invalid version $version" unless defined $ppatch;

unless( defined $binary ) {
if( -f "binary$archpostfix-$version" ) {
open P, "binary$archpostfix-$version";
@@ -440,8 +443,8 @@ sub getDeps {
$cmd .= " -DVERSION_NAME='$releasename'";
$cmd .= " -DVERSION_NUMBER='$version'";
$cmd .= " -DBINARY_REVISION=$binary";
$cmd .= sprintf( " -DVERSION_INT='%d%02d%02d%02d'", $major, $minor, $patch, $binary );
$cmd .= sprintf( " -DQGIS_BASE='$packagename %d.%d'", $major, $minor );
$cmd .= sprintf( " -DVERSION_INT='%d%02d%02d%02d'", $pmajor, $pminor, $ppatch, $binary );
$cmd .= sprintf( " -DQGIS_BASE='$packagename %d.%d'", $pmajor, $pminor );
$cmd .= " -DINSTALLER_NAME='$packagename-OSGeo4W-$version-$binary-Setup$archpostfix.exe'";
$cmd .= " -DDISPLAYED_NAME='$packagename \'$releasename\' ($version)'";
$cmd .= " -DSHORTNAME='$shortname'";

0 comments on commit 13ac043

Please sign in to comment.
You can’t perform that action at this time.