diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-10-28 23:03:56 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-10-29 11:37:49 +0100 |
| commit | f3616065a72656a11a75d7f5dae363050b03daed (patch) | |
| tree | e062070df28986c6778fcff39d88bbe99cb2a61c | |
| parent | 368729decbf368161b0fed3be262c2bad840b6f6 (diff) | |
installer: let's make missing FileID a fatal error
... because the upcoming AutoInstall conversions introduce dependency
from FolderItem to auto-installed executables, and we want to ensure
that that keeps working.
Change-Id: I08d4aeddd28b93f080e201716597315e9a6ec2d6
| -rw-r--r-- | Repository.mk | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 10 | ||||
| -rw-r--r-- | scp2/source/ooo/folderitem_ooo.scp | 8 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/setupscript.pm | 5 |
4 files changed, 8 insertions, 17 deletions
diff --git a/Repository.mk b/Repository.mk index f7f29a67b98a..f3e4314093f9 100644 --- a/Repository.mk +++ b/Repository.mk @@ -85,6 +85,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \ soffice_bin \ $(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \ $(if $(filter WNT,$(OS)), \ + soffice \ unoinfo \ unopkg \ unopkg_com \ @@ -139,7 +140,6 @@ $(eval $(call gb_Helper_register_executables,OOO, \ sdraw \ senddoc \ simpress \ - soffice \ smath \ sweb \ swriter \ diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 314dd87cf3f5..01c072d65f08 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -505,16 +505,6 @@ End #endif #ifdef WNT -// TODO: some FolderItem reference this? -File gid_Brand_File_Bin_Soffice - BIN_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = EXENAME(soffice); - Styles = (PACKED); -End -#endif - -#ifdef WNT File gid_Brand_File_Desktophelper_Txt TXT_FILE_BODY; Styles = (PACKED); diff --git a/scp2/source/ooo/folderitem_ooo.scp b/scp2/source/ooo/folderitem_ooo.scp index ecfc7f234ba4..ff8a371354da 100644 --- a/scp2/source/ooo/folderitem_ooo.scp +++ b/scp2/source/ooo/folderitem_ooo.scp @@ -26,8 +26,8 @@ FolderItem gid_Folderitem_LibreOffice #else FolderID = gid_Folder_Staroffice51; #endif - FileID = gid_Brand_File_Bin_Soffice; - IconFile = gid_Brand_File_Bin_Soffice; + FileID = auto_brand_exe_soffice; + IconFile = auto_brand_exe_soffice; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ""; @@ -49,8 +49,8 @@ FolderItem gid_Folderitem_Soffice_Desktop #endif ModuleID = gid_Module_Root; FolderID = PREDEFINED_DESKTOP; - FileID = gid_Brand_File_Bin_Soffice; - IconFile = gid_Brand_File_Bin_Soffice; + FileID = auto_brand_exe_soffice; + IconFile = auto_brand_exe_soffice; IconID = 0; ComponentIDFile = "gid_Brand_File_Desktophelper_Txt"; WkDir = gid_Brand_Dir_Program; diff --git a/solenv/bin/modules/installer/setupscript.pm b/solenv/bin/modules/installer/setupscript.pm index 9cf5e920fca1..6eefe01f0bd5 100644 --- a/solenv/bin/modules/installer/setupscript.pm +++ b/solenv/bin/modules/installer/setupscript.pm @@ -418,9 +418,10 @@ sub prepare_non_advertised_files if ( $folderitem->{'ComponentIDFile'} ) { $fileid = $folderitem->{'ComponentIDFile'}; } my $onefile = installer::worker::find_file_by_id($filesref, $fileid); - # Attention: If $onefile with "FileID" is not found, this is not always an error. - # FileID can also contain an executable file, for example msiexec.exe. if ( $onefile ne "" ) { $onefile->{'needs_user_registry_key'} = 1; } + else { + installer::exiter::exit_program("ERROR: Did not find FileID $fileid in file collection", "prepare_non_advertised_files"); + } } } } |