strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scp2: move calc executables to AutoInstall

Browse source 
Change-Id: Id69718fbdf429a4e9196e8b9c5c8a71171ad0847
This commit is contained in:
Michael Stahl 2014-10-28 23:42:05 +01:00
parent ee80cbb712
commit 5ceb8b7be6
6 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Repository.mk
View file

@ -104,6 +104,12 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,base, \
) \ ) \
)) ))
$(eval $(call gb_Helper_register_executables_for_install,OOO,calc_brand, \
$(if $(filter WNT,$(OS)), \
scalc \
) \
))
$(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \ $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
gengal \ gengal \
)) ))
@ -146,7 +152,6 @@ $(eval $(call gb_Helper_register_executables,OOO, \
$(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), gtktiledviewer) \ $(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), gtktiledviewer) \
$(if $(filter WNT,$(OS)), \ $(if $(filter WNT,$(OS)), \
quickstart \ quickstart \
scalc \
sdraw \ sdraw \
senddoc \ senddoc \
simpress \ simpress \

1
scp2/AutoInstall.mk
View file

@ -16,6 +16,7 @@ $(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,base_brand,,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,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,calc,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,calc_brand,,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,crashrep,,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,crashrep,,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE)) $(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
$(eval $(call gb_AutoInstall_add_module,extensions_rhino,,,LIBO_JAR_FILE)) $(eval $(call gb_AutoInstall_add_module,extensions_rhino,,,LIBO_JAR_FILE))

5
scp2/InstallModule_calc.mk
View file

@ -9,7 +9,10 @@
$(eval $(call gb_InstallModule_InstallModule,scp2/calc)) $(eval $(call gb_InstallModule_InstallModule,scp2/calc))
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/calc,calc)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/calc,\
calc \
calc_brand \
))
$(eval $(call gb_InstallModule_define_if_set,scp2/calc,\ $(eval $(call gb_InstallModule_define_if_set,scp2/calc,\
ENABLE_MACOSX_SANDBOX \ ENABLE_MACOSX_SANDBOX \

4
scp2/source/calc/file_calc.scp
View file

@ -41,11 +41,11 @@ File gid_File_Help_Scalc_Zip
End End
#endif #endif
#ifndef MACOSX #if !defined MACOSX && !defined WNT
File gid_File_Exe_Scalc File gid_File_Exe_Scalc
BIN_FILE_BODY; BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program; Dir = gid_Brand_Dir_Program;
Name = EXENAME(scalc); Name = "scalc";
Styles = (PACKED); Styles = (PACKED);
End End
#endif #endif

4
scp2/source/calc/folderitem_calc.scp
View file

@ -23,8 +23,8 @@ FolderItem gid_Folderitem_Scalc
Name = "%PRODUCTNAME Calc"; Name = "%PRODUCTNAME Calc";
ModuleID = gid_Module_Prg_Calc_Bin; ModuleID = gid_Module_Prg_Calc_Bin;
FolderID = gid_Folder_Staroffice51; FolderID = gid_Folder_Staroffice51;
FileID = gid_File_Exe_Scalc; FileID = auto_calc_brand_exe_scalc;
IconFile = gid_File_Exe_Scalc; IconFile = auto_calc_brand_exe_scalc;
IconID = 0; IconID = 0;
WkDir = gid_Brand_Dir_Program; WkDir = gid_Brand_Dir_Program;
Parameter = ""; Parameter = "";

3
scp2/source/calc/module_calc.scp
View file

@ -19,6 +19,7 @@
#include "macros.inc" #include "macros.inc"
#include "AutoInstall/calc" #include "AutoInstall/calc"
#include "AutoInstall/calc_brand"
Module gid_Module_Prg_Calc Module gid_Module_Prg_Calc
MOD_NAME_DESC ( MODULE_PRG_CALC ); MOD_NAME_DESC ( MODULE_PRG_CALC );
@ -59,7 +60,7 @@ Module gid_Module_Brand_Prg_Calc
Minimal = YES; Minimal = YES;
Default = YES; Default = YES;
Styles = (HIDDEN_ROOT); Styles = (HIDDEN_ROOT);
Files = (gid_File_Exe_Scalc); Files = (auto_calc_brand_ALL,gid_File_Exe_Scalc);
End End
Module gid_Module_Langpack_Calc_Template Module gid_Module_Langpack_Calc_Template