CWS-TOOLING: integrate CWS dv11

2009-05-13 16:50:24 +0200 dv  r271863 : #i101829# Use UPGRADINGPRODUCTCODE to detect major upgrade
2009-04-17 15:55:48 +0200 dv  r270953 : CWS-TOOLING: rebase CWS dv11 to trunk@270723 (milestone: DEV300:m46)
2009-04-17 09:14:21 +0200 dv  r270916 : #i100915# Use better product name
2009-04-16 14:41:49 +0200 dv  r270884 : #i101132# Use a waiting thread to defere update check
2009-04-07 15:46:52 +0200 dv  r270599 : #i100915# Use one include file for all version.rc files
2009-04-07 13:49:56 +0200 dv  r270596 : #i100915# Use one include file for all version.rc files
2009-04-03 09:04:08 +0200 dv  r270447 : #100776# Added Microsoft XML file types to 'Default Applications', cleaned up Application name display in 'Default Applications'
2009-04-01 10:13:28 +0200 dv  r270306 : #i100713# Remove instmsia.exe from installation set
2009-03-30 16:35:35 +0200 dv  r270240 : CWS-TOOLING: rebase CWS dv11 to trunk@270033 (milestone: DEV300:m45)
2009-03-27 10:24:40 +0100 dv  r270138 : #i100410# Show survey after deinstalling OpenOffice.org (Windows only)
2009-03-18 15:05:31 +0100 dv  r269679 : #i98780# Use 'Desktop' folder only, if it exists
2009-03-17 11:19:47 +0100 dv  r269581 : #i100082# Ignore updates with failed dependencies for automatic update check
2009-03-13 14:37:27 +0100 dv  r269479 : #i100082# Use 'value' instead of 'name' to create error message
2009-03-13 10:14:48 +0100 dv  r269460 : #i100082# Support better error message when extension manager update finds an incompatible update

4 files changed, 9 insertions, 44 deletions

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 69fccd60e1a7..dd1964459850 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -8,8 +8,6 @@
 #
 # $RCSfile: make_installer.pl,v $
 #
-# $Revision: 1.121 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -2221,14 +2219,14 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
         }
 
         # Analyzing the ScpActions and copying the files into the installation set
-        # At least the loader, instmsia.exe and instmsiw.exe
+        # At least the loader.exe
 
         installer::logger::print_message( "... copying files into installation set ...\n" );
 
         # installer::windows::msiglobal::copy_scpactions_into_installset($defaultlanguage, $installdir, $scpactionsinproductlanguageresolvedarrayref);
         installer::worker::put_scpactions_into_installset($installdir);
 
-        # ... copying the setup.exe, instmsia.exe and instmsiw.exe
+        # ... copying the setup.exe
 
         installer::windows::msiglobal::copy_windows_installer_files_into_installset($installdir, $includepatharrayref, $allvariableshashref);
 
