WIP: data for the new MsiShortcutProperty installer table

Change-Id: If421383abe95738b8247aebc5cf43b1eaa346c39

scp2/source/base/folderitem_base.scp

@@ -30,4 +30,10 @@ FolderItem gid_Folderitem_Sbase
     Parameter = "";
     ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE);
 End
+
+FolderItemProperty git_Folderitem_Sbase_AppIDProperty
+    ShortcutID = gid_Folderitem_Sbase;
+    Key = "System.AppUserModel.ID"
+    Value = "TheDocumentFoundation.LibreOffice.Base"
+End
 #endif

scp2/source/calc/folderitem_calc.scp

@@ -30,4 +30,10 @@ FolderItem gid_Folderitem_Scalc
     Parameter = "";
     ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC);
 End
+
+FolderItemProperty git_Folderitem_Scalc_AppIDProperty
+    ShortcutID = gid_Folderitem_Scalc;
+    Key = "System.AppUserModel.ID"
+    Value = "TheDocumentFoundation.LibreOffice.Calc"
+End
 #endif

scp2/source/draw/folderitem_draw.scp

@@ -30,4 +30,10 @@ FolderItem gid_Folderitem_Sdraw
     Parameter = "";
     ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW);
 End
+
+FolderItemProperty git_Folderitem_Sdraw_AppIDProperty
+    ShortcutID = gid_Folderitem_Sdraw;
+    Key = "System.AppUserModel.ID"
+    Value = "TheDocumentFoundation.LibreOffice.Draw"
+End
 #endif

scp2/source/impress/folderitem_impress.scp

@@ -30,4 +30,10 @@ FolderItem gid_Folderitem_Simpress
     Parameter = "";
     ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS);
 End
+
+FolderItemProperty git_Folderitem_Simpress_AppIDProperty
+    ShortcutID = gid_Folderitem_Simpress;
+    Key = "System.AppUserModel.ID"
+    Value = "TheDocumentFoundation.LibreOffice.Impress"
+End
 #endif

scp2/source/math/folderitem_math.scp

@@ -30,4 +30,10 @@ FolderItem gid_Folderitem_Smath
     Parameter = "";
     ALL_LANG(Tooltip, STR_FI_TOOLTIP_MATH);
 End
+
+FolderItemProperty git_Folderitem_Smath_AppIDProperty
+    ShortcutID = gid_Folderitem_Smath;
+    Key = "System.AppUserModel.ID"
+    Value = "TheDocumentFoundation.LibreOffice.Math"
+End
 #endif

scp2/source/ooo/folderitem_ooo.scp

@@ -35,6 +35,12 @@ FolderItem gid_Folderitem_LibreOffice
     Parameter = "";
 End
 
+FolderItemProperty git_Folderitem_LibreOffice_AppIDProperty
+    ShortcutID = gid_Folderitem_LibreOffice;
+    Key = "System.AppUserModel.ID"
+    Value = "TheDocumentFoundation.LibreOffice.Startcenter"
+End
+
 FolderItem gid_Folderitem_Soffice_Desktop
 #ifdef ENABLE_SILENT_MSI
     Name = "%PRODUCTNAME";
@@ -52,3 +58,9 @@ FolderItem gid_Folderitem_Soffice_Desktop
     Parameter = "";
     ComponentCondition = "CREATEDESKTOPLINK=1";
 End
+
+FolderItemProperty git_Folderitem_Soffice_Desktop_AppIDProperty
+    ShortcutID = gid_Folderitem_Soffice_Desktop;
+    Key = "System.AppUserModel.ID"
+    Value = "TheDocumentFoundation.LibreOffice.Startcenter"
+End

scp2/source/writer/folderitem_writer.scp

@@ -30,4 +30,10 @@ FolderItem gid_Folderitem_Swriter
     Parameter = "";
     ALL_LANG(Tooltip, STR_FI_TOOLTIP_WRITER);
 End
+
+FolderItemProperty git_Folderitem_Swriter_AppIDProperty
+    ShortcutID = gid_Folderitem_Swriter;
+    Key = "System.AppUserModel.ID"
+    Value = "TheDocumentFoundation.LibreOffice.Writer"
+End
 #endif

solenv/bin/modules/installer.pm

@@ -64,6 +64,7 @@ use installer::windows::inifile;
 use installer::windows::media;
 use installer::windows::mergemodule;
 use installer::windows::msiglobal;
