From ee80cbb7122714d05b1b939e8276138517f9ece5 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Tue, 28 Oct 2014 23:35:21 +0100
Subject: scp2: move base executables to AutoInstall

Change-Id: I772bbfc05d4f8fd38df7a75d3b0982c843be2524
---
 Repository.mk                        | 14 ++++++++++++--
 scp2/AutoInstall.mk                  |  3 ++-
 scp2/InstallModule_base.mk           |  1 +
 scp2/source/base/file_base.scp       | 13 ++-----------
 scp2/source/base/folderitem_base.scp |  4 ++--
 scp2/source/base/module_base.scp     |  3 ++-
 6 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index f3e4314093f9..9940f05dddbb 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -92,6 +92,18 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \
 	) \
 ))
 
+$(eval $(call gb_Helper_register_executables_for_install,OOO,base_brand, \
+	$(if $(filter WNT,$(OS)), \
+		sbase \
+	) \
+))
+
+$(eval $(call gb_Helper_register_executables_for_install,OOO,base, \
+	$(if $(filter WNT,$(OS)), \
+		odbcconfig \
+	) \
+))
+
 $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
 	gengal \
 ))
@@ -133,9 +145,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \
 	tiledrendering \
 	$(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), gtktiledviewer) \
 	$(if $(filter WNT,$(OS)), \
-		odbcconfig \
 		quickstart \
-		sbase \
 		scalc \
 		sdraw \
 		senddoc \
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 588df0163df1..f47603224c2d 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -12,7 +12,8 @@ $(eval $(call gb_AutoInstall_AutoInstall))
 $(eval $(call gb_AutoInstall_add_module,activexbinarytable,LIBO_LIB_FILE_BINARYTABLE))
 $(eval $(call gb_AutoInstall_add_module,activex,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,activexwin64,LIBO_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64"))
-$(eval $(call gb_AutoInstall_add_module,base,LIBO_LIB_FILE))
+$(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,crashrep,,LIBO_EXECUTABLE))
diff --git a/scp2/InstallModule_base.mk b/scp2/InstallModule_base.mk
index 805241012474..2efba1843919 100644
--- a/scp2/InstallModule_base.mk
+++ b/scp2/InstallModule_base.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/base))
 
 $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/base,\
 	base \
+	base_brand \
 	postgresqlsdbc \
 ))
 
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
-- 
cgit