[Libreoffice-commits] core.git: scp2/source setup_native/Package_misc.mk setup_native/source solenv/bin
scp2/source/base/folderitem_base.scp |3 scp2/source/calc/folderitem_calc.scp |3 scp2/source/draw/folderitem_draw.scp |3 scp2/source/impress/folderitem_impress.scp|3 scp2/source/math/folderitem_math.scp |3 scp2/source/ooo/common_brand.scp | 11 +++ scp2/source/ooo/folderitem_ooo.scp| 13 ++-- scp2/source/writer/folderitem_writer.scp |3 setup_native/Package_misc.mk |1 setup_native/source/win32/desktophelper.txt |1 solenv/bin/modules/installer.pm |2 solenv/bin/modules/installer/globals.pm |2 solenv/bin/modules/installer/setupscript.pm | 31 + solenv/bin/modules/installer/windows/component.pm |7 ++ solenv/bin/modules/installer/windows/file.pm | 24 +++ solenv/bin/modules/installer/windows/property.pm |3 solenv/bin/modules/installer/windows/registry.pm | 38 solenv/bin/modules/installer/windows/shortcut.pm | 69 +- solenv/bin/modules/installer/worker.pm| 28 solenv/bin/modules/t/installer-setupscript.t |1 20 files changed, 233 insertions(+), 16 deletions(-) New commits: commit 7d97ec9a3eba9ceacbea631a56185e40b62fdec7 Author: Andras Timar andras.ti...@collabora.com Date: Fri Oct 25 06:38:06 2013 -0700 fdo#65102 respect user's choice not to install desktop icon Using advertised shortcuts -- inspired by Intel AppUp Centre's requirement -- was not a good idea after all. I revert this, and I also revert the commit that actually disabled it in default Windows builds. This reverts commit aa2450cb51cfc3805c7a596b6b89d70bb133821e. This reverts commit b40012bd6d0b5387005253f1d3f03929ce4d1ac6. diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp index 2da4321..51a940b 100644 --- a/scp2/source/base/folderitem_base.scp +++ b/scp2/source/base/folderitem_base.scp @@ -21,13 +21,14 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Sbase Name = %PRODUCTNAME Base; -ModuleID = gid_Module_Brand_Prg_Base; +ModuleID = gid_Module_Prg_Base_Bin; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Sbase; IconFile = gid_File_Exe_Sbase; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ; +Styles = (NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE); End diff --git a/scp2/source/calc/folderitem_calc.scp b/scp2/source/calc/folderitem_calc.scp index 83dd82b..05db68f 100644 --- a/scp2/source/calc/folderitem_calc.scp +++ b/scp2/source/calc/folderitem_calc.scp @@ -21,13 +21,14 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Scalc Name = %PRODUCTNAME Calc; -ModuleID = gid_Module_Brand_Prg_Calc; +ModuleID = gid_Module_Prg_Calc_Bin; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Scalc; IconFile = gid_File_Exe_Scalc; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ; +Styles = (NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC); End diff --git a/scp2/source/draw/folderitem_draw.scp b/scp2/source/draw/folderitem_draw.scp index ba59ea7..f692707 100644 --- a/scp2/source/draw/folderitem_draw.scp +++ b/scp2/source/draw/folderitem_draw.scp @@ -21,13 +21,14 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Sdraw Name = %PRODUCTNAME Draw; -ModuleID = gid_Module_Brand_Prg_Draw; +ModuleID = gid_Module_Prg_Draw_Bin; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Sdraw; IconFile = gid_File_Exe_Sdraw; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ; +Styles = (NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW); End diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp index fb5c136..44adbbe 100644 --- a/scp2/source/impress/folderitem_impress.scp +++ b/scp2/source/impress/folderitem_impress.scp @@ -21,13 +21,14 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Simpress Name = %PRODUCTNAME Impress; -ModuleID = gid_Module_Brand_Prg_Impress; +ModuleID = gid_Module_Prg_Impress_Bin; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Simpress; IconFile = gid_File_Exe_Simpress; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ; +Styles = (NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS); End diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp index 127773f..fb8bbcd 100644 --- a/scp2/source/math/folderitem_math.scp +++ b/scp2/source/math/folderitem_math.scp @@ -21,13 +21,14 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Smath Name = %PRODUCTNAME Math; -ModuleID = gid_Module_Brand_Prg_Math; +ModuleID = gid_Module_Prg_Math_Bin;
[Libreoffice-commits] core.git: scp2/source setup_native/Package_misc.mk setup_native/source solenv/bin
scp2/source/base/folderitem_base.scp |3 scp2/source/calc/folderitem_calc.scp |3 scp2/source/draw/folderitem_draw.scp |3 scp2/source/impress/folderitem_impress.scp|3 scp2/source/math/folderitem_math.scp |3 scp2/source/ooo/common_brand.scp | 11 --- scp2/source/ooo/folderitem_ooo.scp| 13 +--- scp2/source/writer/folderitem_writer.scp |3 setup_native/Package_misc.mk |3 setup_native/source/win32/desktophelper.txt |1 setup_native/source/win32/get_retval.bat |3 setup_native/source/win32/patchlist.txt |2 solenv/bin/modules/installer.pm |2 solenv/bin/modules/installer/globals.pm |2 solenv/bin/modules/installer/setupscript.pm | 31 - solenv/bin/modules/installer/windows/component.pm |7 -- solenv/bin/modules/installer/windows/file.pm | 24 --- solenv/bin/modules/installer/windows/registry.pm | 38 solenv/bin/modules/installer/windows/shortcut.pm | 69 -- solenv/bin/modules/t/installer-setupscript.t |1 20 files changed, 13 insertions(+), 212 deletions(-) New commits: commit aa2450cb51cfc3805c7a596b6b89d70bb133821e Author: Andras Timar ati...@suse.com Date: Mon Feb 11 14:26:34 2013 +0100 advertised shotrcuts The main goal of this patch was to simplify things. The LibreOffice version that goes to Intel AppUp use advertsied shourtcuts, because it is what Intel AppUp Center requires. We can reduce complexity a bit, if we use advertised shortcuts in normal builds, too. Change-Id: Ia35a753c83cb592137232428ab897a640e7ccc1f diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp index c21c2a8..aefc128 100644 --- a/scp2/source/base/folderitem_base.scp +++ b/scp2/source/base/folderitem_base.scp @@ -30,14 +30,13 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Sbase Name = %PRODUCTNAME Base; -ModuleID = gid_Module_Prg_Base_Bin; +ModuleID = gid_Module_Brand_Prg_Base; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Sbase; IconFile = gid_File_Exe_Sbase; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ; -Styles = (NOWEB, NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE); End #endif diff --git a/scp2/source/calc/folderitem_calc.scp b/scp2/source/calc/folderitem_calc.scp index f77258a..7fd14ef 100644 --- a/scp2/source/calc/folderitem_calc.scp +++ b/scp2/source/calc/folderitem_calc.scp @@ -30,14 +30,13 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Scalc Name = %PRODUCTNAME Calc; -ModuleID = gid_Module_Prg_Calc_Bin; +ModuleID = gid_Module_Brand_Prg_Calc; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Scalc; IconFile = gid_File_Exe_Scalc; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ; -Styles = (NOWEB, NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC); End #endif diff --git a/scp2/source/draw/folderitem_draw.scp b/scp2/source/draw/folderitem_draw.scp index 1fe1de2..76ce6c4 100644 --- a/scp2/source/draw/folderitem_draw.scp +++ b/scp2/source/draw/folderitem_draw.scp @@ -30,14 +30,13 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Sdraw Name = %PRODUCTNAME Draw; -ModuleID = gid_Module_Prg_Draw_Bin; +ModuleID = gid_Module_Brand_Prg_Draw; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Sdraw; IconFile = gid_File_Exe_Sdraw; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ; -Styles = (NOWEB, NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW); End #endif diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp index 31c56ad..0f87196 100644 --- a/scp2/source/impress/folderitem_impress.scp +++ b/scp2/source/impress/folderitem_impress.scp @@ -30,14 +30,13 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Simpress Name = %PRODUCTNAME Impress; -ModuleID = gid_Module_Prg_Impress_Bin; +ModuleID = gid_Module_Brand_Prg_Impress; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Simpress; IconFile = gid_File_Exe_Simpress; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ; -Styles = (NOWEB, NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS); End #endif diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp index 3ad3b07..e12e799 100644 --- a/scp2/source/math/folderitem_math.scp +++ b/scp2/source/math/folderitem_math.scp @@ -30,14 +30,13 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Smath Name = %PRODUCTNAME Math; -ModuleID = gid_Module_Prg_Math_Bin; +ModuleID = gid_Module_Brand_Prg_Math; FolderID =
