scp2: move base executables to AutoInstall

Change-Id: I772bbfc05d4f8fd38df7a75d3b0982c843be2524
This commit is contained in:
Michael Stahl 2014-10-28 23:35:21 +01:00
parent f3616065a7
commit ee80cbb712
6 changed files with 21 additions and 17 deletions

View file

@ -92,6 +92,18 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \
) \
))
$(eval $(call gb_Helper_register_executables_for_install,OOO,base_brand, \
$(if $(filter WNT,$(OS)), \
sbase \
) \
))
$(eval $(call gb_Helper_register_executables_for_install,OOO,base, \
$(if $(filter WNT,$(OS)), \
odbcconfig \
) \
))
$(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
gengal \
))
@ -133,9 +145,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \
tiledrendering \
$(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), gtktiledviewer) \
$(if $(filter WNT,$(OS)), \
odbcconfig \
quickstart \
sbase \
scalc \
sdraw \
senddoc \

View file

@ -12,7 +12,8 @@ $(eval $(call gb_AutoInstall_AutoInstall))
$(eval $(call gb_AutoInstall_add_module,activexbinarytable,LIBO_LIB_FILE_BINARYTABLE))
$(eval $(call gb_AutoInstall_add_module,activex,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,activexwin64,LIBO_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64"))
$(eval $(call gb_AutoInstall_add_module,base,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,base,LIBO_LIB_FILE,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,base_brand,,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,brand,,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,crashrep,,LIBO_EXECUTABLE))

View file

@ -11,6 +11,7 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/base))
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/base,\
base \
base_brand \
postgresqlsdbc \
))

View file

@ -18,20 +18,11 @@
#include "macros.inc"
#ifndef MACOSX
#if !defined MACOSX && !defined WNT
File gid_File_Exe_Sbase
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Name = EXENAME(sbase);
Styles = (PACKED);
End
#endif
#if defined WNT
File gid_File_Exe_Odbcconfig
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Name = EXENAME(odbcconfig);
Name = "sbase";
Styles = (PACKED);
End
#endif

View file

@ -23,8 +23,8 @@ FolderItem gid_Folderitem_Sbase
Name = "%PRODUCTNAME Base";
ModuleID = gid_Module_Prg_Base_Bin;
FolderID = gid_Folder_Staroffice51;
FileID = gid_File_Exe_Sbase;
IconFile = gid_File_Exe_Sbase;
FileID = auto_base_brand_exe_sbase;
IconFile = auto_base_brand_exe_sbase;
IconID = 0;
WkDir = gid_Brand_Dir_Program;
Parameter = "";

View file

@ -19,6 +19,7 @@
#include "macros.inc"
#include "AutoInstall/base"
#include "AutoInstall/base_brand"
Module gid_Module_Prg_Base
MOD_NAME_DESC(MODULE_PRG_BASE);
@ -50,7 +51,7 @@ Module gid_Module_Brand_Prg_Base
Minimal = YES;
Default = YES;
Styles = (HIDDEN_ROOT);
Files = (gid_File_Exe_Sbase);
Files = (auto_base_brand_ALL,gid_File_Exe_Sbase);
End
Module gid_Module_Langpack_Base_Template