Skip to content
Permalink
Browse files

osgeo4w: fix creatensis.pl

  • Loading branch information
jef-n committed Oct 20, 2013
1 parent 7ff9dc9 commit 1d9f5d8aa5e66aef63e711260ada2a006b60e7db
Showing with 18 additions and 4 deletions.
  1. +18 −4 ms-windows/osgeo4w/creatensis.pl
@@ -122,6 +122,10 @@ sub getDeps {
my @desc;
foreach my $p ( keys %pkgs ) {
my @f;
unless( exists $file{$p} ) {
print "No file for package $p found found.\n" if $verbose;
next;
}
push @f, "$root/$file{$p}";

if( exists $lic{$p} ) {
@@ -174,9 +178,19 @@ sub getDeps {
print O "INSTALLED.DB 2\n";

foreach my $pn ( keys %pkgs ) {
$p = $file{$pn};
my $p = $file{$pn};
unless( defined $p ) {
print "No package found for $pn\n" if $verbose;
next;
}

$p =~ s#^.*/#$packages/#;

unless( -r $p ) {
print "Package $p not found.\n" if $verbose;
next;
}

print O "$pn $p 0\n";

print "Unpacking $p...\n" if $verbose;
@@ -288,8 +302,8 @@ sub getDeps {
$version = "$major.$minor.$patch" unless defined $version;

unless( defined $binary ) {
if( -f "binary-$archpostfix$version" ) {
open P, "binary-$archpostfix$version";
if( -f "binary$archpostfix-$version" ) {
open P, "binary$archpostfix-$version";
$binary = <P>;
close P;
$binary++;
@@ -386,7 +400,7 @@ sub getDeps {
system $cmd;
die "running nsis failed" if $?;

open P, ">osgeo4w/binary-$archpostfix$version";
open P, ">osgeo4w/binary$archpostfix-$version";
print P $binary;
close P;

0 comments on commit 1d9f5d8

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