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

scp2: move writer executables to AutoInstall

Browse Source 
Change-Id: Ibcfdd7a8c204a1ec90045ad39ef456237ba80a34
This commit is contained in:
Michael Stahl 2014-10-29 00:11:29 +01:00
parent 30047f28bf
commit a77ef6c0e4
6 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Repository.mk
View File

@ -128,6 +128,13 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,math_brand, \
) \ ) \
)) ))
$(eval $(call gb_Helper_register_executables_for_install,OOO,writer_brand, \
$(if $(filter WNT,$(OS)), \
sweb \
swriter \
) \
))
$(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \ $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
gengal \ gengal \
)) ))
@ -171,8 +178,6 @@ $(eval $(call gb_Helper_register_executables,OOO, \
$(if $(filter WNT,$(OS)), \ $(if $(filter WNT,$(OS)), \
quickstart \ quickstart \
senddoc \ senddoc \
sweb \
swriter \
) \ ) \
)) ))

1
scp2/AutoInstall.mk
View File

@ -47,5 +47,6 @@ $(eval $(call gb_AutoInstall_add_module,winexplorerextwin64,SHLXTHDL_LIB_FILE_CO
$(eval $(call gb_AutoInstall_add_module,winexplorerextwin64nt6,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64 >= 600")) $(eval $(call gb_AutoInstall_add_module,winexplorerextwin64nt6,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64 >= 600"))
endif endif
$(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,writer_brand,,LIBO_EXECUTABLE))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

5
scp2/InstallModule_writer.mk
View File

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

13
scp2/source/writer/file_writer.scp
View File

@ -18,20 +18,11 @@
#include "macros.inc" #include "macros.inc"
#ifndef MACOSX #if !defined MACOSX && !defined WNT
File gid_File_Exe_Swriter File gid_File_Exe_Swriter
BIN_FILE_BODY; BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program; Dir = gid_Brand_Dir_Program;
Name = EXENAME(swriter); Name = "swriter";
Styles = (PACKED);
End
#endif
#ifdef WNT
File gid_File_Exe_Sweb
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Name = EXENAME(sweb);
Styles = (PACKED); Styles = (PACKED);
End End
#endif #endif

4
scp2/source/writer/folderitem_writer.scp
View File

@ -23,8 +23,8 @@ FolderItem gid_Folderitem_Swriter
Name = "%PRODUCTNAME Writer"; Name = "%PRODUCTNAME Writer";
ModuleID = gid_Module_Prg_Wrt_Bin; ModuleID = gid_Module_Prg_Wrt_Bin;
FolderID = gid_Folder_Staroffice51; FolderID = gid_Folder_Staroffice51;
FileID = gid_File_Exe_Swriter; FileID = auto_writer_brand_exe_swriter;
IconFile = gid_File_Exe_Swriter; IconFile = auto_writer_brand_exe_swriter;
IconID = 0; IconID = 0;
WkDir = gid_Brand_Dir_Program; WkDir = gid_Brand_Dir_Program;
Parameter = ""; Parameter = "";

3
scp2/source/writer/module_writer.scp
View File

@ -19,6 +19,7 @@
#include "macros.inc" #include "macros.inc"
#include "AutoInstall/writer" #include "AutoInstall/writer"
#include "AutoInstall/writer_brand"
Module gid_Module_Prg_Wrt Module gid_Module_Prg_Wrt
MOD_NAME_DESC(MODULE_PRG_WRT); MOD_NAME_DESC(MODULE_PRG_WRT);
@ -55,7 +56,7 @@ Module gid_Module_Brand_Prg_Wrt
Minimal = YES; Minimal = YES;
Default = YES; Default = YES;
Styles = (HIDDEN_ROOT); Styles = (HIDDEN_ROOT);
Files = (gid_File_Exe_Swriter,gid_File_Exe_Sweb); Files = (auto_writer_brand_ALL,gid_File_Exe_Swriter);
End End
Module gid_Module_Langpack_Writer_Template Module gid_Module_Langpack_Writer_Template