diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-10-28 23:42:05 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-10-29 11:37:50 +0100 |
| commit | 5ceb8b7be6102d2f2b8228afc8c17d9e0d380be2 (patch) | |
| tree | 16898a5a85e4ac997beff496e525d338ae279523 /scp2 | |
| parent | ee80cbb7122714d05b1b939e8276138517f9ece5 (diff) | |
scp2: move calc executables to AutoInstall
Change-Id: Id69718fbdf429a4e9196e8b9c5c8a71171ad0847
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/AutoInstall.mk | 1 | ||||
| -rw-r--r-- | scp2/InstallModule_calc.mk | 5 | ||||
| -rw-r--r-- | scp2/source/calc/file_calc.scp | 4 | ||||
| -rw-r--r-- | scp2/source/calc/folderitem_calc.scp | 4 | ||||
| -rw-r--r-- | scp2/source/calc/module_calc.scp | 3 |
5 files changed, 11 insertions, 6 deletions
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index f47603224c2d..eaa1666caa3a 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -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,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,extensions_bsh,,,LIBO_JAR_FILE)) $(eval $(call gb_AutoInstall_add_module,extensions_rhino,,,LIBO_JAR_FILE)) diff --git a/scp2/InstallModule_calc.mk b/scp2/InstallModule_calc.mk index 1aff01cbc127..0484fac3174e 100644 --- a/scp2/InstallModule_calc.mk +++ b/scp2/InstallModule_calc.mk @@ -9,7 +9,10 @@ $(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,\ ENABLE_MACOSX_SANDBOX \ diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp index c3d2ed2b4ab6..390fd0e3f65f 100644 --- a/scp2/source/calc/file_calc.scp +++ b/scp2/source/calc/file_calc.scp @@ -41,11 +41,11 @@ File gid_File_Help_Scalc_Zip End #endif -#ifndef MACOSX +#if !defined MACOSX && !defined WNT File gid_File_Exe_Scalc BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; - Name = EXENAME(scalc); + Name = "scalc"; Styles = (PACKED); End #endif diff --git a/scp2/source/calc/folderitem_calc.scp b/scp2/source/calc/folderitem_calc.scp index 05db68fded8e..a41ade695864 100644 --- a/scp2/source/calc/folderitem_calc.scp +++ b/scp2/source/calc/folderitem_calc.scp @@ -23,8 +23,8 @@ FolderItem gid_Folderitem_Scalc Name = "%PRODUCTNAME Calc"; ModuleID = gid_Module_Prg_Calc_Bin; FolderID = gid_Folder_Staroffice51; - FileID = gid_File_Exe_Scalc; - IconFile = gid_File_Exe_Scalc; + FileID = auto_calc_brand_exe_scalc; + IconFile = auto_calc_brand_exe_scalc; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ""; diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp index 020af524d81a..47d64265929d 100644 --- a/scp2/source/calc/module_calc.scp +++ b/scp2/source/calc/module_calc.scp @@ -19,6 +19,7 @@ #include "macros.inc" #include "AutoInstall/calc" +#include "AutoInstall/calc_brand" Module gid_Module_Prg_Calc MOD_NAME_DESC ( MODULE_PRG_CALC ); @@ -59,7 +60,7 @@ Module gid_Module_Brand_Prg_Calc Minimal = YES; Default = YES; Styles = (HIDDEN_ROOT); - Files = (gid_File_Exe_Scalc); + Files = (auto_calc_brand_ALL,gid_File_Exe_Scalc); End Module gid_Module_Langpack_Calc_Template |