Changeset 1156 for branches/vendor/nokia/qt/current/bin/createpackage.pl

Timestamp:

Nov 7, 2014, 5:23:02 PM (11 years ago)

Author:

Dmitry A. Kuminov

Message:

vendor: Import qt-everywhere-opensource-src-4.8.6 from Digia (excluding doc/html and doc/qch dirs generated from doc/src, and imports and templates dirs which are emtpy).

File:

• branches/vendor/nokia/qt/current/bin/createpackage.pl (modified) (15 diffs)

branches/vendor/nokia/qt/current/bin/createpackage.pl

@@ -2 +2 @@
 #############################################################################
 ##
-## Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-## All rights reserved.
-## Contact: Nokia Corporation ([email protected])
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+## Contact: http://www.qt-project.org/legal
 ##
 ## This file is part of the S60 port of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## Commercial Usage
-## Licensees holding valid Qt Commercial licenses may use this file in
-## accordance with the Qt Commercial License Agreement provided with the
+## Commercial Usage
+## Licensees holding valid  licenses may use this file in
+## accordance with the greement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and Nokia.
+## a written agreement between you and Digia.  For licensing terms and
+## conditions see http://qt.digia.com/licensing.  For further information
+## use the contact form at http://qt.digia.com/contact-us.
 ##
 ## GNU Lesser General Public License Usage
@@ -23 +24 @@
 ## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 ##
-## In addition, as a special exception, Nokia gives you certain additional
-## rights.  These rights are described in the Nokia Qt LGPL Exception
+## In addition, as a special exception, ia gives you certain additional
+## rights.  These rights are described in the ia Qt LGPL Exception
 ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 ##
@@ -35 +36 @@
 ## met: http://www.gnu.org/copyleft/gpl.html.
 ##
-## If you have questions regarding the use of this file, please contact
-## Nokia at [email protected].
+##
 ## $QT_END_LICENSE$
 ##
@@ -59 +59 @@
 # use CWD abs_bath, which is exported only on request
 use Cwd 'abs_path';
-
+use File::Copy;
 
 sub Usage() {
@@ -85 +85 @@
      [-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
@@ -131 +133 @@
 my $convertGcce = "";
 my $dontPatchCaps = "";
+
 
 unless (GetOptions('i|install' => \$install,
@@ -140 +143 @@
                    'n|sisname=s' => \$signed_sis_name,
                    'g|gcce-is-armv5' => \$convertGcce,
-                   'd|dont-patch' => \$dontPatchCaps,)) {
+                   'd|dont-patch' => \$dontPatchCaps,
+                   't|tmp-dir=s' => \$tempPackageDir,)) {
     Usage();
 }
@@ -191 +195 @@
 $passphrase = $ARGV[4] or $passphrase = "";
 
+
+
+
+
+
+
+
 # Generate output pkg basename (i.e. file name without extension)
 my $pkgoutputbasename = $templatepkg;
-my $preservePkgOutput = "";
 $pkgoutputbasename =~ s/_template/_$targetplatform/g;
 $pkgoutputbasename =~ s/_installer\.pkg/_installer___temp\.pkg/g;
-if ($pkgoutputbasename eq $templatepkg) {
-    $preservePkgOutput = "1";
-}
 $pkgoutputbasename =~ s/\.pkg//g;
 
 # Store output file names to variables
-my $pkgoutput = $pkgoutputbasename.".pkg";
+my ($dummy1, $dummy2, $pkgoutput) = File::Spec->splitpath($pkgoutputbasename.".pkg");
+$pkgoutput = $tempPackageDir."/".$pkgoutput;
 my $sisoutputbasename;
 if ($signed_sis_name eq "") {
@@ -231 +239 @@
 my $stub_sis_name = $sisoutputbasename.".sis";
 
-# Store some utility variables
-my $scriptpath = dirname(__FILE__);
 my $certtext = $certificate;
-# 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.
@@ -258 +262 @@
 } else {
     #If no certificate is given, check default options
+
+
+
+
+
+
+
+
+
+
     $certtext = "RnD";
     $certificate = File::Spec->catfile($certpath, "rd.cer");
@@ -301 +315 @@
     unlink $signed_sis_name;
 }
-if (!$preservePkgOutput) {
-    unlink $pkgoutput;
-}
+unlink $pkgoutput;
 
 # Preprocess PKG
@@ -335 +347 @@
 
 if ($preprocessonly) {
+
+
+
+
+
     exit;
 }
@@ -355 +372 @@
         } else {
             print("Auto-patching self-signed package.\n");
-            system ("$patch_capabilities $pkgoutput") and die ("ERROR: Automatic patching failed");
+            system ("$patch_capabilities $pkgoutput") and die ("ERROR: Automatic patching failed");
         }
     }
@@ -378 +395 @@
         }
 
-        if (!$preservePkgOutput) {
-            unlink $pkgoutput;
-        }
         print ("\n");
         exit;
@@ -406 +420 @@
         }
 
-        # remove temporary pkg and unsigned sis
-        if (!$preservePkgOutput) {
-            unlink $pkgoutput;
-        }
+        # remove temporary unsigned sis
         if (!$preserveUnsigned) {
             unlink $unsigned_sis_name;