summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@sosco.com>2009-09-25 14:28:53 +0200
committerShane Kearns <shane.kearns@sosco.com>2009-09-25 14:30:55 +0200
commita39f17108e43e8b676738c15d8f0c150787de514 (patch)
tree85dde38ef1341a03f13b51b442aa61056a54aed5
parent7c663d00eeea346813bb7ebcc36ac042b03e7688 (diff)
downloadqt4-tools-a39f17108e43e8b676738c15d8f0c150787de514.tar.gz
Move selfsigned cert & key out of root directory
Moved the certificate/key to the src/s60installs path. Updated createpackage.pl to look in this new location. Task-number: QTBUG-4553 Reviewed-by: axis
-rwxr-xr-xbin/createpackage.pl6
-rw-r--r--src/s60installs/selfsigned.cer (renamed from selfsigned.cer)0
-rw-r--r--src/s60installs/selfsigned.key (renamed from selfsigned.key)0
3 files changed, 3 insertions, 3 deletions
diff --git a/bin/createpackage.pl b/bin/createpackage.pl
index 4597b0484a..7e8775817a 100755
--- a/bin/createpackage.pl
+++ b/bin/createpackage.pl
@@ -146,9 +146,9 @@ my $signed_sis_name = $pkgoutputbasename.".sis";
my $scriptpath = dirname(__FILE__);
my $certtext = $certificate;
my $certpath = $scriptpath;
-$certpath =~ s-^(.*[^\\])$-$1\\-o; # ensure path ends with a backslash
-$certpath = $certpath."../"; # certificates are one step up in hierarcy
-$certpath =~ s-/-\\-go; # for those working with UNIX shells
+$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
# Check some pre-conditions and print error messages if needed
unless (length($templatepkg) && length($platform) && length($target)) {
diff --git a/selfsigned.cer b/src/s60installs/selfsigned.cer
index af7244934d..af7244934d 100644
--- a/selfsigned.cer
+++ b/src/s60installs/selfsigned.cer
diff --git a/selfsigned.key b/src/s60installs/selfsigned.key
index 47c51a0a56..47c51a0a56 100644
--- a/selfsigned.key
+++ b/src/s60installs/selfsigned.key