SQLite Provider issue

[sqlite-provider.patch]
Index: Src/sqlite/CMakeLists.txt

===================================================================

--- Src/sqlite/CMakeLists.txt	(revisão 4737)

+++ Src/sqlite/CMakeLists.txt	(cópia de trabalho)

@@ -1,92 +1,99 @@

-

-add_library (sqlite-fdo 

-alter.c

-analyze.c

-attach.c

-auth.c

-bitvec.c

-btmutex.c

-btree.c

-build.c

-backup.c

-callback.c

-complete.c

-date.c

-delete.c

-expr.c

-fault.c

-fts3.c

-fts3_expr.c

-fts3_hash.c

-fts3_icu.c

-fts3_porter.c

-fts3_tokenizer1.c

-fts3_tokenizer.c

-func.c

-global.c

-hash.c

-insert.c

-journal.c

-legacy.c

-loadext.c

-main.c

-malloc.c

-mem0.c

-mem1.c

-mem2.c

-mem3.c

-mem5.c

-memjournal.c

-mutex.c

-mutex_noop.c

-mutex_unix.c

-notify.c

-opcodes.c

-os.c

-os_unix.c

-pager.c

-parse.c

-pcache.c

-pcache1.c

-pragma.c

-prepare.c

-printf.c

-random.c

-resolve.c

-rowset.c

-rtree.c

-select.c

-shell.c

-status.c

-table.c

-tokenize.c

-trigger.c

-update.c

-utf.c

-util.c

-vacuum.c

-vdbeapi.c

-vdbeaux.c

-vdbeblob.c

-vdbe.c

-vdbemem.c

-vtab.c

-walker.c

-where.c

+set( sqlitefdo3_SRCS 

+	alter.c

+	analyze.c

+	attach.c

+	auth.c

+	bitvec.c

+	btmutex.c

+	btree.c

+	build.c

+	backup.c

+	callback.c

+	complete.c

+	date.c

+	delete.c

+	expr.c

+	fault.c

+	fts3.c

+	fts3_expr.c

+	fts3_hash.c

+	fts3_icu.c

+	fts3_porter.c

+	fts3_tokenizer1.c

+	fts3_tokenizer.c

+	func.c

+	global.c

+	hash.c

+	insert.c

+	journal.c

+	legacy.c

+	loadext.c

+	main.c

+	malloc.c

+	mem0.c

+	mem1.c

+	mem2.c

+	mem3.c

+	mem5.c

+	memjournal.c

+	mutex.c

+	mutex_noop.c

+	mutex_unix.c

+	notify.c

+	opcodes.c

+	os.c

+	os_unix.c

+	pager.c

+	parse.c

+	pcache.c

+	pcache1.c

+	pragma.c

+	prepare.c

+	printf.c

+	random.c

+	resolve.c

+	rowset.c

+	rtree.c

+	select.c

+	shell.c

+	status.c

+	table.c

+	tokenize.c

+	trigger.c

+	update.c

+	utf.c

+	util.c

+	vacuum.c

+	vdbeapi.c

+	vdbeaux.c

+	vdbeblob.c

+	vdbe.c

+	vdbemem.c

+	vtab.c

+	walker.c

+	where.c

 ) 

 

-ADD_DEFINITIONS(-DSQLITE_ENABLE_COLUMN_METADATA 

-                -DSQLITE_OMIT_TRACE 

-                -DSQLITE_OMIT_EXPLAIN 

-                -DSQLITE_OMIT_PROGRESS_CALLBACK 

-                -DSQLITE_OMIT_AUTHORIZATION 

-                -DSQLITE_OMIT_UTF16 

-                -DSQLITE_OMIT_SHARED_CACHEXXX 

-                -DSQLITE_THREADSAFE=2 

-                -DSQLITE_ENABLE_RTREE 

-                -DSQLITE_CORE

-                )

+add_definitions( 

+	-DSQLITE_ENABLE_COLUMN_METADATA 

+	-DSQLITE_OMIT_TRACE 

+	-DSQLITE_OMIT_EXPLAIN 

+	-DSQLITE_OMIT_PROGRESS_CALLBACK 

+	-DSQLITE_OMIT_AUTHORIZATION

+	-DSQLITE_OMIT_UTF16 

+	-DSQLITE_OMIT_SHARED_CACHEXXX 

+	-DSQLITE_THREADSAFE=2 

+	-DSQLITE_ENABLE_RTREE 

+	-DSQLITE_CORE

+	)

 

-SET_TARGET_PROPERTIES( sqlite-fdo PROPERTIES COMPILE_FLAGS -fPIC)

+add_library ( sqlitefdo3 SHARED  ${sqlitefdo3_SRCS} )

 

+set_target_properties( sqlitefdo3 PROPERTIES VERSION 3 SOVERSION 6 )

 

+target_link_libraries( sqlitefdo3

+	pthread

+	dl

+	)

+

+

Index: Src/SpatialIndex/SpatialIndex.cpp

===================================================================

--- Src/SpatialIndex/SpatialIndex.cpp	(revisão 4737)

+++ Src/SpatialIndex/SpatialIndex.cpp	(cópia de trabalho)

@@ -19,6 +19,7 @@

 #include "stdafx.h"

 #include "SltGeomUtils.h"

 #include "SpatialIndex.h"

+#include <cstring>

 

 #ifndef _MSC_VER

 

Index: Src/SpatialIndex/SltGeomUtils.cpp

===================================================================

--- Src/SpatialIndex/SltGeomUtils.cpp	(revisão 4737)

+++ Src/SpatialIndex/SltGeomUtils.cpp	(cópia de trabalho)

@@ -20,6 +20,11 @@

 #include "SltGeomUtils.h"

 #include <math.h>

 

+#ifdef LINUX

+	#include <algorithm>

+	using namespace std;

+#endif // LINUX

+

 //For reference, duplicated from ogr_geometry.h

 ///**

 // * List of well known binary geometry types.  These are used within the BLOBs

Index: Src/SpatialIndex/CMakeLists.txt

===================================================================

--- Src/SpatialIndex/CMakeLists.txt	(revisão 0)

+++ Src/SpatialIndex/CMakeLists.txt	(revisão 0)

@@ -0,0 +1,23 @@

+include_directories(

+	${CMAKE_CURRENT_SOURCE_DIR}

+	${UNMANAGED_INCLUDE_DIR}

+	${UTILITIES_COMMON_INCLUDE_DIR}

+	)

+

+set( SQLiteSpatialIndex_SRCS

+	SltGeomUtils.cpp  

+	stdafx.cpp

+)

+

+if( UNIX )

+	set( SQLiteSpatialIndex_Platform_SRCS SpatialIndex.cpp )

+else( UNIX )

+	set( SQLiteSpatialIndex_Platform_SRCS DiskSpatialIndex.cpp MappedFile.cpp )

+endif( UNIX )

+

+

+add_library( SQLiteSpatialIndex STATIC 

+	${SQLiteSpatialIndex_SRCS}  

+	${SQLiteSpatialIndex_Platform_SRCS}

+	)

+


Mudanças de propriedades em: Src/SpatialIndex/CMakeLists.txt

___________________________________________________________________

Added: svn:eol-style

   + native


Index: Src/Provider/StringUtil.h

===================================================================

--- Src/Provider/StringUtil.h	(revisão 4737)

+++ Src/Provider/StringUtil.h	(cópia de trabalho)

@@ -212,7 +212,7 @@

 

     inline char* Data()

     {

-        return _buf ? _buf : "";

+        return _buf ? _buf : (char*)"";

     }

 

 private:

Index: Src/Provider/CMakeLists.txt

===================================================================

--- Src/Provider/CMakeLists.txt	(revisão 4737)

+++ Src/Provider/CMakeLists.txt	(cópia de trabalho)

@@ -1,28 +1,30 @@

+include_directories (

+	${CMAKE_CURRENT_SOURCE_DIR}

+	${UNMANAGED_INCLUDE_DIR}

+	${UTILITIES_COMMON_INCLUDE_DIR}

+	${UTILITIES_EXPRESSION_INCLUDE_DIR}

+	) 

 

-include_directories (${SQLiteProvider_SOURCE_DIR}/sqlite-3.6.2 

-                     ${SQLiteProvider_SOURCE_DIR}/SpatialIndex

-                     ${SQLiteProvider_SOURCE_DIR}/../../Fdo/Unmanaged/Inc

-                     ${SQLiteProvider_SOURCE_DIR}/../../Utilities/Common/Inc

-                     ) 

-link_directories (${SQLiteProvider_BINARY_DIR}/sqlite-3.6.2 

-                  ${SQLiteProvider_SOURCE_DIR}/../../Fdo/Unmanaged/Src/.libs

-                  ${SQLiteProvider_SOURCE_DIR}/../../Utilities/Common/.libs

-                 ) 

+set( SQLiteProvider_SRCS

+	SltConversionUtils.cpp

+	slt.cpp

+	SltExprExtensions.cpp

+	SltMetadata.cpp

+	SltProvider.cpp

+	SltQueryTranslator.cpp

+	SltReader.cpp

+	SltSpatialContextReader.cpp

+	) 

 

-add_library (SQLiteProvider SHARED

-SltConversionUtils.cpp

-slt.cpp

-SltExprExtensions.cpp

-SltMetadata.cpp

-SltProvider.cpp

-SltQueryTranslator.cpp

-SltReader.cpp

-SltSpatialContextReader.cpp

-) 

+add_library (SQLiteProvider SHARED ${SQLiteProvider_SRCS} )

 

-target_link_libraries (SQLiteProvider SpatialIndex sqlite-fdo ProvidersCommon FDO ) 

+target_link_libraries ( SQLiteProvider 

+	SQLiteSpatialIndex 

+	sqlitefdo3

+	ProvidersCommon 

+	FDO 

+	) 

 

-INSTALL (TARGETS SQLiteProvider

-         RUNTIME DESTINATION /usr/local/fdo-3.5.0/lib

-         LIBRARY DESTINATION /usr/local/fdo-3.5.0/lib

-         )

+set_target_properties( SQLiteProvider PROPERTIES VERSION ${FDO_VERSION} SOVERSION ${FDO_VERSION_MAJOR} )

+

+install( TARGETS SQLiteProvider DESTINATION ${LIB_INSTALL_DIR} )

Index: Src/CMakeLists.txt

===================================================================

--- Src/CMakeLists.txt	(revisão 0)

+++ Src/CMakeLists.txt	(revisão 0)

@@ -0,0 +1,10 @@

+include_directories( 

+	${CMAKE_CURRENT_SOURCE_DIR}/Inc 

+	${CMAKE_CURRENT_SOURCE_DIR}/SpatialIndex

+	${CMAKE_CURRENT_SOURCE_DIR}/sqlite )

+

+# Provider uses a special modified version of sqlite

+add_subdirectory( sqlite )

+add_subdirectory( SpatialIndex )

+add_subdirectory( Provider )

+


Mudanças de propriedades em: Src/CMakeLists.txt

___________________________________________________________________

Added: svn:eol-style

   + native


Index: CMakeLists.txt

===================================================================

--- CMakeLists.txt	(revisão 4734)

+++ CMakeLists.txt	(cópia de trabalho)

@@ -1,9 +1,10 @@

+project(fdosqlite)

 

-cmake_minimum_required (VERSION 2.6)

-project (SQLiteProvider)

+# Make CPack available to easy generate binary packages

+include(CPack)

 

-add_subdirectory (sqlite) 

-add_subdirectory (SpatialIndex)

-add_subdirectory (Provider)

+if( NOT FDO_CORE_BUILD )

+	find_package( FDO REQUIRED )

+endif( NOT FDO_CORE_BUILD )

 

-

+add_subdirectory( Src )



SQLite Provider issue

SQLite Provider issue

RE: SQLite Provider issue

Re: SQLite Provider issue

RE: SQLite Provider issue

RE: SQLite Provider issue

RE: SQLite Provider issue

RE: SQLite Provider issue

RE: SQLite Provider issue

Re: SQLite Provider issue

RE: SQLite Provider issue

RE: SQLite Provider issue

Re: SQLite Provider issue

RE: SQLite Provider issue

Re: SQLite Provider issue

RE: SQLite Provider issue

RE: SQLite Provider issue

RE: SQLite Provider issue

Re: SQLite Provider issue

RE: SQLite Provider issue