diff --git a/solenv/bin/modules/installer/scppatchsoname.pm b/solenv/bin/modules/installer/scppatchsoname.pm
index 7ade6dee9c80..5d445d92dc13 100644
--- a/solenv/bin/modules/installer/scppatchsoname.pm
+++ b/solenv/bin/modules/installer/scppatchsoname.pm
@@ -78,7 +78,7 @@ sub convert_to_unicode
 
 sub replace_productname_in_file
 {
-    my ($sourcepath, $destpath, $variableshashref) = @_;
+    my ($sourcepath, $destpath, $variableshashref, $filedescription) = @_;
 
     my $onefile = installer::files::read_binary_file($sourcepath);
 
@@ -87,6 +87,7 @@ sub replace_productname_in_file
     for ( my $i = 1; $i <= 80; $i++ ) { $replacestring .= $onestring; }
 
     my $productname = $variableshashref->{'PRODUCTNAME'} . " " . $variableshashref->{'PRODUCTVERSION'};
+    if ( $filedescription ne "" ) { $productname = $filedescription; }
     my $unicode_productname = convert_to_unicode($productname);
 
     change_length_of_string(\$unicode_productname, $replacestring);
@@ -124,6 +125,7 @@ sub resolving_patchsoname_flag
             # Language specific subdirectory
 
             my $onelanguage = $onefile->{'specificlanguage'};
+            my $filedescription = "";
 
             if ($onelanguage eq "")
             {
@@ -140,6 +142,8 @@ sub resolving_patchsoname_flag
             my $destinationpath = $replacedir . $onefilename;
             my $movepath = $destinationpath . ".orig";
 
+            if ( exists($onefile-> {'FileDescription'}) ) { $filedescription = $onefile-> {'FileDescription'}; }
+
             # if (!(-f $destinationpath))   # do nothing if the file already exists
             # {
 
@@ -148,7 +152,7 @@ sub resolving_patchsoname_flag
             if ( $copysuccess )
             {
                 # Now the file can be patch (binary!)
-                my $found = replace_productname_in_file($movepath, $destinationpath, $variableshashref);
+                my $found = replace_productname_in_file($movepath, $destinationpath, $variableshashref, $filedescription);
 
                 if ($found == 0)
                 {
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 030bb2d6ac50..2b6373441442 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -8,8 +8,6 @@
 #
 # $RCSfile: msiglobal.pm,v $
 #
-# $Revision: 1.51 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1162,34 +1160,6 @@ sub put_databasename_into_setupini
 }
 
 ##########################################################################
-# Writing the path to the instmsiw.exe into setup.ini
-##########################################################################
-
-sub put_instmsiwpath_into_setupini
-{
-    my ($setupinifile) = @_;
-
-    my $instmsiwexepath = "instmsiw.exe";
-    my $line = "instmsiw=" . $instmsiwexepath . "\n";
-
-    push(@{$setupinifile}, $line);
-}
-
-##########################################################################
-# Writing the path to the instmsia.exe into setup.ini
-##########################################################################
-
-sub put_instmsiapath_into_setupini
-{
-    my ($setupinifile) = @_;
-
-    my $instmsiaexepath = "instmsia.exe";
-    my $line = "instmsia=" . $instmsiaexepath . "\n";
-
-    push(@{$setupinifile}, $line);
-}
-
-##########################################################################
 # Writing the required msi version into setup.ini
 ##########################################################################
 
@@ -1335,8 +1305,6 @@ sub create_setup_ini
     push(@setupinifile, $line);
 
     put_databasename_into_setupini($setupinifile, $allvariableshashref);
-    put_instmsiwpath_into_setupini($setupinifile);
-    put_instmsiapath_into_setupini($setupinifile);
     put_msiversion_into_setupini($setupinifile);
     put_productname_into_setupini($setupinifile, $allvariableshashref);
     put_productcode_into_setupini($setupinifile);
@@ -1406,7 +1374,7 @@ sub copy_scpactions_into_installset
 
 #################################################################
 # Copying the files for the Windows installer into the
-# installation set (setup.exe, instmsia.exe, instmsiw.exe).
+# installation set (setup.exe).
 #################################################################
 
 sub copy_windows_installer_files_into_installset
@@ -1416,8 +1384,6 @@ sub copy_windows_installer_files_into_installset
     installer::logger::include_header_into_logfile("Copying Windows installer files into installation set");
 
     @copyfile = ();
-    push(@copyfile, "instmsia.exe");
-    push(@copyfile, "instmsiw.exe");
     push(@copyfile, "loader2.exe");
 
     if ( $allvariables->{'NOLOADERREQUIRED'} ) { @copyfile = (); }
diff --git a/solenv/bin/modules/installer/windows/sign.pm b/solenv/bin/modules/installer/windows/sign.pm
index b1abbbfb73a7..60de4fe41bf1 100644
--- a/solenv/bin/modules/installer/windows/sign.pm
+++ b/solenv/bin/modules/installer/windows/sign.pm
@@ -8,8 +8,6 @@
 #
 # $RCSfile: binary.pm,v $
 #
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -299,7 +297,6 @@ sub analyze_installset_content
         if ( $sourcefiles[$j] =~ /\.cab\s*$/ ) { $allcabfileshash{$sourcefiles[$j]} = 1; }
         else
         {
-            if ( $sourcefiles[$j] =~ /instmsi\w+.exe\s*$/ ) { next; } # no signing of instmsia.exe and instmsiw.exe
             if ( $sourcefiles[$j] =~ /jre[-\w]+.exe\s*$/ ) { next; } # no signing of java executable
             if ( $sourcefiles[$j] =~ /\.txt\s*$/ ) { next; }
             if ( $sourcefiles[$j] =~ /\.html\s*$/ ) { next; }