diff options
| author | Jani Hautakangas <ext-jani.hautakangas@nokia.com> | 2010-09-14 14:31:24 (GMT) |
|---|---|---|
| committer | Jani Hautakangas <ext-jani.hautakangas@nokia.com> | 2010-09-14 14:34:01 (GMT) |
| commit | 2be60dfbc08eed737716ff5025e23e63c3f6bbb5 (patch) | |
| tree | 136d4478e9680da4ee8b965636b3c3766fb78439 /bin/createpackage.pl | |
| parent | 4d2936ffd9291d27d57d056794b44f872a1e13ad (diff) | |
| download | Qt-2be60dfbc08eed737716ff5025e23e63c3f6bbb5.zip Qt-2be60dfbc08eed737716ff5025e23e63c3f6bbb5.tar.gz Qt-2be60dfbc08eed737716ff5025e23e63c3f6bbb5.tar.bz2 | |
This patch enables calling createpackage script also
when using EPOCROOT that contains drive letter.
Reviewed-by: axis
Diffstat (limited to 'bin/createpackage.pl')
| -rwxr-xr-x | bin/createpackage.pl | 7 |
1 files 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 = ""; |