diff options
author | Michael Stahl <mstahl@redhat.com> | 2014-10-28 23:35:21 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-10-29 11:37:49 +0100 |
commit | ee80cbb7122714d05b1b939e8276138517f9ece5 (patch) | |
tree | d89bf11fb65ac1b519d4d5ace56b298d8209258b /scp2/source/base | |
parent | f3616065a72656a11a75d7f5dae363050b03daed (diff) |
scp2: move base executables to AutoInstall
Change-Id: I772bbfc05d4f8fd38df7a75d3b0982c843be2524
Diffstat (limited to 'scp2/source/base')
-rw-r--r-- | scp2/source/base/file_base.scp | 13 | ||||
-rw-r--r-- | scp2/source/base/folderitem_base.scp | 4 | ||||
-rw-r--r-- | scp2/source/base/module_base.scp | 3 |
3 files changed, 6 insertions, 14 deletions
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp index 4aec6bb97c97..d1af15a6ee5d 100644 --- a/scp2/source/base/file_base.scp +++ b/scp2/source/base/file_base.scp @@ -18,20 +18,11 @@ #include "macros.inc" -#ifndef MACOSX +#if !defined MACOSX && !defined WNT File gid_File_Exe_Sbase BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; - Name = EXENAME(sbase); - Styles = (PACKED); -End -#endif - -#if defined WNT -File gid_File_Exe_Odbcconfig - BIN_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = EXENAME(odbcconfig); + Name = "sbase"; Styles = (PACKED); End #endif diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp index 51a940b1d06f..75e1d5d05b01 100644 --- a/scp2/source/base/folderitem_base.scp +++ b/scp2/source/base/folderitem_base.scp @@ -23,8 +23,8 @@ FolderItem gid_Folderitem_Sbase Name = "%PRODUCTNAME Base"; ModuleID = gid_Module_Prg_Base_Bin; FolderID = gid_Folder_Staroffice51; - FileID = gid_File_Exe_Sbase; - IconFile = gid_File_Exe_Sbase; + FileID = auto_base_brand_exe_sbase; + IconFile = auto_base_brand_exe_sbase; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ""; diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp index 7a46408563ce..c593e7e39724 100644 --- a/scp2/source/base/module_base.scp +++ b/scp2/source/base/module_base.scp @@ -19,6 +19,7 @@ #include "macros.inc" #include "AutoInstall/base" +#include "AutoInstall/base_brand" Module gid_Module_Prg_Base MOD_NAME_DESC(MODULE_PRG_BASE); @@ -50,7 +51,7 @@ Module gid_Module_Brand_Prg_Base Minimal = YES; Default = YES; Styles = (HIDDEN_ROOT); - Files = (gid_File_Exe_Sbase); + Files = (auto_base_brand_ALL,gid_File_Exe_Sbase); End Module gid_Module_Langpack_Base_Template |