New release package creation script

2 files changed, 156 insertions, 97 deletions

diff --git a/bin/build_bin_package.pl b/bin/build_bin_package.pl
deleted file mode 100644
index 3dfe5cc..0000000
--- a/bin/build_bin_package.pl
+++ /dev/null
@@ -1,97 +0,0 @@
-#######################################################################
-#
-# A script for creating binary release package
-#
-# Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
-# Contact: Qt Software Information (qt-info@nokia.com)
-#
-#######################################################################
-
-my $tempDir = "_binary_package_dir_";
-
-if (@ARGV)
-{
-    my $pkgFileName = shift(@ARGV);
-    my $epocroot = shift(@ARGV);
-
-    if (!-r($pkgFileName))
-    {
-        print("Package file doesn't exist!\n");
-        exit;
-    }
-
-    if ($epocroot eq "")
-    {
-        $epocroot = "\\";
-    }
-
-    my $armDbgDir = "epoc32\\release\\armv5\\udeb";
-    my $armRelDir = "epoc32\\release\\armv5\\urel";
-    my $gcceDbgDir = "epoc32\\release\\gcce\\udeb";
-    my $gcceRelDir = "epoc32\\release\\gcce\\urel";
-    my $armLibDir = "epoc32\\release\\armv5\\lib";
-
-    # Clear archive flag from all items in \epoc32\release\armv5\urel and \epoc32\release\armv5\lib
-    # as those will have the binaries used for all platforms and builds.
-    my $systemCmd = "attrib -A ".$epocroot.$armDbgDir."\\*.*";
-    runSystemCmd($systemCmd);
-    $systemCmd = "attrib -A ".$epocroot.$armLibDir."\\*.*";
-    runSystemCmd($systemCmd);
-
-    # Build Qt
-    runSystemCmd("qmake");
-    runSystemCmd("bldmake bldfiles");
-    runSystemCmd("abld build armv5 udeb");
-
-    # Make a temporary dir structure
-    system("rd /S /Q $tempDir 2> NUL");
-    runSystemCmd("mkdir $tempDir\\$armDbgDir");
-    runSystemCmd("mkdir $tempDir\\$armRelDir");
-    runSystemCmd("mkdir $tempDir\\$gcceDbgDir");
-    runSystemCmd("mkdir $tempDir\\$gcceRelDir");
-    runSystemCmd("mkdir $tempDir\\$armLibDir");
-    $systemCmd = "xcopy ".$epocroot.$armDbgDir."\\*.* ".$tempDir."\\".$armDbgDir."\\*.* /A /Q";
-    runSystemCmd($systemCmd);
-    $systemCmd = "xcopy ".$tempDir."\\".$armDbgDir."\\*.* ".$tempDir."\\".$armRelDir."\\*.* /Q";
-    runSystemCmd($systemCmd);
-    $systemCmd = "del /F /Q ".$tempDir."\\".$armRelDir."\\*.sym";
-    runSystemCmd($systemCmd);
-    $systemCmd = "xcopy ".$tempDir."\\".$armDbgDir."\\*.* ".$tempDir."\\".$gcceDbgDir."\\*.* /Q";
-    runSystemCmd($systemCmd);
-    $systemCmd = "xcopy ".$tempDir."\\".$armRelDir."\\*.* ".$tempDir."\\".$gcceRelDir."\\*.* /Q";
-    runSystemCmd($systemCmd);
-    $systemCmd = "xcopy ".$epocroot.$armLibDir."\\*.* ".$tempDir."\\".$armLibDir."\\*.* /A /Q";
-    runSystemCmd($systemCmd);
-
-    # Create sis to send for signing
-    my @sisFileNameList = split(/\./, $pkgFileName);
-    pop(@sisFileNameList);
-    my $sisFileName = join("", @sisFileNameList).".sis";
-    system("del /F /Q $sisFileName 2> NUL");
-    runSystemCmd("makesis $pkgFileName $sisFileName");
-    $systemCmd = "xcopy $sisFileName ".$tempDir."\\ /Q";
-    runSystemCmd($systemCmd);
-    system("del /F /Q $sisFileName 2> NUL");
-}
-else
-{
-    print("Usage:\n");
-    print("build_bin_package.pl qt_deployment_armv5_udeb.pkg [EPOCROOT]\n");
-    print("EPOCROOT is optional, defaults to '\\'\n");
-    print("1) Clean up the env. (abld reallyclean & delete \\my\\epoc\\root\\build folder)\n");
-    print("2) Run \"build_bin_package.pl qt_deployment_armv5_udeb.pkg [\\my\\epoc\\root\\]>\"\n");
-    print("   to prepare, build, and create the package structure and sis file.\n");
-    print("   Note: Run in the directory you want to be built for package contents.\n");
-    print("3) Get the sis signed and replace it with signed sisx.\n");
-    print("4) Zip up the $tempDir contents\n");
-}
-
-sub runSystemCmd
-{
-    my $error_code = system($_[0]);
-    if ($error_code != 0)
-    {
-        print("'$_[0]' call failed: error code == $error_code\n");
-        exit;
-    }
-}
diff --git a/bin/build_release_package.pl b/bin/build_release_package.pl
new file mode 100644
index 0000000..6873bd0
--- /dev/null
+++ b/bin/build_release_package.pl
@@ -0,0 +1,156 @@
+#######################################################################
+#
+# A script for creating binary release package
+#
+# Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+# Contact: Qt Software Information (qt-info@nokia.com)
+#
+#######################################################################
+
+use Cwd;
+
+my $releaseDir = "\\_qt_release_package_dir_";
+my $releaseDirQt = "${releaseDir}\\qt";
+my $releaseDirEpocroot = "${releaseDir}\\epocroot";
+my $releaseDirSis = "${releaseDir}\\sis";
+my $qtRootDir = cwd();
+$qtRootDir =~ s/\//\\/g; # Fix dir separators
+my $qtRootDirForMatch = $qtRootDir; # Double backslashes so that variable can be used in matching
+$qtRootDirForMatch =~ s/\\/\\\\/;
+
+if (@ARGV)
+{
+    my $platform = shift(@ARGV);
+    my $build = shift(@ARGV);
+    my $cert = shift(@ARGV);
+    my $certKey = shift(@ARGV);
+    my $epocroot = shift(@ARGV);
+    my $pkgFileName = "src\\s60installs\\qt_libs_${platform}_${build}.pkg";
+
+    if ($epocroot eq "")
+    {
+        $epocroot = "\\";
+    }
+
+    my $hwBuildDir = "${epocroot}epoc32\\release\\$platform\\$build";
+    my $armDbgDir = "epoc32\\release\\armv5\\udeb";
+    my $armRelDir = "epoc32\\release\\armv5\\urel";
+    #my $gcceDbgDir = "epoc32\\release\\gcce\\udeb"; #is this needed?
+    #my $gcceRelDir = "epoc32\\release\\gcce\\urel"; #is this needed?
+    my $armLibDir = "epoc32\\release\\armv5\\lib";
+    my $winscwDbgDir = "epoc32\\release\\winscw\\udeb";
+
+    # clean up old stuff
+    system("rd /S /Q ${releaseDir} 2> NUL");
+    system("rd /S /Q ${epocroot}epoc32\\build 2> NUL"); # Just in case env is not clean
+
+    # Copy the whole thing over to the release dir before it gets polluted
+    print("Copying clean tree...\n");
+    runSystemCmd("xcopy ${qtRootDir} ${releaseDirQt} /E /I /H /Q");
+
+    # Clear archive flag from all items in \epoc32\release\armv5\urel and \epoc32\release\armv5\lib
+    # as those will have the binaries used for all platforms and builds.
+    runSystemCmd("attrib -A ${hwBuildDir}\\*");
+    runSystemCmd("attrib -A ${epocroot}${armLibDir}\\*");
+    runSystemCmd("attrib -A ${epocroot}${winscwDbgDir}\\*");
+
+    # Build Qt
+    runSystemCmd("configure -platform win32-mwc -xplatform symbian-abld -openssl-linked -qt-sql-sqlite -system-sqlite -nokia-developer");
+    chdir("src");
+    runSystemCmd("qmake");
+    runSystemCmd("bldmake bldfiles");
+    runSystemCmd("abld build ${platform} ${build}");
+    runSystemCmd("abld build winscw udeb");
+    chdir($qtRootDir);
+
+    # Copy misc stuff
+    runSystemCmd("xcopy ${qtRootDir}\\bin\\* ${releaseDirQt}\\bin /F /R /Y /I /D");
+    runSystemCmd("xcopy ${qtRootDir}\\lib\\*.prl ${releaseDirQt}\\lib /F /R /Y /I /D /E");
+    runSystemCmd("xcopy ${qtRootDir}\\mkspecs\\* ${releaseDirQt}\\mkspecs /F /R /Y /I /D /E");
+    print("Copying includes...\n");
+    runSystemCmd("xcopy ${qtRootDir}\\include\\* ${releaseDirQt}\\include /F /R /Y /I /D /E /Q");
+    runSystemCmd("copy src\\corelib\\global\\qconfig.h ${releaseDirQt}\\src\\corelib\\global\\qconfig.h");
+    runSystemCmd("copy .qmake.cache ${releaseDirQt}\\.qmake.cache");
+
+    # Copy stuff indicated by pkg file for emulator
+    open (PKG, "<".$pkgFileName);
+    while (<PKG>)
+    {
+        my $line = $_;
+        chomp ($line);
+
+        # If the line specifies a file, parse the source and destination locations.
+        if ($line =~ m/\"([^\"]+)\"\s*\-\s*\"([^\"]+)\"/)
+        {
+            my $sourcePath = $1;
+            my $pkgDestinationPath = $2;
+            $sourcePath =~ s/\//\\/g;
+
+            # Copy stuff required for creating deployment package
+            my $destinationPath = $sourcePath;
+
+            if($destinationPath =~ m/($qtRootDirForMatch)/i)
+            {
+                $destinationPath =~ s/($qtRootDirForMatch)//i;
+                $destinationPath = $releaseDirQt.$destinationPath;
+            }
+            else
+            {
+                $destinationPath =~ s/.://;
+                $destinationPath = $releaseDirEpocroot.$destinationPath;
+            }
+
+            runSystemCmd("echo f|xcopy ${sourcePath} ${destinationPath} /F /R /Y /I /D");
+
+            if ($sourcePath !~ m/\\epoc32\\release\\([^\\]+)\\(udeb|urel)\\(\w+(\.dll|\.exe))/i)
+            {
+                # Copy non-binaries also over for emulator to use
+                $pkgDestinationPath =~ s/!:/${releaseDirEpocroot}\\epoc32\\winscw\\c/g;
+                runSystemCmd("echo f|xcopy ${sourcePath} ${pkgDestinationPath} /F /R /Y /I /D");
+            }
+
+        }
+    }
+    close (PKG);
+
+    # Copy binaries
+    runSystemCmd("xcopy ${hwBuildDir}\\* ${releaseDirEpocroot}\\${armDbgDir} /A /F /I /D");
+    runSystemCmd("xcopy ${releaseDirEpocroot}\\${armDbgDir}\\* ${releaseDirEpocroot}\\${armRelDir} /F /I");
+    system("del /F /Q ${releaseDirEpocroot}\\${armRelDir}\\*.sym 2> NUL");
+    #runSystemCmd("xcopy ${releaseDirEpocroot}\\${armDbgDir}\\* ${releaseDirEpocroot}\\${gcceDbgDir} /F /I");
+    #runSystemCmd("xcopy ${releaseDirEpocroot}\\${armRelDir}\\* ${releaseDirEpocroot}\\${gcceRelDir} /F /I");
+    runSystemCmd("xcopy ${epocroot}${armLibDir}\\* ${releaseDirEpocroot}\\${armLibDir} /A /F /I");
+    runSystemCmd("xcopy ${epocroot}${winscwDbgDir}\\* ${releaseDirEpocroot}\\${winscwDbgDir} /A /F /I");
+
+    # Create unsigned sis and Rnd signed sisx
+    my @pkgPathElements = split(/\\/, $pkgFileName);
+    my $pathlessPkgFile = pop(@pkgPathElements);
+    my @pkgSuffixElements = split(/\./, $pathlessPkgFile);
+    pop(@pkgSuffixElements);
+    my $sisFileName = join("", @pkgSuffixElements).".sis";
+    system("mkdir ${releaseDirSis}");
+    runSystemCmd("makesis ${pkgFileName} ${releaseDirSis}\\${sisFileName}");
+    runSystemCmd("signsis ${releaseDirSis}\\${sisFileName} ${releaseDirSis}\\${sisFileName}x ${cert} ${certKey}");
+}
+else
+{
+    print("Usage:\n");
+    print("build_release_package.pl <hw platform> <hw build> <signing cert> <signing cert key> [EPOCROOT]\n");
+    print("EPOCROOT is optional, defaults to '\\'\n");
+    print("1) Clean up the env. (abld reallyclean & delete \\my\\epoc\\root\\build folder)\n");
+    print("2) Run \"build_release_package.pl armv5 udeb \\rd.cer \\rd-key.pem [\\my\\epoc\\root\\]>\"\n");
+    print("   to build Qt and create the release package structure and sis file.\n");
+    print("   Note: Run in the Qt root directory.\n");
+    print("3) Optional: Get the sis signed with commercial certificate\n");
+    print("4) Zip up the ${releaseDir} contents\n");
+}
+
+sub runSystemCmd
+{
+    my $error_code = system($_[0]);
+    if ($error_code != 0)
+    {
+        print("'$_[0]' call failed: error code == $error_code\n");
+        exit;
+    }
+}