Permalink
Browse files

Remove the ArcSDE C API driver from MapServer (#5067)

  • Loading branch information...
hobu authored and tbonfort committed Feb 11, 2015
1 parent 3a3c9d7 commit 936518bac4b6ed449d9883c36f1fd01ebfd70c2d
Showing with 2,019 additions and 4,336 deletions.
  1. +1 −55 CMakeLists.txt
  2. +1 −1 COMMITERS
  3. +0 −43 cmake/FindSDE.cmake
  4. +1 −1 maperror.h
  5. +2 −2 mapfile.c
  6. +0 −3 maplayer.c
  7. +2,004 −2,007 maplexer.c
  8. +0 −1 maplexer.l
  9. +2 −2 mapogcfilter.c
  10. +1 −1 mapogcsld.c
  11. +1 −1 mapogcsos.c
  12. +1 −1 mappool.c
  13. +0 −2 mapscript/php/php_mapscript.c
  14. +0 −2,180 mapsde.c
  15. +1 −2 mapserver.h
  16. +1 −1 mapshape.c
  17. +3 −33 nmake.opt
View
@@ -132,8 +132,6 @@ option(WITH_POINT_Z_M "include Z and M coordinates in point structure (advanced,
option(WITH_ORACLESPATIAL "include oracle spatial database input support" OFF)
option(WITH_ORACLE_PLUGIN "include oracle spatial database input support as plugin" OFF)
option(WITH_MSSQL2008 "include mssql 2008 database input support as plugin" OFF)
-option(WITH_SDE_PLUGIN "include ArcSDE support as a plugin (must specify SDE_INCLUDE_DIR and SDE_LIBRARY_DIR)." OFF)
-option(WITH_SDE "include ArcSDE support. Add -DSDE_VERSION=91 to use 9.1 arcSDE version" OFF)
option(WITH_EXEMPI "include xmp output metadata support" OFF)
option(WITH_XMLMAPFILE "include native xml mapfile support (requires libxslt/libexslt)" OFF)
option(WITH_V8 "include javacript v8 scripting" OFF)
@@ -244,7 +242,7 @@ mapraster.c mapuvraster.c mapdummyrenderer.c mapobject.c maprasterquery.c
mapwcs.c maperror.c mapogcfilter.c mapregex.c mapwcs11.c mapfile.c
mapogcfiltercommon.c maprendering.c mapwcs20.c mapogcsld.c
mapresample.c mapwfs.c mapgdal.c mapogcsos.c mapscale.c mapwfs11.c mapwfs20.c
-mapgeomtransform.c mapogroutput.c mapsde.c mapwfslayer.c mapagg.cpp mapkml.cpp
+mapgeomtransform.c mapogroutput.c mapwfslayer.c mapagg.cpp mapkml.cpp
mapgeomutil.cpp mapkmlrenderer.cpp fontcache.c textlayout.c maputfgrid.cpp
mapogr.cpp mapcontour.c mapsmoothing.c mapv8.cpp ${REGEX_SOURCES} kerneldensity.c)
@@ -467,42 +465,6 @@ if(WITH_MSSQL2008)
endif(ODBC_FOUND)
endif(WITH_MSSQL2008)
-if(WITH_SDE_PLUGIN)
- if(WITH_SDE)
- MESSAGE( SEND_ERROR "WITH_SDE and WITH_SDE_PLUGIN cannot be used simultaneously")
- endif(WITH_SDE)
- if(SDE_INCLUDE_DIR AND SDE_LIBRARY_DIR)
- include_directories(${SDE_INCLUDE_DIR})
- if(SDE_VERSION STREQUAL "91")
- add_library(msplugin_sde_91 MODULE mapsde.c mapthread.c)
- target_link_libraries(msplugin_sde_91 ${SDE_LIBRARY_DIR}/pe91.lib ${SDE_LIBRARY_DIR}/sg91.lib ${SDE_LIBRARY_DIR}/sde91.lib ${MAPSERVER_LIBMAPSERVER})
- set_target_properties(msplugin_sde_91 PROPERTIES COMPILE_FLAGS "-DUSE_SDE -DUSE_SDE_PLUGIN")
- else(SDE_VERSION STREQUAL "91")
- add_library(msplugin_sde_92 MODULE mapsde.c mapthread.c)
- target_link_libraries(msplugin_sde_92 ${SDE_LIBRARY_DIR}/pe.lib ${SDE_LIBRARY_DIR}/sg.lib ${SDE_LIBRARY_DIR}/sde.lib ${MAPSERVER_LIBMAPSERVER})
- set_target_properties(msplugin_sde_92 PROPERTIES COMPILE_FLAGS "-DUSE_SDE -DUSE_SDE_PLUGIN")
- endif(SDE_VERSION STREQUAL "91")
- set(USE_SDE_PLUGIN 1)
- else(SDE_INCLUDE_DIR AND SDE_LIBRARY_DIR)
- MESSAGE( SEND_ERROR "Must specify SDE_INCLUDE_DIR and SDE_LIBRARY_DIR for WITH_SDE_PLUGIN")
- endif(SDE_INCLUDE_DIR AND SDE_LIBRARY_DIR)
-endif(WITH_SDE_PLUGIN)
-
-if(WITH_SDE)
- find_package(SDE)
- if(SDE_FOUND)
- include_directories(${SDE_INCLUDE_DIRS})
- ms_link_libraries(${SDE_LIBRARIES})
- set (USE_SDE 1)
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- set(SDE64 1)
- endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
- else(SDE_FOUND)
- MESSAGE(WARNING "Could not find (all?) sde files. Try setting -DSDE_DIR=/path/to/sde and/or -DSDE_VERSION=91|92|100")
- report_optional_not_found(SDE)
- endif(SDE_FOUND)
-endif(WITH_SDE)
-
if(WITH_FCGI)
find_package(FCGI)
if(FCGI_FOUND)
@@ -907,15 +869,6 @@ endif(USE_ORACLESPATIAL OR USE_ORACLE_PLUGIN)
if(USE_MSSQL2008)
status_optional_component("MSSQL 2008 (Built as plugin)" "${USE_MSSQL2008}" "${ODBC_LIBRARY}")
endif(USE_MSSQL2008)
-if(USE_SDE_PLUGIN)
- if(SDE_VERSION STREQUAL "91")
- status_optional_component("SDE 9.1 (Built as plugin)" "${USE_SDE_PLUGIN}" "${SDE_LIBRARY_DIR}")
- else(SDE_VERSION STREQUAL "91")
- status_optional_component("SDE 9.2 (Built as plugin)" "${USE_SDE_PLUGIN}" "${SDE_LIBRARY_DIR}")
- endif(SDE_VERSION STREQUAL "91")
-else(USE_SDE_PLUGIN)
- status_optional_component("SDE" "${USE_SDE}" "${SDE_LIBRARIES}")
-endif(USE_SDE_PLUGIN)
status_optional_component("Exempi XMP" "${USE_EXEMPI}" "${LIBEXEMPI_LIBRARY}")
message(STATUS " * Optional features")
status_optional_feature("WMS SERVER" "${USE_WMS_SVR}")
@@ -962,13 +915,6 @@ if(USE_MSSQL2008)
INSTALL(TARGETS msplugin_mssql2008 DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif(USE_MSSQL2008)
-if(USE_SDE91)
- INSTALL(TARGETS msplugin_sde91 DESTINATION ${CMAKE_INSTALL_LIBDIR})
-endif(USE_SDE91)
-
-if(USE_SDE92)
- INSTALL(TARGETS msplugin_sde92 DESTINATION ${CMAKE_INSTALL_LIBDIR})
-endif(USE_SDE92)
INSTALL(TARGETS sortshp shptree shptreevis msencrypt legend scalebar tile4ms shptreetst shp2img mapserv RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
View
@@ -7,7 +7,7 @@ sean Sean Gillies sgillies at frii.com SWIG Ma
assefa Assefa Yewondwossen assefay at gmail.com OGC Web Services, PHP MapScript
julien Julien-Samuel Lacroix jlacroix at dmsolutions.ca OGC Web Services
warmerdam Frank Warmerdam warmerdam at pobox.com Raster, outputFormatObj,
-hobu Howard Butler hobu.inc at gmail.com mapsde.c
+hobu Howard Butler howard at hobu.co docs
pramsey Paul Ramsey pramsey at cleverelephant.ca mappostgis.c, maptile.c
jerryp Jerry Pisk jerry.pisk at gmail.com
ned Ned Harding nharding at extendthereach.com
View
@@ -1,43 +0,0 @@
-# Find ESRI SDE
-#
-# If it's found it sets SDE_FOUND to TRUE
-# and following variables are set:
-# SDE_INCLUDE_DIRS
-# SDE_LIBRARIES
-
-
-FIND_PATH(SDE_INCLUDE_DIR sdetype.h
- PATHS ${SDE_DIR}
- PATH_SUFFIXES include arcsde/coverages/include
-)
-
-if(SDE_VERSION STREQUAL "91")
- FIND_LIBRARY(SDE_LIBRARY NAMES sde91 PATHS ${SDE_DIR} PATH_SUFFIXES lib lib64)
- FIND_LIBRARY(PE_LIBRARY NAMES pe91 PATHS ${SDE_DIR} PATH_SUFFIXES lib lib64)
- FIND_LIBRARY(SG_LIBRARY NAMES sg91 PATHS ${SDE_DIR} PATH_SUFFIXES lib lib64)
-else(SDE_VERSION STREQUAL "91")
- FIND_LIBRARY(SDE_LIBRARY NAMES sde PATHS ${SDE_DIR} PATH_SUFFIXES lib lib64)
- FIND_LIBRARY(PE_LIBRARY NAMES pe PATHS ${SDE_DIR} PATH_SUFFIXES lib lib64)
- FIND_LIBRARY(SG_LIBRARY NAMES sg PATHS ${SDE_DIR} PATH_SUFFIXES lib lib64)
-endif(SDE_VERSION STREQUAL "91")
-
-FIND_LIBRARY(SDE_DL_LIBRARY NAMES dl)
-FIND_LIBRARY(SDE_SOCKET_LIBRARY NAMES socket)
-FIND_LIBRARY(SDE_PTHREAD_LIBRARY NAMES pthread)
-
-set(SDE_LIBRARIES ${SDE_LIBRARY} ${PE_LIBRARY} ${SG_LIBRARY})
-if(SDE_DL_LIBRARY)
- set(SDE_LIBRARIES ${SDE_LIBRARIES} dl)
-endif(SDE_DL_LIBRARY)
-if(SDE_SOCKET_LIBRARY)
- set(SDE_LIBRARIES ${SDE_LIBRARIES} socket)
-endif(SDE_SOCKET_LIBRARY)
-if(SDE_PTHREAD_LIBRARY)
- set(SDE_LIBRARIES ${SDE_LIBRARIES} pthread)
-endif(SDE_PTHREAD_LIBRARY)
-
-set(SDE_INCLUDE_DIRS ${SDE_INCLUDE_DIR})
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(SDE DEFAULT_MSG SDE_LIBRARIES SDE_INCLUDE_DIRS)
-mark_as_advanced(SDE_LIBRARIES SDE_INCLUDE_DIRS)
View
@@ -58,7 +58,7 @@ extern "C" {
#define MS_NOTFOUND 18 /* empty search results */
#define MS_SHPERR 19
#define MS_PARSEERR 20
-#define MS_SDEERR 21
+#define MS_UNUSEDERR 21
#define MS_OGRERR 22
#define MS_QUERYERR 23
#define MS_WMSERR 24 /* WMS server error */
View
@@ -4259,7 +4259,7 @@ int loadLayer(layerObj *layer, mapObj *map)
}
break;
case(CONNECTIONTYPE):
- if((layer->connectiontype = getSymbol(12, MS_SDE, MS_OGR, MS_POSTGIS, MS_WMS, MS_ORACLESPATIAL, MS_WFS, MS_GRATICULE, MS_PLUGIN, MS_UNION, MS_UVRASTER, MS_CONTOUR, MS_KERNELDENSITY)) == -1) return(-1);
+ if((layer->connectiontype = getSymbol(11, MS_OGR, MS_POSTGIS, MS_WMS, MS_ORACLESPATIAL, MS_WFS, MS_GRATICULE, MS_PLUGIN, MS_UNION, MS_UVRASTER, MS_CONTOUR, MS_KERNELDENSITY)) == -1) return(-1);
break;
case(DATA):
if(getString(&layer->data) == MS_FAILURE) return(-1); /* getString() cleans up previously allocated string */
@@ -4706,7 +4706,7 @@ static void writeLayer(FILE *stream, int indent, layerObj *layer)
writeString(stream, indent, "CLASSITEM", NULL, layer->classitem);
writeCluster(stream, indent, &(layer->cluster));
writeString(stream, indent, "CONNECTION", NULL, layer->connection);
- writeKeyword(stream, indent, "CONNECTIONTYPE", layer->connectiontype, 11, MS_SDE, "SDE", MS_OGR, "OGR", MS_POSTGIS, "POSTGIS", MS_WMS, "WMS", MS_ORACLESPATIAL, "ORACLESPATIAL", MS_WFS, "WFS", MS_PLUGIN, "PLUGIN", MS_UNION, "UNION", MS_UVRASTER, "UVRASTER", MS_CONTOUR, "CONTOUR", MS_KERNELDENSITY, "KERNELDENSITY");
+ writeKeyword(stream, indent, "CONNECTIONTYPE", layer->connectiontype, 10, MS_OGR, "OGR", MS_POSTGIS, "POSTGIS", MS_WMS, "WMS", MS_ORACLESPATIAL, "ORACLESPATIAL", MS_WFS, "WFS", MS_PLUGIN, "PLUGIN", MS_UNION, "UNION", MS_UVRASTER, "UVRASTER", MS_CONTOUR, "CONTOUR", MS_KERNELDENSITY, "KERNELDENSITY");
writeString(stream, indent, "DATA", NULL, layer->data);
writeNumber(stream, indent, "DEBUG", 0, layer->debug); /* is this right? see loadLayer() */
writeString(stream, indent, "ENCODING", NULL, layer->encoding);
View
@@ -1875,9 +1875,6 @@ int msInitializeVirtualTable(layerObj *layer)
case(MS_TILED_SHAPEFILE):
return(msTiledSHPLayerInitializeVirtualTable(layer));
break;
- case(MS_SDE):
- return(msSDELayerInitializeVirtualTable(layer));
- break;
case(MS_OGR):
return(msOGRLayerInitializeVirtualTable(layer));
break;
Oops, something went wrong.

0 comments on commit 936518b

Please sign in to comment.