Skip to content

Commit

Permalink
Remove sqlanywhere plugin and provider (implements #10840)
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Jul 8, 2014
1 parent 63a17e5 commit 1691014
Show file tree
Hide file tree
Showing 50 changed files with 5 additions and 10,598 deletions.
4 changes: 0 additions & 4 deletions CMakeLists.txt
Expand Up @@ -683,10 +683,6 @@ IF (APPLE)
COMMAND /bin/ln -fs ../../Plugins/qgis/qgisgrass.framework lib/
WORKING_DIRECTORY "${QGIS_OUTPUT_DIRECTORY}"
)
EXECUTE_PROCESS(
COMMAND /bin/ln -fs ../../Plugins/qgis/qgissqlanyconnection.framework lib/
WORKING_DIRECTORY "${QGIS_OUTPUT_DIRECTORY}"
)
ENDIF (APPLE)

# manual page - makes sense only on unix systems
Expand Down
3 changes: 2 additions & 1 deletion debian/changelog
Expand Up @@ -2,8 +2,9 @@ qgis (2.5.0) UNRELEASED; urgency=medium

* New development version 2.5 after branch of 2.4
* add libqscintilla2-dev as build dependency
* add remove sqlanywhere plugin and provider

-- Jürgen E. Fischer <jef@norbit.de> Tue, 08 Jul 2014 08:04:52 +0200
-- Jürgen E. Fischer <jef@norbit.de> Tue, 08 Jul 2014 08:32:40 +0200

qgis (2.4.0) unstable; urgency=medium

Expand Down
13 changes: 0 additions & 13 deletions debian/control
Expand Up @@ -150,19 +150,6 @@ Description: QGIS - shared Python library
.
This package contains the shared Python library.

Package: libqgissqlanyconnection2.3.0
Architecture: any
Section: libs
Depends:
${shlibs:Depends},
${misc:Depends}
Replaces: libqgis2.3.0
Description: QGIS - shared sqlanywhere connection library
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains the shared sqlanywhere connection library.

Package: libqgis-dev
Architecture: any
Section: libdevel
Expand Down
29 changes: 0 additions & 29 deletions debian/control.in
Expand Up @@ -171,19 +171,6 @@ Description: QGIS - shared Python library
.
This package contains the shared Python library.

Package: libqgissqlanyconnection{QGIS_ABI}
Architecture: any
Section: libs
Depends:
${shlibs:Depends},
${misc:Depends}
Replaces: libqgis{QGIS_ABI}
Description: QGIS - shared sqlanywhere connection library
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains the shared sqlanywhere connection library.

Package: libqgis-dev
Architecture: any
Section: libdevel
Expand All @@ -204,7 +191,6 @@ Depends:
libqgis-networkanalysis{QGIS_ABI} (= ${binary:Version}),
libqgisgrass{QGIS_ABI} (= ${binary:Version}),
libqgispython{QGIS_ABI} (= ${binary:Version}),
libqgissqlanyconnection{QGIS_ABI} (= ${binary:Version}),
libqt4-dev (>=4.6.0),
libsqlite3-dev,
python-qt4 (>=4.1.0),
Expand Down Expand Up @@ -352,21 +338,6 @@ Description: QGIS custom widgets for Qt Designer
.
This package contains a library to use specific QGIS widgets in Qt Designer.

Package: qgis-sqlanywhere
Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends}
Conflicts:
qgis-sqlanywhere1.7.0,
qgis-sqlanywhere1.7.1,
qgis-sqlanywhere1.8.0
Description: QGIS sql anywhere plugin and provider
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains the QGIS sqlanywhere plugin and provider.

Package: qgis-api-doc
Architecture: all
Section: doc
Expand Down
8 changes: 0 additions & 8 deletions debian/copyright
Expand Up @@ -91,10 +91,6 @@ Files: src/plugins/dxf2shp_converter/shapelib-1.2.10/shprewind.c
Copyright: 2002, Frank Warmerdam
License: LGPL-2+

