diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/createpackage.pl | 15 | ||||
| -rwxr-xr-x | bin/syncqt | 1 |
2 files changed, 12 insertions, 4 deletions
diff --git a/bin/createpackage.pl b/bin/createpackage.pl index 2569a66..cce0b54 100755 --- a/bin/createpackage.pl +++ b/bin/createpackage.pl @@ -139,6 +139,9 @@ unless (GetOptions('i|install' => \$install, Usage(); } +my $epocroot = $ENV{EPOCROOT}; +$epocroot =~ s,[\\/]$,,x; + my $certfilepath = abs_path(dirname($certfile)); # Read params to variables @@ -303,12 +306,12 @@ if ($preprocessonly) { } if($stub) { - if(!($ENV{EPOCROOT})) { die("EPOCROOT must be set to create stub sis files"); } - my $systeminstall = "$ENV{EPOCROOT}epoc32/data/z/system/install"; + if(!($epocroot)) { die("EPOCROOT must be set to create stub sis files"); } + my $systeminstall = "$epocroot/epoc32/data/z/system/install"; mkpath($systeminstall); my $stub_sis_name = $systeminstall."/".$stub_sis_name; # Create stub SIS. - system ("makesis -s $pkgoutput $stub_sis_name"); + system ("$epocroot/epoc32/tools/makesis -s $pkgoutput $stub_sis_name"); } else { if ($certtext eq "Self Signed" && !@certificates @@ -321,7 +324,11 @@ 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($epocroot) { + system ("$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 = ""; @@ -51,6 +51,7 @@ my %modules = ( # path to module name map "QtWebKit" => "$basedir/src/3rdparty/webkit/WebCore", "phonon" => "$basedir/src/phonon", "QtMultimedia" => "$basedir/src/multimedia", + "QtMeeGoGraphicsSystemHelper" => "$basedir/tools/qmeegographicssystemhelper", ); my %moduleheaders = ( # restrict the module headers to those found in relative path "QtWebKit" => "../WebKit/qt/Api", |