summaryrefslogtreecommitdiff
path: root/scp2/source/extensions
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-01-23 15:08:36 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-01-23 20:31:57 +0100
commitc97d74b5f0608866bad3f7ae943811bdff4f7986 (patch)
tree1c7ec8a333f138e4d90a3c6a497d35f1da64c975 /scp2/source/extensions
parent95780ec73990f96dc16fc677c895d00fa1360008 (diff)
fdo#45090: Changed postgresql-sdbc from bundled oxt to proper optional part.
Replaced --enable-ext-postgresql-sdbc with --disable-postgresql-sdbc. Renamed postgresql-sdbc.uno{.ini,rc} to consistent postgresql-sdbc.ini (which made the code a little easier). Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch> (cherry picked from commit 3a7ae48b6f610899200ae2800706533f7c4c9f80) Conflicts: configure.in connectivity/source/drivers/postgresql/makefile.mk
Diffstat (limited to 'scp2/source/extensions')
-rw-r--r--scp2/source/extensions/directory_extensions.scp11
-rw-r--r--scp2/source/extensions/file_extensions.scp13
-rw-r--r--scp2/source/extensions/module_extensions.scp15
-rw-r--r--scp2/source/extensions/module_extensions.ulf6
4 files changed, 0 insertions, 45 deletions
diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp
index c17ac8c53d5b..ca2d2c1c6d79 100644
--- a/scp2/source/extensions/directory_extensions.scp
+++ b/scp2/source/extensions/directory_extensions.scp
@@ -209,17 +209,6 @@ End
#endif
-/* ** PostgreSQL Connector ** */
-
-#ifdef WITH_EXTENSION_POSTGRESQL
-
-Directory gid_Brand_Dir_Share_Extensions_PostgreSQL
- ParentID = gid_Brand_Dir_Share_Extensions;
- DosName = "postgresql-sdbc";
-End
-
-#endif
-
/* ** MySQL Connector ** */
#ifdef WITH_EXTENSION_MYSQLC
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index 439006a50a4b..725329553327 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -241,19 +241,6 @@ End
#endif
-/* ** PostgreSQL Connector ** */
-
-#ifdef WITH_EXTENSION_POSTGRESQL
-
-File gid_File_Oxt_PostgreSQL
- TXT_FILE_BODY;
- Styles = (PACKED, ARCHIVE);
- Dir = gid_Brand_Dir_Share_Extensions_PostgreSQL;
- Name = "postgresql-sdbc.oxt";
-End
-
-#endif
-
/* ** MySQL Connector ** */
#ifdef WITH_EXTENSION_MYSQLC
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
index 329a499f11e2..01d773c017e4 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -282,21 +282,6 @@ Module gid_Module_Optional_Extensions_LanguageTool
End
#endif
-/* ** PostgreSQL Connector ** */
-
-#ifdef WITH_EXTENSION_POSTGRESQL
-Module gid_Module_Optional_Extensions_PostgreSQL
- PackageInfo = "packinfo_extensions.txt";
- MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_POSTGRESQL);
- ParentID = gid_Module_Optional_Extensions;
- Files = (
- gid_File_Oxt_PostgreSQL );
- Minimal = NO;
- Default = YES;
- Styles = ( );
-End
-#endif
-
/* ** MySQL Connector ** */
#ifdef WITH_EXTENSION_MYSQLC
diff --git a/scp2/source/extensions/module_extensions.ulf b/scp2/source/extensions/module_extensions.ulf
index d6108b09525e..40d0a0aa176c 100644
--- a/scp2/source/extensions/module_extensions.ulf
+++ b/scp2/source/extensions/module_extensions.ulf
@@ -135,12 +135,6 @@ en-US = "MySQL Connector"
[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MYSQLC]
en-US = "MySQL Connector"
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_POSTGRESQL]
-en-US = "PostgreSQL Connector"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_POSTGRESQL]
-en-US = "PostgreSQL Connector"
-
[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER]
en-US = "Metaweblog Support"