Files: src/providers/sqlanywhere/sqlanyconnection/sacapi/*
Copyright: 2008-2010 iAnywhere Solutions, Inc.
License: Apache-2.0

Files: cmake/PythonCompile.py
Copyright: Simon Edwards <simon@simonzone.com>
License: public-domain
Expand Down Expand Up @@ -687,10 +683,6 @@ License: Apache-2.0
See the License for the specific language governing permissions and
limitations under the License.
.
While not a requirement of the license, if you do modify this file, we
would appreciate hearing about it. Please email
sqlany_interfaces@sybase.com
.
On Debian systems, the complete text of the Apache License version 2
an be found in the `/usr/share/common-licenses/Apache-2.0' file.

Expand Down
1 change: 0 additions & 1 deletion debian/libqgis-dev.install
Expand Up @@ -5,5 +5,4 @@ usr/lib/libqgis_analysis.so
usr/lib/libqgis_networkanalysis.so
usr/lib/libqgisgrass.so
usr/lib/libqgispython.so
usr/lib/libqgissqlanyconnection.so
usr/share/qgis/FindQGIS.cmake
1 change: 0 additions & 1 deletion debian/libqgissqlanyconnection{QGIS_ABI}.install

This file was deleted.

1 change: 0 additions & 1 deletion debian/libqgissqlanyconnection{QGIS_ABI}.lintian-overrides

This file was deleted.

2 changes: 0 additions & 2 deletions debian/qgis-sqlanywhere.install.in

This file was deleted.

1 change: 0 additions & 1 deletion doc/AUTHORS
Expand Up @@ -49,7 +49,6 @@ René-Luc D'Hont <rldhont at gmail dot com>
Etienne Tourigny <etourigny dot dev at gmail dot com>
Larry Shaffer <larrys at dakotacarto dot com>
Victor Olaya <volayaf at gmail dot com>
Dave DeHaan <dave dot dehaan@sap dot com>
Matthias Kuhn <matthias dot kuhn at gmx dot ch>
Salvatore Larosa <lrssvtml at gmail dot com>
Nyall Dawson <nyall dot dawson at gmail dot com>
Expand Down
3 changes: 0 additions & 3 deletions ms-windows/osgeo4w/package.cmd
Expand Up @@ -241,9 +241,7 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%-common/%PACKAGENAME
"apps/%PACKAGENAME%/plugins/ogrprovider.dll" ^
"apps/%PACKAGENAME%/plugins/owsprovider.dll" ^
"apps/%PACKAGENAME%/plugins/postgresprovider.dll" ^
"apps/%PACKAGENAME%/plugins/qgissqlanyconnection.dll" ^
"apps/%PACKAGENAME%/plugins/spatialiteprovider.dll" ^
"apps/%PACKAGENAME%/plugins/sqlanywhereprovider.dll" ^
"apps/%PACKAGENAME%/plugins/wcsprovider.dll" ^
"apps/%PACKAGENAME%/plugins/wfsprovider.dll" ^
"apps/%PACKAGENAME%/plugins/wmsprovider.dll" ^
Expand Down Expand Up @@ -294,7 +292,6 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%/%PACKAGENAME%-%VERS
"apps/%PACKAGENAME%/plugins/roadgraphplugin.dll" ^
"apps/%PACKAGENAME%/plugins/spatialqueryplugin.dll" ^
"apps/%PACKAGENAME%/plugins/spitplugin.dll" ^
"apps/%PACKAGENAME%/plugins/sqlanywhereplugin.dll" ^
"apps/%PACKAGENAME%/plugins/topolplugin.dll" ^
"apps/%PACKAGENAME%/plugins/zonalstatisticsplugin.dll" ^
"apps/%PACKAGENAME%/qgis_help.exe" ^
Expand Down
1 change: 0 additions & 1 deletion ms-windows/plugins.nsh
Expand Up @@ -23,7 +23,6 @@ WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "rasterterrainplugin
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "roadgraphplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "spitplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "spatialqueryplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "sqlanywhereplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "topolplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "zonalstatisticsplugin" "true"

Expand Down
31 changes: 0 additions & 31 deletions resources/context_help/SaNewConnection

This file was deleted.

37 changes: 0 additions & 37 deletions resources/context_help/SaSourceSelect

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/addcopyright.sh
Expand Up @@ -41,7 +41,7 @@ for i in $FILES; do
author=volayaf
;;

src/app/gps/qwtpolar-*|src/app/qtmain_android.cpp|src/core/spatialite/*|src/core/spatialindex/src/*|src/core/gps/qextserialport/*|src/astyle/*|python/pyspatialite/*|src/providers/sqlanywhere/sqlanyconnection/*)
src/app/gps/qwtpolar-*|src/app/qtmain_android.cpp|src/core/spatialite/*|src/core/spatialindex/src/*|src/core/gps/qextserialport/*|src/astyle/*|python/pyspatialite/*)
# Skip third party files
echo $f skipped
continue
Expand Down
2 changes: 1 addition & 1 deletion scripts/astyle.sh
Expand Up @@ -60,7 +60,7 @@ $ARTISTIC_STYLE_OPTIONS \

for f in "$@"; do
case "$f" in
src/app/gps/qwtpolar-*|src/core/spatialite/*|src/core/spatialindex/src/*|src/core/gps/qextserialport/*|src/plugins/grass/qtermwidget/*|src/astyle/*|python/ext-libs/*|src/providers/sqlanywhere/sqlanyconnection/*|src/providers/spatialite/qspatialite/*|src/plugins/dxf2shp_converter/dxflib/src/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*)
src/app/gps/qwtpolar-*|src/core/spatialite/*|src/core/spatialindex/src/*|src/core/gps/qextserialport/*|src/plugins/grass/qtermwidget/*|src/astyle/*|python/ext-libs/*|src/providers/spatialite/qspatialite/*|src/plugins/dxf2shp_converter/dxflib/src/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*)
echo $f skipped
continue
;;
Expand Down
2 changes: 1 addition & 1 deletion scripts/update-indent.sh
Expand Up @@ -57,7 +57,7 @@ ASTYLEDIFF=astyle.r$REV0-r$REV1.diff
# reformat
for f in $MODIFIED; do
case "$f" in
src/core/spatialite/*|src/core/gps/qextserialport/*|src/plugins/grass/qtermwidget/*|src/astyle/*|python/pyspatialite/*|src/providers/sqlanywhere/sqlanyconnection/*)
src/core/spatialite/*|src/core/gps/qextserialport/*|src/plugins/grass/qtermwidget/*|src/astyle/*|python/pyspatialite/*)
echo $f skipped
continue
;;
Expand Down
6 changes: 0 additions & 6 deletions src/core/qgsvectorlayer.h
Expand Up @@ -255,12 +255,6 @@ struct CORE_EXPORT QgsVectorJoinInfo
* geometry column, and other attributes. The url can be constructed using the
* QgsDataSourceURI class.
*
* \subsection sqlanywhere SQL Anywhere data provider (sqlanywhere)
*
* Connects to an SQLanywhere database. The url defines the connection parameters, table,
* geometry column, and other attributes. The url can be constructed using the
* QgsDataSourceURI class.
*
* \subsection wfs WFS (web feature service) data provider (wfs)
*
* Used to access data provided by a web feature service.
Expand Down
1 change: 0 additions & 1 deletion src/plugins/CMakeLists.txt
Expand Up @@ -9,7 +9,6 @@ ADD_SUBDIRECTORY(coordinate_capture)
ADD_SUBDIRECTORY(dxf2shp_converter)
ADD_SUBDIRECTORY(evis)
ADD_SUBDIRECTORY(spatialquery)
ADD_SUBDIRECTORY(sqlanywhere)
ADD_SUBDIRECTORY(roadgraph)
ADD_SUBDIRECTORY(zonal_statistics)
ADD_SUBDIRECTORY(georeferencer)
Expand Down
71 changes: 0 additions & 71 deletions src/plugins/sqlanywhere/CMakeLists.txt

This file was deleted.

0 comments on commit 1691014

Please sign in to comment.