mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

installer: let's make missing FileID a fatal error

Browse Source 
... 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
This commit is contained in:
Michael Stahl
2014-10-28 23:03:56 +01:00
parent 368729decb
commit f3616065a7
4 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Repository.mk
View File

@@ -85,6 +85,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \
soffice_bin \ soffice_bin \
$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \ $(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \
$(if $(filter WNT,$(OS)), \ $(if $(filter WNT,$(OS)), \
soffice \
unoinfo \ unoinfo \
unopkg \ unopkg \
unopkg_com \ unopkg_com \
@@ -139,7 +140,6 @@ $(eval $(call gb_Helper_register_executables,OOO, \
sdraw \ sdraw \
senddoc \ senddoc \
simpress \ simpress \
soffice \
smath \ smath \
sweb \ sweb \
swriter \ swriter \

10
scp2/source/ooo/common_brand.scp
View File

@@ -504,16 +504,6 @@ End
#endif #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 #ifdef WNT
File gid_Brand_File_Desktophelper_Txt File gid_Brand_File_Desktophelper_Txt
TXT_FILE_BODY; TXT_FILE_BODY;

8
scp2/source/ooo/folderitem_ooo.scp
View File

@@ -26,8 +26,8 @@ FolderItem gid_Folderitem_LibreOffice
#else #else
FolderID = gid_Folder_Staroffice51; FolderID = gid_Folder_Staroffice51;
#endif #endif
FileID = gid_Brand_File_Bin_Soffice; FileID = auto_brand_exe_soffice;
IconFile = gid_Brand_File_Bin_Soffice; IconFile = auto_brand_exe_soffice;
IconID = 0; IconID = 0;
WkDir = gid_Brand_Dir_Program; WkDir = gid_Brand_Dir_Program;
Parameter = ""; Parameter = "";
@@ -49,8 +49,8 @@ FolderItem gid_Folderitem_Soffice_Desktop
#endif #endif
ModuleID = gid_Module_Root; ModuleID = gid_Module_Root;
FolderID = PREDEFINED_DESKTOP; FolderID = PREDEFINED_DESKTOP;
FileID = gid_Brand_File_Bin_Soffice; FileID = auto_brand_exe_soffice;
IconFile = gid_Brand_File_Bin_Soffice; IconFile = auto_brand_exe_soffice;
IconID = 0; IconID = 0;
ComponentIDFile = "gid_Brand_File_Desktophelper_Txt"; ComponentIDFile = "gid_Brand_File_Desktophelper_Txt";
WkDir = gid_Brand_Dir_Program; WkDir = gid_Brand_Dir_Program;

5
solenv/bin/modules/installer/setupscript.pm
View File

@@ -418,9 +418,10 @@ sub prepare_non_advertised_files
if ( $folderitem->{'ComponentIDFile'} ) { $fileid = $folderitem->{'ComponentIDFile'}; } if ( $folderitem->{'ComponentIDFile'} ) { $fileid = $folderitem->{'ComponentIDFile'}; }
my $onefile = installer::worker::find_file_by_id($filesref, $fileid); 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; } 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");
}
} }
} }
} }