Repository.mk | 36 +- scp2/source/base/folderitem_base.scp | 6 scp2/source/calc/folderitem_calc.scp | 6 scp2/source/draw/folderitem_draw.scp | 6 scp2/source/impress/folderitem_impress.scp | 6 scp2/source/math/folderitem_math.scp | 6 scp2/source/ooo/file_library_ooo.scp | 133 +++++++++++ scp2/source/ooo/folderitem_ooo.scp | 12 scp2/source/ooo/module_hidden_ooo.scp | 12 scp2/source/writer/folderitem_writer.scp | 6 solenv/bin/modules/installer.pm | 8 solenv/bin/modules/installer/windows/idtglobal.pm | 10 solenv/bin/modules/installer/windows/msishortcutproperty.pm | 145 ++++++++++++ solenv/bin/modules/par2script/globals.pm | 6 solenv/bin/modules/pre2par/globals.pm | 4 15 files changed, 375 insertions(+), 27 deletions(-)
New commits: commit ad0f85eb1e839ca21f0a3511cd88b1a62854e5ae Author: Fridrich Å trba <fridrich.st...@bluewin.ch> Date: Wed Jul 24 14:39:03 2013 +0200 Revert "fdo#60924 autoinstall - gbuild/scp2: still more libs to OOO" This reverts commit b0c43257d9db19ac45a93d8fb1e7648e82517289. diff --git a/Repository.mk b/Repository.mk index 4d17286..95ad515 100644 --- a/Repository.mk +++ b/Repository.mk @@ -274,7 +274,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ icg \ idx \ ime \ - $(if $(filter $(OS)$(COM),WNTMSC),instooofiltmsi) \ ipb \ ipd \ ips \ @@ -307,8 +306,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ pcr \ pdffilter \ $(if $(DISABLE_SCRIPTING),,protocolhandler) \ - $(if $(filter $(OS)$(COM),WNTMSC),qslnkmsi) \ - $(if $(filter $(OS)$(COM),WNTMSC),reg4allmsdoc) \ res \ sax \ sb \ @@ -317,13 +314,10 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ sd \ sdd \ sdfilt \ - $(if $(filter $(OS)$(COM),WNTMSC),sdqsmsi) \ sdui \ - $(if $(filter $(OS)$(COM),WNTMSC),sellangmsi) \ sfx \ simplecanvas \ slideshow \ - $(if $(filter $(OS)$(COM),WNTMSC),sn_tools) \ sot \ $(if $(ENABLE_HEADLESS),,spl) \ $(if $(DISABLE_SCRIPTING),,stringresource) \ @@ -364,24 +358,9 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ xsltfilter \ $(if $(filter $(OS),WNT), \ ado \ - dnd \ - dtrans \ - fps \ - ftransl \ - $(if $(SOLAR_JAVA),java_uno_accessbridge) \ - $(if $(DISABLE_ATL),,oleautobridge \ - inprocserv \ - ) \ - $(if $(HAVE_WINDOWS_SDK),instooofiltmsi \ - qslnkmsi \ - reg4allmsdoc \ - sdqsmsi \ - sellangmsi \ - sn_tools \ - ) \ + $(if $(DISABLE_ATL),,oleautobridge) \ smplmail \ wininetbe1 \ - xmlsec1 \ ) \ $(if $(filter $(OS),MACOSX), \ AppleRemote \ @@ -549,6 +528,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ bluez_bluetooth \ emboleobj \ + java_uno_accessbridge \ libreoffice \ macab1 \ macabdrv1 \ @@ -569,17 +549,28 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ + dnd \ + dtrans \ fop \ + fps \ + ftransl \ + inprocserv \ + instooofiltmsi \ jfregca \ ooofilt \ ooofilt_x64 \ propertyhdl \ propertyhdl_x64 \ + qslnkmsi \ + reg4allmsdoc \ regactivex \ regpatchactivex \ + sdqsmsi \ + sellangmsi \ shlxthdl \ shlxthdl_x64 \ shlxtmsi \ + sn_tools \ so_activex \ so_activex_x64 \ sysdtrans \ @@ -622,6 +613,7 @@ $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \ ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ + xmlsec1 \ xmlsec1-nss \ )) ifneq ($(CROSS_COMPILING),YES) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index a750edc..b0be7e1 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -26,6 +26,15 @@ ************************************************************************/ #include "macros.inc" +#if defined SOLAR_JAVA && defined WNT +File gid_File_Lib_Accessbridge + LIB_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + Name = "java_uno_accessbridge.dll"; +End +#endif + #ifndef SYSTEM_CLUCENE File gid_File_Lib_CLucene LIB_FILE_BODY; @@ -112,11 +121,44 @@ End #endif +#ifdef WNT + +File gid_File_Lib_Dnd + LIB_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + Name = "dnd.dll"; +End + +#endif + +#ifdef WNT + +File gid_File_Lib_Dtrans + LIB_FILE_BODY; + Name = "dtrans.dll"; + Dir = SCP2_OOO_BIN_DIR; + Styles = (PACKED); +End + +#endif + /* fdo#60491 always need emboleobj library on non-WNT platforms */ #if !defined(WNT) || !defined(DISABLE_ATL) SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj) #endif +#if defined(WNT) && !defined(DISABLE_ATL) + +File gid_File_Lib_Inprocserv + LIB_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + Name = "inprocserv.dll"; +End + +#endif + #ifdef UNX #ifdef MACOSX @@ -137,6 +179,17 @@ End #endif // #ifdef UNX +#ifdef WNT + +File gid_File_Lib_Fps + LIB_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + Name = "fps.dll"; +End + +#endif + #if defined UNX && ! defined MACOSX #ifdef ENABLE_TDE File gid_File_Bin_TdeFilePicker @@ -231,6 +284,17 @@ End #endif +#ifdef WNT + +File gid_File_Lib_Ftransl + LIB_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + Name = "ftransl.dll"; +End + +#endif + #ifndef SYSTEM_ICU File gid_File_Lib_Icudata @@ -280,6 +344,17 @@ End #endif +#if defined(WNT) && defined(HAVE_WINDOWS_SDK) + +File gid_File_Lib_sn_tools + LIB_FILE_BODY; + Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY, DONTRENAMEINPATCH); + Dir = SCP2_OOO_BIN_DIR; + Name = "sn_tools.dll"; +End + +#endif + #if defined(WNT) #if defined WITH_MOZAB4WIN @@ -380,8 +455,45 @@ End #endif +#if defined(WNT) && defined(HAVE_WINDOWS_SDK) + +File gid_File_Lib_Reg4allmsdoc + LIB_FILE_BODY; + Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); + Dir = SCP2_OOO_BIN_DIR; + Name = "reg4allmsdoc.dll"; +End + +File gid_File_Lib_Qslnkmsi + LIB_FILE_BODY; + Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); + Dir = SCP2_OOO_BIN_DIR; + Name = "qslnkmsi.dll"; +End + + +File gid_File_Lib_Sdqsmsi + LIB_FILE_BODY; + Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); + Dir = SCP2_OOO_BIN_DIR; + Name = "sdqsmsi.dll"; +End + +#endif /* WNT && HAVE_WINDOWS_SDK */ + STD_LIB_FILE( gid_File_Lib_Oox , oox) +#if defined(WNT) && defined(HAVE_WINDOWS_SDK) + +File gid_File_Lib_Instooofiltmsi + LIB_FILE_BODY; + Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); + Dir = SCP2_OOO_BIN_DIR; + Name = "instooofiltmsi.dll"; +End + +#endif + #if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS) File gid_File_Lib_Spa @@ -499,6 +611,16 @@ End #endif #ifdef WNT +File gid_File_Lib_LibXMLSec_xmlseccore + LIB_FILE_BODY; + #ifdef _gcc3 + Name = "libxmlsec1.dll"; + #else + Name = "libxmlsec.dll"; + #endif + Dir = SCP2_OOO_BIN_DIR; + Styles = (PACKED); +End #ifdef CROSS_COMPILING File gid_File_Lib_LibXMLSec_xmlsecnss @@ -629,3 +751,14 @@ File gid_File_Lib_Rdf #endif End #endif // SYSTEM_REDLAND + +#if defined(WNT) && defined(HAVE_WINDOWS_SDK) + +File gid_File_Lib_sellangmsi + LIB_FILE_BODY; + Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); + Dir = gid_Brand_Dir_Program; + Name = "sellangmsi.dll"; +End + +#endif diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index c0d5c2b..fd1f892 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -109,6 +109,7 @@ Module gid_Module_Root_Files_3 Files = (gid_File_Dat_Root3, gid_File_Jar_Unoil, gid_File_Jar_Hsqldb_Sdbc, + gid_File_Jar_Accessbridge, gid_File_Jar_Officebean, gid_File_Jar_Report, gid_File_Jar_Smoketest, @@ -209,13 +210,24 @@ Module gid_Module_Root_Files_5 gid_Unixlink_File_Lib_Xslt, gid_Unixlink_File_Lib_eXslt, gid_File_Lib_LibXMLSec_xmlsecnss, + gid_File_Lib_LibXMLSec_xmlseccore, gid_File_Lib_LibXMLSec_xmlsecmscrypto, gid_File_Lib_XSec_XmlSec, gid_File_Lib_Cmdmail, gid_File_Lib_I18n, gid_File_Lib_Accessbridge, gid_File_Lib_Dl, + gid_File_Lib_Dnd, + gid_File_Lib_Dtrans, + gid_File_Lib_Inprocserv, + gid_File_Lib_Fps, + gid_File_Lib_Ftransl, + gid_File_Lib_sn_tools, GID_FILE_LIB_WPD, + gid_File_Lib_Reg4allmsdoc, + gid_File_Lib_Qslnkmsi, + gid_File_Lib_Sdqsmsi, + gid_File_Lib_Instooofiltmsi, gid_File_Lib_Cli_Oootypes_Assembly, gid_File_Lib_Policy_Cli_Oootypes_Assembly, gid_File_Lib_Policy_Cli_Oootypes_Config); commit 20696b2a5741fcda3b9cff5fb41da4d2688312c4 Author: Fridrich Å trba <fridrich.st...@bluewin.ch> Date: Tue Jul 23 21:34:06 2013 +0200 WIP: data for the new MsiShortcutProperty installer table Change-Id: If421383abe95738b8247aebc5cf43b1eaa346c39 diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp index 36e6d5a..46901d0 100644 --- a/scp2/source/base/folderitem_base.scp +++ b/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 diff --git a/scp2/source/calc/folderitem_calc.scp b/scp2/source/calc/folderitem_calc.scp index 8d4cd16..67fbaa8 100644 --- a/scp2/source/calc/folderitem_calc.scp +++ b/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 diff --git a/scp2/source/draw/folderitem_draw.scp b/scp2/source/draw/folderitem_draw.scp index 95ea743..e6999b8 100644 --- a/scp2/source/draw/folderitem_draw.scp +++ b/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 diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp index 22deb49..eac86be 100644 --- a/scp2/source/impress/folderitem_impress.scp +++ b/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 diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp index d822434..afab64a 100644 --- a/scp2/source/math/folderitem_math.scp +++ b/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 diff --git a/scp2/source/ooo/folderitem_ooo.scp b/scp2/source/ooo/folderitem_ooo.scp index 6bccaff..3ac0726 100644 --- a/scp2/source/ooo/folderitem_ooo.scp +++ b/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 diff --git a/scp2/source/writer/folderitem_writer.scp b/scp2/source/writer/folderitem_writer.scp index 8efb976..85e764b 100644 --- a/scp2/source/writer/folderitem_writer.scp +++ b/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 diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm index 24030ff..76ba410 100644 --- a/solenv/bin/modules/installer.pm +++ b/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); diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm index dd751f4..d3495c9 100644 --- a/solenv/bin/modules/installer/windows/idtglobal.pm +++ b/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"; diff --git a/solenv/bin/modules/installer/windows/msishortcutproperty.pm b/solenv/bin/modules/installer/windows/msishortcutproperty.pm new file mode 100644 index 0000000..a2afa4f --- /dev/null +++ b/solenv/bin/modules/installer/windows/msishortcutproperty.pm @@ -0,0 +1,145 @@ +# +# 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); + } +} diff --git a/solenv/bin/modules/par2script/globals.pm b/solenv/bin/modules/par2script/globals.pm index 770b6c8..02a3997 100644 --- a/solenv/bin/modules/par2script/globals.pm +++ b/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"); diff --git a/solenv/bin/modules/pre2par/globals.pm b/solenv/bin/modules/pre2par/globals.pm index c69e5b5..08d79b0 100644 --- a/solenv/bin/modules/pre2par/globals.pm +++ b/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
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits