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

scp2: move math executables to AutoInstall

Browse source 
Change-Id: I8cb04121c52eb62e837c6a80037f9eabfc573dde
This commit is contained in:
Michael Stahl 2014-10-29 00:02:58 +01:00
parent 3ba20ef5ff
commit 30047f28bf
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

@ -122,6 +122,12 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,impress_brand, \
) \ ) \
)) ))
$(eval $(call gb_Helper_register_executables_for_install,OOO,math_brand, \
$(if $(filter WNT,$(OS)), \
smath \
) \
))
$(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \ $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
gengal \ gengal \
)) ))
@ -165,7 +171,6 @@ $(eval $(call gb_Helper_register_executables,OOO, \
$(if $(filter WNT,$(OS)), \ $(if $(filter WNT,$(OS)), \
quickstart \ quickstart \
senddoc \ senddoc \
smath \
sweb \ sweb \
swriter \ swriter \
) \ ) \

1
scp2/AutoInstall.mk
View file

@ -27,6 +27,7 @@ $(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,impress_brand,,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,impress_brand,,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,math_brand,,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,ogltrans,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,ogltrans,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,,,"ISCHECKFORPRODUCTUPDATES=1")) $(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,,,"ISCHECKFORPRODUCTUPDATES=1"))
$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE)) $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE))

5
scp2/InstallModule_math.mk
View file

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

4
scp2/source/math/file_math.scp
View file

@ -35,11 +35,11 @@ File gid_File_Help_Smath_Zip
End End
#endif #endif
#ifndef MACOSX #if !defined MACOSX && !defined WNT
File gid_File_Exe_Smath File gid_File_Exe_Smath
BIN_FILE_BODY; BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program; Dir = gid_Brand_Dir_Program;
Name = EXENAME(smath); Name = "smath";
Styles = (PACKED); Styles = (PACKED);
End End
#endif #endif

4
scp2/source/math/folderitem_math.scp
View file

@ -23,8 +23,8 @@ FolderItem gid_Folderitem_Smath
Name = "%PRODUCTNAME Math"; Name = "%PRODUCTNAME Math";
ModuleID = gid_Module_Prg_Math_Bin; ModuleID = gid_Module_Prg_Math_Bin;
FolderID = gid_Folder_Staroffice51; FolderID = gid_Folder_Staroffice51;
FileID = gid_File_Exe_Smath; FileID = auto_math_brand_exe_smath;
IconFile = gid_File_Exe_Smath; IconFile = auto_math_brand_exe_smath;
IconID = 0; IconID = 0;
WkDir = gid_Brand_Dir_Program; WkDir = gid_Brand_Dir_Program;
Parameter = ""; Parameter = "";

3
scp2/source/math/module_math.scp
View file

@ -19,6 +19,7 @@
#include "macros.inc" #include "macros.inc"
#include "AutoInstall/math" #include "AutoInstall/math"
#include "AutoInstall/math_brand"
Module gid_Module_Prg_Math Module gid_Module_Prg_Math
MOD_NAME_DESC ( MODULE_PRG_MATH ); MOD_NAME_DESC ( MODULE_PRG_MATH );
@ -51,7 +52,7 @@ Module gid_Module_Brand_Prg_Math
Minimal = YES; Minimal = YES;
Default = YES; Default = YES;
Styles = (HIDDEN_ROOT); Styles = (HIDDEN_ROOT);
Files = (gid_File_Exe_Smath); Files = (auto_math_brand_ALL,gid_File_Exe_Smath);
End End
Module gid_Module_Langpack_Math_Template Module gid_Module_Langpack_Math_Template