From 109d59a297e54d83f5ba8072427ad8c7db529293 Mon Sep 17 00:00:00 2001 From: "Andrzej J.R. Hunt" Date: Sun, 7 Jul 2013 10:51:55 +0100 Subject: Fix firebird installation (windows) + driver compilation fixes. Change-Id: I253a2770c951a984bd50c906b0e84feeb8d105d9 --- connectivity/source/drivers/firebird/FConnection.cxx | 2 +- connectivity/source/drivers/firebird/FPreparedStatement.cxx | 2 +- connectivity/source/drivers/firebird/FResultSet.cxx | 2 +- connectivity/source/drivers/firebird/FResultSet.hxx | 4 ++-- connectivity/source/drivers/firebird/FStatement.cxx | 2 +- firebird/ExternalPackage_firebird.mk | 12 +++++------- firebird/firebird-cygwin-msvc.patch.1 | 12 ------------ scp2/source/firebird/file_firebird.scp | 2 +- 8 files changed, 12 insertions(+), 26 deletions(-) diff --git a/connectivity/source/drivers/firebird/FConnection.cxx b/connectivity/source/drivers/firebird/FConnection.cxx index 0f9b20b1325e..5efd16562a18 100644 --- a/connectivity/source/drivers/firebird/FConnection.cxx +++ b/connectivity/source/drivers/firebird/FConnection.cxx @@ -90,7 +90,7 @@ void SAL_CALL OConnection::release() throw() /* Print the status, the SQLCODE, and exit. * Also, indicate which operation the error occured on. */ -static int pr_error (long* status, char* operation) +static int pr_error(const ISC_STATUS* status, char* operation) { SAL_WARN("connectivity.firebird", "=> OConnection static pr_error()."); diff --git a/connectivity/source/drivers/firebird/FPreparedStatement.cxx b/connectivity/source/drivers/firebird/FPreparedStatement.cxx index fe8b432fdf93..3a285c212159 100644 --- a/connectivity/source/drivers/firebird/FPreparedStatement.cxx +++ b/connectivity/source/drivers/firebird/FPreparedStatement.cxx @@ -63,7 +63,7 @@ IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbcx.firebird.PreparedS * Print the status, the SQLCODE, and exit. * Also, indicate which operation the error occured on. */ -static int pr_error (long* status, char* operation) +static int pr_error (const ISC_STATUS* status, char* operation) { SAL_WARN("connectivity.firebird", "=> OPreparedStatement static pr_error()."); diff --git a/connectivity/source/drivers/firebird/FResultSet.cxx b/connectivity/source/drivers/firebird/FResultSet.cxx index e64019e9da4a..66ac517cb458 100644 --- a/connectivity/source/drivers/firebird/FResultSet.cxx +++ b/connectivity/source/drivers/firebird/FResultSet.cxx @@ -58,7 +58,7 @@ using namespace com::sun::star::util; * Print the status, the SQLCODE, and exit. * Also, indicate which operation the error occured on. */ -static int pr_error (long* status, char* operation) +static int pr_error (const ISC_STATUS* status, char* operation) { SAL_WARN("connectivity.firebird", "=> OResultSet static pr_error()."); diff --git a/connectivity/source/drivers/firebird/FResultSet.hxx b/connectivity/source/drivers/firebird/FResultSet.hxx index 7dbc4c664e19..e1e6fd95cc0b 100644 --- a/connectivity/source/drivers/firebird/FResultSet.hxx +++ b/connectivity/source/drivers/firebird/FResultSet.hxx @@ -114,9 +114,9 @@ namespace connectivity sal_Int32 nHandle ) const; - virtual void checkColumnIndex( sal_Int32 index ) + virtual void SAL_CALL checkColumnIndex( sal_Int32 index ) throw ( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ); - virtual void checkRowIndex( sal_Bool mustBeOnValidRow ); + virtual void SAL_CALL checkRowIndex( sal_Bool mustBeOnValidRow ); // you can't delete objects of this type virtual ~OResultSet(); diff --git a/connectivity/source/drivers/firebird/FStatement.cxx b/connectivity/source/drivers/firebird/FStatement.cxx index a966d9918c96..4b162758f95f 100644 --- a/connectivity/source/drivers/firebird/FStatement.cxx +++ b/connectivity/source/drivers/firebird/FStatement.cxx @@ -64,7 +64,7 @@ using namespace com::sun::star::util; * Print the status, the SQLCODE, and exit. * Also, indicate which operation the error occured on. */ -static int pr_error (long* status, char* operation) +static int pr_error (const ISC_STATUS* status, char* operation) { printf("[\n"); printf("PROBLEM ON \"%s\".\n", operation); diff --git a/firebird/ExternalPackage_firebird.mk b/firebird/ExternalPackage_firebird.mk index 844678a57962..e29ef44a839b 100644 --- a/firebird/ExternalPackage_firebird.mk +++ b/firebird/ExternalPackage_firebird.mk @@ -39,15 +39,13 @@ $(eval $(call gb_ExternalPackage_use_external_project,firebird,firebird)) # gen/firebird/security2.fdb \ # )) -$(eval $(call gb_ExternalPackage_set_outdir,firebird,$(INSTDIR))) - ifeq ($(OS)-$(COM),WNT-MSC) -$(eval $(call gb_ExternalPackage_add_file,firebird,ifbembed.dll,gen/firebird/bin/ifbembed.dll)) -$(eval $(call gb_ExternalPackage_add_file,firebird,ifbembed.lib,gen/firebird/bin/ifbembed.lib)) +$(eval $(call gb_ExternalPackage_add_file,firebird,bin/ifbembed.dll,gen/firebird/bin/ifbembed.dll)) +$(eval $(call gb_ExternalPackage_add_file,firebird,lib/ifbembed.lib,gen/firebird/bin/ifbembed.lib)) else -$(eval $(call gb_ExternalPackage_add_file,firebird,libfbembed.so.2.5.2,gen/firebird/lib/libfbembed.so.2.5.2)) -$(eval $(call gb_ExternalPackage_add_file,firebird,libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5)) -$(eval $(call gb_ExternalPackage_add_file,firebird,libfbembed.so,gen/firebird/lib/libfbembed.so)) +$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so.2.5.2,gen/firebird/lib/libfbembed.so.2.5.2)) +$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5)) +$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so,gen/firebird/lib/libfbembed.so)) endif # vim: set noet sw=4 ts=4: diff --git a/firebird/firebird-cygwin-msvc.patch.1 b/firebird/firebird-cygwin-msvc.patch.1 index 4a2b71401ac6..f723dda0e9b5 100644 --- a/firebird/firebird-cygwin-msvc.patch.1 +++ b/firebird/firebird-cygwin-msvc.patch.1 @@ -531,18 +531,6 @@ unchanged: firebird_super firebird_server: firebird_basic super_targets fbtrace -@@ -201,7 +202,11 @@ - btyacc_binary: $(BTYACC) - - $(BTYACC): -+ifeq ($(PLATFORM),win32) -+ $(MAKE) -f $(ROOT)/extern/btyacc/makefile.dos -+else - $(MAKE) -C $(ROOT)/extern/btyacc -+endif - - #--------------------------------------------------------------------------- - # Phase1: make a gpre_static from scratch so we can parse .e and .epp files @@ -331,8 +336,9 @@ .PHONY: libfbembed inet_server fb_smp_server embed_gfix embed_gbak embed_isql .PHONY: embed_gpre embed_util diff --git a/scp2/source/firebird/file_firebird.scp b/scp2/source/firebird/file_firebird.scp index f1e4bc0b5d14..c5dba52b1488 100644 --- a/scp2/source/firebird/file_firebird.scp +++ b/scp2/source/firebird/file_firebird.scp @@ -22,7 +22,7 @@ File gid_File_Firebird TXT_FILE_BODY; - Dir = gid_Brand_Dir_Program; + Dir = gid_Dir_Brand_Root; Name = "firebird.filelist"; Styles = (FILELIST,USE_INTERNAL_RIGHTS); End -- cgit v1.2.3