diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-26 23:01:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-26 23:01:48 (GMT) |
| commit | 318920abb6d0db0fe51663023b5f34aaf6d7b10c (patch) | |
| tree | fa6f20deb2970976262d38894298e1bbf76c1433 /bin/createpackage.pl | |
| parent | 0f4c26ef3dc35e0b45c858b779074708de688cc6 (diff) | |
| parent | 5e0c4463c8dc8857e9f64a1bdde9a94cd8c39c4d (diff) | |
| download | Qt-318920abb6d0db0fe51663023b5f34aaf6d7b10c.zip Qt-318920abb6d0db0fe51663023b5f34aaf6d7b10c.tar.gz Qt-318920abb6d0db0fe51663023b5f34aaf6d7b10c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team:
Fix minor memory leak
Remove unused variable
Revert "Fix a missing error-signal when a server is shut down while downloading"
Add missing newline to configure.exe output.
Repaint when text color changes
Fix type punning warnings from gcc
Slightly improved tst_qmlvisual output
More detail when the process crashes in tst_qmlvisual.
Only patch package content that is necessary for self-signing
Fix a missing error-signal when a server is shut down while downloading
Ensure that if this is does not have a valid filter when on XP or less
HTTP backend: fix build without Qt3 support
QNetworkAccessManager: enable synchronous HTTP calls
Diffstat (limited to 'bin/createpackage.pl')
| -rwxr-xr-x | bin/createpackage.pl | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/bin/createpackage.pl b/bin/createpackage.pl index 522d1fb..6b83585 100755 --- a/bin/createpackage.pl +++ b/bin/createpackage.pl @@ -82,6 +82,8 @@ Where supported options are as follows: [-s|stub] = Generates stub sis for ROM. [-n|sisname <name>] = Specifies the final sis name. [-g|gcce-is-armv5] = Convert gcce platform to armv5. + [-d|dont-patch] = Skip automatic patching of capabilities and pkg file if default certificate + is used. Instead non-self-signable capabilities just cause warnings. Where parameters are as follows: templatepkg = Name of .pkg file template target = Either debug or release @@ -127,6 +129,7 @@ my $stub = ""; my $signed_sis_name = ""; my $onlyUnsigned = ""; my $convertGcce = ""; +my $dontPatchCaps = ""; unless (GetOptions('i|install' => \$install, 'p|preprocess' => \$preprocessonly, @@ -135,7 +138,8 @@ unless (GetOptions('i|install' => \$install, 'o|only-unsigned' => \$onlyUnsigned, 's|stub' => \$stub, 'n|sisname=s' => \$signed_sis_name, - 'g|gcce-is-armv5' => \$convertGcce,)) { + 'g|gcce-is-armv5' => \$convertGcce, + 'd|dont-patch' => \$dontPatchCaps,)) { Usage(); } @@ -343,9 +347,13 @@ if($stub) { && !@certificates && $templatepkg !~ m/_installer\.pkg$/i && !$onlyUnsigned) { - print("Auto-patching capabilities for self signed package.\n"); my $patch_capabilities = File::Spec->catfile(dirname($0), "patch_capabilities"); - system ("$patch_capabilities $pkgoutput") and die ("ERROR: Automatic patching failed"); + if ($dontPatchCaps) { + system ("$patch_capabilities -c $pkgoutput") and print ("Warning: Package check for self-signing viability failed. Installing the package on a device will most likely fail!\n\n"); + } else { + print("Auto-patching self-signed package.\n"); + system ("$patch_capabilities $pkgoutput") and die ("ERROR: Automatic patching failed"); + } } # Create SIS. |