diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-01-23 15:08:36 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-01-23 20:31:57 +0100 |
commit | c97d74b5f0608866bad3f7ae943811bdff4f7986 (patch) | |
tree | 1c7ec8a333f138e4d90a3c6a497d35f1da64c975 /scp2 | |
parent | refactor concept for c++ based subsequenttests (diff) | |
download | core-c97d74b5f0608866bad3f7ae943811bdff4f7986.tar.gz core-c97d74b5f0608866bad3f7ae943811bdff4f7986.zip |
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')
-rw-r--r-- | scp2/source/base/makefile.mk | 6 | ||||
-rw-r--r-- | scp2/source/base/postgresqlsdbc.scp | 75 | ||||
-rw-r--r-- | scp2/source/base/postgresqlsdbc.ulf | 36 | ||||
-rw-r--r-- | scp2/source/extensions/directory_extensions.scp | 11 | ||||
-rw-r--r-- | scp2/source/extensions/file_extensions.scp | 13 | ||||
-rw-r--r-- | scp2/source/extensions/module_extensions.scp | 15 | ||||
-rw-r--r-- | scp2/source/extensions/module_extensions.ulf | 6 | ||||
-rw-r--r-- | scp2/util/makefile.mk | 3 |
8 files changed, 117 insertions, 48 deletions
diff --git a/scp2/source/base/makefile.mk b/scp2/source/base/makefile.mk index 3386005f5138..e3f3b1a72188 100644 --- a/scp2/source/base/makefile.mk +++ b/scp2/source/base/makefile.mk @@ -43,7 +43,8 @@ SCP_PRODUCT_TYPE=osl PARFILES= \ module_base.par \ - file_base.par + file_base.par \ + postgresqlsdbc.par .IF "$(GUI)"=="WNT" PARFILES += \ @@ -54,7 +55,8 @@ PARFILES += \ ULFFILES= \ module_base.ulf \ registryitem_base.ulf \ - folderitem_base.ulf + folderitem_base.ulf \ + postgresqlsdbc.ulf # --- File --------------------------------------------------------- .INCLUDE : target.mk diff --git a/scp2/source/base/postgresqlsdbc.scp b/scp2/source/base/postgresqlsdbc.scp new file mode 100644 index 000000000000..90e8631662b4 --- /dev/null +++ b/scp2/source/base/postgresqlsdbc.scp @@ -0,0 +1,75 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License or as specified alternatively below. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * Major Contributor(s): + * [ Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com> + * (initial developer) ] + * + * All Rights Reserved. + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +#include "macros.inc" + +#if defined WITH_POSTGRESQL_SDBC + +Module gid_Module_Optional_PostgresqlSdbc + PackageInfo = "packinfo_office.txt"; + MOD_NAME_DESC(MODULE_OPTIONAL_POSTGRESQLSDBC); + ParentID = gid_Module_Prg_Base_Bin; + Files = (gid_File_Lib_PostgresqlSdbc, + gid_File_Lib_PostgresqlSdbcImpl, + gid_File_PostgresqlSdbc_Ini, + gid_File_PostgresqlSdbc_Rdb, + gid_File_PostgresqlSdbc_Xcd); + Minimal = NO; + Default = YES; + Styles = (); +End + +SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_PostgresqlSdbc, postgresql-sdbc.uno) + +SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_PostgresqlSdbcImpl, postgresql-sdbc-impl.uno) + +File gid_File_PostgresqlSdbc_Ini + TXT_FILE_BODY; + Dir = gid_Brand_Dir_Program; + Name = "postgresql-sdbc.ini"; + Styles = (PACKED); +End + +File gid_File_PostgresqlSdbc_Rdb + TXT_FILE_BODY; + Dir = gid_Brand_Dir_Program_Services; + Name = "postgresql-sdbc.rdb"; + Styles = (PACKED); +End + +File gid_File_PostgresqlSdbc_Xcd + TXT_FILE_BODY; + Dir = gid_Brand_Dir_Share_Registry; + Name = "postgresqlsdbc.xcd"; + Styles = (PACKED); +End + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scp2/source/base/postgresqlsdbc.ulf b/scp2/source/base/postgresqlsdbc.ulf new file mode 100644 index 000000000000..a96606262a2b --- /dev/null +++ b/scp2/source/base/postgresqlsdbc.ulf @@ -0,0 +1,36 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License or as specified alternatively below. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * Major Contributor(s): + * [ Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com> + * (initial developer) ] + * + * All Rights Reserved. + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_POSTGRESQLSDBC] +en-US = "PostgreSQL Connector" + +[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_POSTGRESQLSDBC] +en-US = "PostgreSQL Connector" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ 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" diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk index 9af2c3a66a4c..74b45a8d8519 100644 --- a/scp2/util/makefile.mk +++ b/scp2/util/makefile.mk @@ -84,7 +84,8 @@ SCP1FILES = installation_ooo.par \ module_python_mailmerge.par \ file_python.par \ profileitem_python.par \ - module_accessories.par + module_accessories.par \ + postgresqlsdbc.par .IF "$(WITH_EXTRA_GALLERY)" != "" SCP1FILES += \ module_gallery_accessories.par \ |