From 51bd0803b34565ee68d8be62e4076cb581785b06 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Wed, 30 Nov 2011 12:39:32 +0000 Subject: rename, and bundle the postgresql driver if it is enabled --- configure.in | 2 ++ connectivity/prj/d.lst | 1 + connectivity/source/drivers/postgresql/makefile.mk | 2 +- scp2/source/extensions/directory_extensions.scp | 11 +++++++++++ scp2/source/extensions/file_extensions.scp | 13 +++++++++++++ scp2/source/extensions/module_extensions.scp | 15 +++++++++++++++ scp2/source/extensions/module_extensions.ulf | 6 ++++++ setup_native/source/packinfo/packinfo_extensions.txt | 15 +++++++++++++++ 8 files changed, 64 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 4c11c9149a7a..cafaf1fc6c90 100644 --- a/configure.in +++ b/configure.in @@ -5396,6 +5396,8 @@ dnl Check for PostgreSQL stuff dnl =================================================================== if test "x$enable_ext_postgresql_sdbc" = "xyes"; then + SCPDEFS="$SCPDEFS -DWITH_EXTENSION_POSTGRESQL" + AC_MSG_CHECKING([for PostgreSQL prerequisites]) if test "$with_system_postgresql" = "yes"; then AC_MSG_RESULT([external PostgreSQL]) diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst index 1387da4a4ec5..55099c2add78 100644 --- a/connectivity/prj/d.lst +++ b/connectivity/prj/d.lst @@ -7,6 +7,7 @@ ..\%__SRC%\lib\*.a %_DEST%\lib\*.a ..\%__SRC%\slb\connectivity*.* %_DEST%\lib\connectivity*.* ..\%__SRC%\lib\idbt* %_DEST%\lib\idbt* +..\%__SRC%\lib\*.oxt %_DEST%\bin\*.oxt ..\source\cpool\*.xml %_DEST%\xml\*.xml ..\source\drivers\adabas\*.xml %_DEST%\xml\*.xml ..\source\drivers\ado\*.xml %_DEST%\xml\*.xml diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk index f0f184e27324..4f2dffd8296b 100644 --- a/connectivity/source/drivers/postgresql/makefile.mk +++ b/connectivity/source/drivers/postgresql/makefile.mk @@ -159,7 +159,7 @@ SHL2VERSIONMAP=$(SOLARENV)$/src$/reg-component.map SLOFILES= $(LIB1OBJFILES) $(LIB2OBJFILES) -DRIVERNAME=postgresql-sdbc-$(PQ_SDBC_VERSION).oxt +DRIVERNAME=postgresql-sdbc.oxt ALLTAR : $(DLLDEST)$/$(DRIVERNAME) .ENDIF # BUILD_POSTGRESQL_SDBC diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp index a7295a700685..69e5dc50fbbb 100644 --- a/scp2/source/extensions/directory_extensions.scp +++ b/scp2/source/extensions/directory_extensions.scp @@ -223,6 +223,17 @@ 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 7c34871f0763..48f9e4219117 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -256,6 +256,19 @@ 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 e3514bc4e94c..91e6baf34f7f 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -295,6 +295,21 @@ 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 4a7dbc51bb9e..3c7cb80898d7 100644 --- a/scp2/source/extensions/module_extensions.ulf +++ b/scp2/source/extensions/module_extensions.ulf @@ -141,6 +141,12 @@ 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/setup_native/source/packinfo/packinfo_extensions.txt b/setup_native/source/packinfo/packinfo_extensions.txt index 225ab4938b7c..5d5c790c7458 100644 --- a/setup_native/source/packinfo/packinfo_extensions.txt +++ b/setup_native/source/packinfo/packinfo_extensions.txt @@ -272,6 +272,21 @@ destpath = "/opt" packageversion = "%PACKAGEVERSION" End +Start +module = "gid_Module_Optional_Extensions_PostgreSQL" +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-postgresql-sdbc" +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")" +packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-postgresql-sdbc" +requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07" +linuxpatchrequires = "" +copyright = "2008 by Sun Mcrosystems, Inc." +solariscopyright = "solariscopyrightfile" +vendor = "The Document Foundation" +description = "PostgreSQL Connector extension for %PRODUCTNAME %PRODUCTVERSION" +destpath = "/opt" +packageversion = "%PACKAGEVERSION" +End + Start module = "gid_Module_Optional_Extensions_MySQLConnector" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-mysql-connector" -- cgit