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

scp2: move draw executables to AutoInstall

Browse source 
Change-Id: I6f7642a39fb72cfed85638cdd9015bf0aced8a20
This commit is contained in:
Michael Stahl 2014-10-28 23:51:16 +01:00
parent 5ceb8b7be6
commit 557f58d1cf
6 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Repository.mk
View file

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

1
scp2/AutoInstall.mk
View file

@ -18,6 +18,7 @@ $(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_brand,,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,crashrep,,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,draw_brand,,LIBO_EXECUTABLE))
$(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,gnome,LIBO_LIB_FILE))

4
scp2/InstallModule_draw.mk
View file

@ -9,6 +9,10 @@
$(eval $(call gb_InstallModule_InstallModule,scp2/draw))
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/draw,\
draw_brand \
))
$(eval $(call gb_InstallModule_define_if_set,scp2/draw,\
ENABLE_MACOSX_SANDBOX \
))

4
scp2/source/draw/file_draw.scp
View file

@ -33,11 +33,11 @@ File gid_File_Help_Sdraw_Zip
End
#endif
#ifndef MACOSX
#if !defined MACOSX && !defined WNT
File gid_File_Exe_Sdraw
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Name = EXENAME(sdraw);
Name = "sdraw";
Styles = (PACKED);
End
#endif

4
scp2/source/draw/folderitem_draw.scp
View file

@ -23,8 +23,8 @@ FolderItem gid_Folderitem_Sdraw
Name = "%PRODUCTNAME Draw";
ModuleID = gid_Module_Prg_Draw_Bin;
FolderID = gid_Folder_Staroffice51;
FileID = gid_File_Exe_Sdraw;
IconFile = gid_File_Exe_Sdraw;
FileID = auto_draw_brand_exe_sdraw;
IconFile = auto_draw_brand_exe_sdraw;
IconID = 0;
WkDir = gid_Brand_Dir_Program;
Parameter = "";

4
scp2/source/draw/module_draw.scp
View file

@ -18,6 +18,8 @@
#include "macros.inc"
#include "AutoInstall/draw_brand"
Module gid_Module_Prg_Draw
MOD_NAME_DESC ( MODULE_PRG_DRAW );
ParentID = gid_Module_Prg;
@ -48,7 +50,7 @@ Module gid_Module_Brand_Prg_Draw
Minimal = YES;
Default = YES;
Styles = (HIDDEN_ROOT);
Files = (gid_File_Exe_Sdraw);
Files = (auto_draw_brand_ALL,gid_File_Exe_Sdraw);
End
Module gid_Module_Langpack_Draw_Template