fb-sdbc: installing lib and resources.

Change-Id: I2d7bf2b4308b9e52ebadd0d73f43baf469f506a6

5 files changed, 24 insertions, 63 deletions

diff --git a/scp2/InstallModule_base.mk b/scp2/InstallModule_base.mk
index afa234670f69..d9561421fd45 100644
--- a/scp2/InstallModule_base.mk
+++ b/scp2/InstallModule_base.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/base,\
 $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/base,\
     scp2/source/base/module_base \
     scp2/source/base/postgresqlsdbc \
-    scp2/source/base/firebirdsdbc \
 ))
 
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/source/base/firebirdsdbc.scp b/scp2/source/base/firebirdsdbc.scp
deleted file mode 100644
index 8ef1bdf4bfd7..000000000000
--- a/scp2/source/base/firebirdsdbc.scp
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "macros.inc"
-
-#if defined WITH_FIREBIRD_SDBC
-
-Module gid_Module_Optional_FirebirdSdbc
-    PackageInfo = "packinfo_office.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_FIREBIRDSDBC);
-    ParentID = gid_Module_Prg_Base_Bin;
-    Files = (gid_File_Lib_FirebirdSdbc,
-             gid_File_FirebirdSdbc_Rdb,
-             gid_File_FirebirdSdbc_Xcd);
-    Minimal = NO;
-    Default = YES;
-    Styles = ();
-End
-
-STD_LIB_FILE(gid_File_Lib_FirebirdSdbc, postgresql-sdbc)
-
-File gid_File_FirebirdSdbc_Rdb
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Program_Services;
-    Name = "firebird-sdbc.rdb";
-    Styles = (PACKED);
-End
-
-File gid_File_FirebirdSdbc_Xcd
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Registry;
-    Name = "firebirdsdbc.xcd";
-    Styles = (PACKED);
-End
-
-#endif
diff --git a/scp2/source/base/firebirdsdbc.ulf b/scp2/source/base/firebirdsdbc.ulf
deleted file mode 100644
index 477db352eed3..000000000000
--- a/scp2/source/base/firebirdsdbc.ulf
+++ /dev/null
@@ -1,14 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_FIREBIRDSDBC]
-en-US = "Firebird Connector"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_FIREBIRDSDBC]
-en-US = "Firebird Connector"
diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp
index 4dfd8863b3ba..a56d4e72ece2 100644
--- a/scp2/source/base/module_base.scp
+++ b/scp2/source/base/module_base.scp
@@ -37,9 +37,33 @@ Module gid_Module_Prg_Base_Bin
     Styles = (HIDDEN_ROOT);
     Files = (auto_base_ALL
         gid_File_Share_Registry_Base_Xcd
+/* This should be conditional, but the condition is not working!! */
+/* #if defined ENABLE_FIREBIRD_SDBC */
+        ,gid_File_Lib_FirebirdSdbc
+        ,gid_File_FirebirdSdbc_Rdb
+        ,gid_File_FirebirdSdbc_Xcd
+/* #endif */
     );
 End
 
+/* This could be moved to a std location */
+STD_LIB_FILE(gid_File_Lib_FirebirdSdbc, firebird-sdbc)
+
+File gid_File_FirebirdSdbc_Rdb
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Program_Services;
+    Name = "firebird-sdbc.rdb";
+    Styles = (PACKED);
+End
+
+File gid_File_FirebirdSdbc_Xcd
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name = "firebirdsdbc.xcd";
+    Styles = (PACKED);
+End
+
+
 Module gid_Module_Brand_Prg_Base
     PackageInfo = "packinfo_brand.txt";
     Name = "gid_Module_Brand_Prg_Base";
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index 6982a213858e..4fbad6351d05 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -1200,21 +1200,6 @@ packageversion = "%PACKAGEVERSION"
 End
 
 Start
-module = "gid_Module_Optional_FirebirdSdbc"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-firebird-sdbc"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-base"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-postgresql-sdbc"
-freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-base"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-base"
-copyright = "2012 The Document Foundation"
-solariscopyright = "solariscopyrightfile"
-vendor = "The Document Foundation"
-description = "Firebird Connector driver for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt"
-packageversion = "%PACKAGEVERSION"
-End
-
-Start
 module = "gid_Module_Pdfimport"
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-pdf-import"
 solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"