summaryrefslogtreecommitdiffstats
path: root/bin/createpackage.pl
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-09-16 13:33:33 (GMT)
committeraxis <qt-info@nokia.com>2010-09-16 14:01:42 (GMT)
commit093221ee4ca3b6ca08731c6d7cb71c360ef68a18 (patch)
tree0f6e9b0326fa67ac85527cf1ca09750c239da552 /bin/createpackage.pl
parent61ffabaf55f4130114ede74f90ae820bebbfa84a (diff)
downloadQt-093221ee4ca3b6ca08731c6d7cb71c360ef68a18.zip
Qt-093221ee4ca3b6ca08731c6d7cb71c360ef68a18.tar.gz
Qt-093221ee4ca3b6ca08731c6d7cb71c360ef68a18.tar.bz2
Fixed EPOCROOT references in createpackage.pl.
The makefile build system does not require EPOCROOT to end in a slash. RevBy: Jani Hautakangas
Diffstat (limited to 'bin/createpackage.pl')
-rwxr-xr-xbin/createpackage.pl13
1 files changed, 8 insertions, 5 deletions
diff --git a/bin/createpackage.pl b/bin/createpackage.pl
index 361b32d..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 ("$ENV{EPOCROOT}epoc32/tools/makesis -s $pkgoutput $stub_sis_name");
+ system ("$epocroot/epoc32/tools/makesis -s $pkgoutput $stub_sis_name");
} else {
if ($certtext eq "Self Signed"
&& !@certificates
@@ -321,8 +324,8 @@ if($stub) {
# Create SIS.
# The 'and' is because system uses 0 to indicate success.
- if($ENV{EPOCROOT}) {
- system ("$ENV{EPOCROOT}epoc32/tools/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");
}