summaryrefslogtreecommitdiffstats
path: root/bin/createpackage.pl
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-01-05 15:07:30 (GMT)
committeraxis <qt-info@nokia.com>2010-01-05 15:07:30 (GMT)
commit0d92fc13baac9d354a7d3a2665ca3bb4127bd606 (patch)
tree04308596166ab753de6de705fcd80b091e4562ad /bin/createpackage.pl
parent6abee18b8ab9899b909a15227fba8fbc4506fad8 (diff)
parent78474a65e4f61e9d1ae8116d5b690cf78729aa71 (diff)
downloadQt-0d92fc13baac9d354a7d3a2665ca3bb4127bd606.zip
Qt-0d92fc13baac9d354a7d3a2665ca3bb4127bd606.tar.gz
Qt-0d92fc13baac9d354a7d3a2665ca3bb4127bd606.tar.bz2
Merge branch 'merge-request-1601' into master-s60
Conflicts: bin/createpackage.pl mkspecs/features/symbian/application_icon.prf qmake/generators/symbian/symmake_abld.cpp src/gui/text/qfontdatabase_s60.cpp src/s60main/s60main.pro
Diffstat (limited to 'bin/createpackage.pl')
-rwxr-xr-xbin/createpackage.pl14
1 files changed, 6 insertions, 8 deletions
diff --git a/bin/createpackage.pl b/bin/createpackage.pl
index 7e87758..df54328 100755
--- a/bin/createpackage.pl
+++ b/bin/createpackage.pl
@@ -145,10 +145,8 @@ my $signed_sis_name = $pkgoutputbasename.".sis";
# Store some utility variables
my $scriptpath = dirname(__FILE__);
my $certtext = $certificate;
-my $certpath = $scriptpath;
-$certpath =~ s-^(.*[^\\])$-$1\\-o; # ensure path ends with a backslash
-$certpath =~ s-/-\\-go; # for those working with UNIX shells
-$certpath =~ s-bin\\$-src\\s60installs\\-; # certificates are one step up in hierarcy
+# certificates are one step up in hierarchy
+my $certpath = File::Spec->catdir($scriptpath, File::Spec->updir(), "src/s60installs/");
# Check some pre-conditions and print error messages if needed
unless (length($templatepkg) && length($platform) && length($target)) {
@@ -172,14 +170,14 @@ if (length($certificate)) {
} else {
#If no certificate is given, check default options
$certtext = "RnD";
- $certificate = $certpath."rd.cer";
- $key = $certpath."rd-key.pem";
+ $certificate = File::Spec->catfile($certpath, "rd.cer");
+ $key = File::Spec->catfile($certpath, "rd-key.pem");
stat($certificate);
unless( -e _ ) {
$certtext = "Self Signed";
- $certificate = $certpath."selfsigned.cer";
- $key = $certpath."selfsigned.key";
+ $certificate = File::Spec->catfile($certpath, "selfsigned.cer");
+ $key = File::Spec->catfile($certpath, "selfsigned.key");
}
}