scp2: move draw executables to AutoInstall
Change-Id: I6f7642a39fb72cfed85638cdd9015bf0aced8a20
This commit is contained in:
parent
5ceb8b7be6
commit
557f58d1cf
6 changed files with 18 additions and 6 deletions
|
@ -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, \
|
$(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
|
||||||
gengal \
|
gengal \
|
||||||
))
|
))
|
||||||
|
@ -152,7 +158,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 \
|
||||||
sdraw \
|
|
||||||
senddoc \
|
senddoc \
|
||||||
simpress \
|
simpress \
|
||||||
smath \
|
smath \
|
||||||
|
|
|
@ -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,LIBO_LIB_FILE))
|
||||||
$(eval $(call gb_AutoInstall_add_module,calc_brand,,LIBO_EXECUTABLE))
|
$(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,draw_brand,,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))
|
||||||
$(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE))
|
$(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE))
|
||||||
|
|
|
@ -9,6 +9,10 @@
|
||||||
|
|
||||||
$(eval $(call gb_InstallModule_InstallModule,scp2/draw))
|
$(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,\
|
$(eval $(call gb_InstallModule_define_if_set,scp2/draw,\
|
||||||
ENABLE_MACOSX_SANDBOX \
|
ENABLE_MACOSX_SANDBOX \
|
||||||
))
|
))
|
||||||
|
|
|
@ -33,11 +33,11 @@ File gid_File_Help_Sdraw_Zip
|
||||||
End
|
End
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef MACOSX
|
#if !defined MACOSX && !defined WNT
|
||||||
File gid_File_Exe_Sdraw
|
File gid_File_Exe_Sdraw
|
||||||
BIN_FILE_BODY;
|
BIN_FILE_BODY;
|
||||||
Dir = gid_Brand_Dir_Program;
|
Dir = gid_Brand_Dir_Program;
|
||||||
Name = EXENAME(sdraw);
|
Name = "sdraw";
|
||||||
Styles = (PACKED);
|
Styles = (PACKED);
|
||||||
End
|
End
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -23,8 +23,8 @@ FolderItem gid_Folderitem_Sdraw
|
||||||
Name = "%PRODUCTNAME Draw";
|
Name = "%PRODUCTNAME Draw";
|
||||||
ModuleID = gid_Module_Prg_Draw_Bin;
|
ModuleID = gid_Module_Prg_Draw_Bin;
|
||||||
FolderID = gid_Folder_Staroffice51;
|
FolderID = gid_Folder_Staroffice51;
|
||||||
FileID = gid_File_Exe_Sdraw;
|
FileID = auto_draw_brand_exe_sdraw;
|
||||||
IconFile = gid_File_Exe_Sdraw;
|
IconFile = auto_draw_brand_exe_sdraw;
|
||||||
IconID = 0;
|
IconID = 0;
|
||||||
WkDir = gid_Brand_Dir_Program;
|
WkDir = gid_Brand_Dir_Program;
|
||||||
Parameter = "";
|
Parameter = "";
|
||||||
|
|
|
@ -18,6 +18,8 @@
|
||||||
|
|
||||||
#include "macros.inc"
|
#include "macros.inc"
|
||||||
|
|
||||||
|
#include "AutoInstall/draw_brand"
|
||||||
|
|
||||||
Module gid_Module_Prg_Draw
|
Module gid_Module_Prg_Draw
|
||||||
MOD_NAME_DESC ( MODULE_PRG_DRAW );
|
MOD_NAME_DESC ( MODULE_PRG_DRAW );
|
||||||
ParentID = gid_Module_Prg;
|
ParentID = gid_Module_Prg;
|
||||||
|
@ -48,7 +50,7 @@ Module gid_Module_Brand_Prg_Draw
|
||||||
Minimal = YES;
|
Minimal = YES;
|
||||||
Default = YES;
|
Default = YES;
|
||||||
Styles = (HIDDEN_ROOT);
|
Styles = (HIDDEN_ROOT);
|
||||||
Files = (gid_File_Exe_Sdraw);
|
Files = (auto_draw_brand_ALL,gid_File_Exe_Sdraw);
|
||||||
End
|
End
|
||||||
|
|
||||||
Module gid_Module_Langpack_Draw_Template
|
Module gid_Module_Langpack_Draw_Template
|
||||||
|
|
Loading…
Reference in a new issue