From 2be60dfbc08eed737716ff5025e23e63c3f6bbb5 Mon Sep 17 00:00:00 2001 From: Jani Hautakangas Date: Tue, 14 Sep 2010 16:31:24 +0200 Subject: This patch enables calling createpackage script also when using EPOCROOT that contains drive letter. Reviewed-by: axis --- bin/createpackage.pl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/createpackage.pl b/bin/createpackage.pl index 2569a66..238eae3 100755 --- a/bin/createpackage.pl +++ b/bin/createpackage.pl @@ -308,7 +308,7 @@ if($stub) { mkpath($systeminstall); my $stub_sis_name = $systeminstall."/".$stub_sis_name; # Create stub SIS. - system ("makesis -s $pkgoutput $stub_sis_name"); + system ("$ENV{EPOCROOT}epoc32/tools/makesis -s $pkgoutput $stub_sis_name"); } else { if ($certtext eq "Self Signed" && !@certificates @@ -321,7 +321,10 @@ if($stub) { # Create SIS. # The 'and' is because system uses 0 to indicate success. - system ("makesis $pkgoutput $unsigned_sis_name") and die ("makesis failed"); + if($ENV{EPOCROOT}) + system ("$ENV{EPOCROOT}epoc32/tools/makesis $pkgoutput $unsigned_sis_name") and die ("makesis failed"); + else + system ("makesis $pkgoutput $unsigned_sis_name") and die ("makesis failed"); print("\n"); my $targetInsert = ""; -- cgit v0.12 From cd5441ec7937703904700dddf25afdcc80a66661 Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Tue, 14 Sep 2010 16:32:02 +0100 Subject: Fix compile error with active perl 5.8.9 Reviewed-by: Jani Hautakangas --- bin/createpackage.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/createpackage.pl b/bin/createpackage.pl index 238eae3..361b32d 100755 --- a/bin/createpackage.pl +++ b/bin/createpackage.pl @@ -321,10 +321,11 @@ if($stub) { # Create SIS. # The 'and' is because system uses 0 to indicate success. - if($ENV{EPOCROOT}) + if($ENV{EPOCROOT}) { system ("$ENV{EPOCROOT}epoc32/tools/makesis $pkgoutput $unsigned_sis_name") and die ("makesis failed"); - else + } else { system ("makesis $pkgoutput $unsigned_sis_name") and die ("makesis failed"); + } print("\n"); my $targetInsert = ""; -- cgit v0.12