+use installer::windows::msishortcutproperty;
 use installer::windows::msp;
 use installer::windows::property;
 use installer::windows::removefile;
@@ -351,6 +352,7 @@ sub run {
 
     my $folderinproductarrayref;
     my $folderitemsinproductarrayref;
+    my $folderitempropertiesinproductarrayref;
     my $registryitemsinproductarrayref;
     my $windowscustomactionsarrayref;
     my $mergemodulesarrayref;
@@ -367,6 +369,10 @@ sub run {
 
         installer::setupscript::add_predefined_folder($folderitemsinproductarrayref, $folderinproductarrayref);
 
+        installer::logger::print_message( "... analyzing folderitemproperties ... \n" );
+
+        $folderitempropertiessinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "FolderItemProperty");
+
         installer::logger::print_message( "... analyzing registryitems ... \n" );
 
         $registryitemsinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "RegistryItem");
@@ -1386,6 +1392,8 @@ sub run {
 
             installer::windows::upgrade::create_upgrade_table($newidtdir, $allvariableshashref);
 
+            installer::windows::msishortcutproperty::create_msishortcutproperty_table($folderitempropertiesinproductlanguageresolvedarrayref, $folderitemsinproductlanguageresolvedarrayref, $newidtdir);
+
             if (( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack )) # the following tables not for language packs or help packs
             {
                 installer::windows::removefile::create_removefile_table($folderitemsinproductlanguageresolvedarrayref, $newidtdir);

solenv/bin/modules/installer/windows/idtglobal.pm

@@ -475,6 +475,16 @@ sub write_idt_header
         push(@{$idtref}, $oneline);
     }
 
+    if ( $definestring eq "msishortcutproperty" )
+    {
+        $oneline = "MsiShortcutProperty\tShortcut_\tPropertyKey\tPropVariantValue\n";
+        push(@{$idtref}, $oneline);
+        $oneline = "s72\ts72\tS255\tS255\n";
+        push(@{$idtref}, $oneline);
+        $oneline = "MsiShortcutProperty\tMsiShortcutProperty\n";
+        push(@{$idtref}, $oneline);
+    }
+
     if ( $definestring eq "registry" )
     {
         $oneline = "Registry\tRoot\tKey\tName\tValue\tComponent_\n";

solenv/bin/modules/installer/windows/msishortcutproperty.pm

+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+#
+
+package installer::windows::msishortcutproperty;
+
+use installer::exiter;
+use installer::files;
+use installer::globals;
+use installer::windows::idtglobal;
+
+##############################################################
+# Returning identifier for msishortcutproperty table.
+##############################################################
+
+sub get_msishortcutproperty_identifier
+{
+    my ($msishortcutproperty) = @_;
+
+    my $identifier = $msishortcutproperty->{'gid'};
+
+    return $identifier;
+}
+
+##############################################################
+# Returning shortcut for msishortcutproperty table.
+##############################################################
+
+sub get_msishorcutproperty_shortcut
+{
+    my ($msishortcutproperty, $filesref) = @_;
+
+    my $onefile;
+    my $shortcut = "";
+    my $found = 0;
+    my $msishortcutproperty_shortcutid = $msishortcutproperty->{'ShortcutID'};
+
+    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
+    {
+        $onefile = ${$filesref}[$i];
+        my $filegid = $onefile->{'gid'};
+
+        if ( $filegid eq $msishortcutproperty_shortcutid )
+        {
+            $found = 1;
+            last;
+        }
+    }
+
+    if (!($found))
+    {
+        installer::exiter::exit_program("ERROR: Did not find ShortcutID $msishortcutproperty_shortcutid in file collection for shortcut", "get_msishorcutproperty_shortcut");
+    }
+
+    $shortcut = $onefile->{'gid'};
+
+    return $shortcut;
+}
+
+##############################################################
+# Returning the propertykey for msishortcutproperty table.
+##############################################################
+
+sub get_msishortcutproperty_propertykey
+{
+    my ($msishortcutproperty, $onelanguage) = @_;
+
+    my $propertykey = "";
+    if ( $msishortcutproperty->{'PropertyKey'} ) { $propertykey = $msishortcutproperty->{'PropertyKey'}; }
+
+    return $propertykey;
+}
+
+################################################################
+# Returning the propvariantvalue for msishortcutproperty table.
+################################################################
+
+sub get_msishortcutproperty_propvariantvalue
+{
+    my ($msishortcutproperty, $onelanguage) = @_;
+
+    my $propvariantvalue = "";
+    if ( $msishortcutproperty->{'PropVariantValue'} ) { $propvariantvalue = $msishortcutproperty->{'PropVariantValue'}; }
+
+    return $propvariantvalue;
+}
+
+###################################################################
+# Creating the file MsiShortcutProperty.idt dynamically
+# Content:
+# MsiShortcutProperty Shortcut_ PropertyKey PropVariantValue
+###################################################################
+
+sub create_msishortcutproperty_table
+{
+    my ($folderitempropertiesref, $folderitemsref, $basedir) = @_;
+
+    for ( my $m = 0; $m <= $#{$languagesarrayref}; $m++ )
+    {
+        my @msishortcutpropertytable = ();
+
+        installer::windows::idtglobal::write_idt_header(\@msishortcutpropertytable, "msishortcutproperty");
+
+        # The entries defined in scp as FolderItemProperties
+        # These shortcuts will fill the icons table.
+
+        for ( my $j = 0; $j <= $#{$folderitempropertiesref}; $j++ )
+        {
+            my $onelink = ${$folderitempropertiesref}[$j];
+
+            my %msishortcutproperty = ();
+
+            $msishortcutproperty{'MsiShortcutProperty'} = get_msishortcutproperty_identifier($onelink);
+            $msishortcutproperty{'Shortcut_'} = get_msishorcutproperty_shortcut($onelink, $folderitemsref);
+            $msishortcutproperty{'PropertyKey'} = get_msishortcutproperty_propertykey($onelink);
+            $msishortcutproperty{'PropVariantValue'} = get_msishortcutproperty_propvariantvalue($onelink);
+
+            my $oneline = $msishortcutproperty{'MsiShortcutProperty'} . "\t" . $msishortcutproperty{'Shortcut_'} . "\t"
+                        . $msishortcutproperty{'PropertyKey'} . "\t" . $msishortcutproperty{'PropVariantValue'} . "\n";
+
+            push(@msishortcutpropertytable, $oneline);
+        }
+
+        # Saving the file
+
+        my $msishortcutpropertytablename = $basedir . $installer::globals::separator . "MsiShortcutProperty.idt" . "." . $onelanguage;
+        installer::files::save_file($msishortcutpropertytablename ,\@msishortcutpropertytable);
+        my $infoline = "Created idt file: $msishortcutpropertytablename\n";
+        push(@installer::globals::logfileinfo, $infoline);
+    }
+}

solenv/bin/modules/par2script/globals.pm

@@ -34,13 +34,13 @@ BEGIN
 
     @allitems = ("Installation", "ScpAction", "Directory", "File",
                  "Shortcut", "Unixlink", "Module", "Profile", "ProfileItem",
-                 "Folder", "FolderItem", "RegistryItem", "WindowsCustomAction",
-                 "MergeModule");
+                 "Folder", "FolderItem", "FolderItemProperty", "RegistryItem",
+                 "WindowsCustomAction", "MergeModule");
 
     @items_assigned_at_modules = ("File", "Directory", "Unixlink");
     @items_with_directories = ("File", "Profile", "Shortcut", "Unixlink");
     @items_with_moduleid = ("Profile", "ProfileItem", "FolderItem", "RegistryItem");
-    @items_without_moduleid = ("File", "Directory", "Shortcut", "Unixlink");
+    @items_without_moduleid = ("File", "FolderItemProperty", "Directory", "Shortcut", "Unixlink");
 
     %searchkeys = ("File" => "Files", "Directory" => "Dirs", "Unixlink" => "Unixlinks");
 

solenv/bin/modules/pre2par/globals.pm

@@ -33,8 +33,8 @@ BEGIN
 
     @allitems = ("Installation", "ScpAction", "HelpText", "Directory", "DataCarrier", "StarRegistry", "File",
                  "Shortcut", "Custom", "Unixlink", "Procedure", "Module", "Profile", "ProfileItem",
-                 "Folder", "FolderItem", "RegistryItem", "StarRegistryItem", "WindowsCustomAction",
-                 "MergeModule");
+                 "Folder", "FolderItem", "FolderItemProperty", "RegistryItem", "StarRegistryItem",
+                 "WindowsCustomAction", "MergeModule");
 
     $logging     = 0;
     $logfilename = "logfile.log";   # the default logfile name for global errors