Skip to content

Commit 1691014

Browse files
jef-njef-n
committed
Remove sqlanywhere plugin and provider (implements #10840)
1 parent 63a17e5 commit 1691014

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+5
-10598
lines changed

‎CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -683,10 +683,6 @@ IF (APPLE)
683683
COMMAND /bin/ln -fs ../../Plugins/qgis/qgisgrass.framework lib/
684684
WORKING_DIRECTORY "${QGIS_OUTPUT_DIRECTORY}"
685685
)
686-
EXECUTE_PROCESS(
687-
COMMAND /bin/ln -fs ../../Plugins/qgis/qgissqlanyconnection.framework lib/
688-
WORKING_DIRECTORY "${QGIS_OUTPUT_DIRECTORY}"
689-
)
690686
ENDIF (APPLE)
691687

692688
# manual page - makes sense only on unix systems

‎debian/changelog

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ qgis (2.5.0) UNRELEASED; urgency=medium
22

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

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

89
qgis (2.4.0) unstable; urgency=medium
910

‎debian/control

-13
Original file line numberDiff line numberDiff line change
@@ -150,19 +150,6 @@ Description: QGIS - shared Python library
150150
.
151151
This package contains the shared Python library.
152152

153-
Package: libqgissqlanyconnection2.3.0
154-
Architecture: any
155-
Section: libs
156-
Depends:
157-
${shlibs:Depends},
158-
${misc:Depends}
159-
Replaces: libqgis2.3.0
160-
Description: QGIS - shared sqlanywhere connection library
161-
QGIS is a Geographic Information System (GIS) which manages, analyzes and
162-
display databases of geographic information.
163-
.
164-
This package contains the shared sqlanywhere connection library.
165-
166153
Package: libqgis-dev
167154
Architecture: any
168155
Section: libdevel

‎debian/control.in

-29
Original file line numberDiff line numberDiff line change
@@ -171,19 +171,6 @@ Description: QGIS - shared Python library
171171
.
172172
This package contains the shared Python library.
173173

174-
Package: libqgissqlanyconnection{QGIS_ABI}
175-
Architecture: any
176-
Section: libs
177-
Depends:
178-
${shlibs:Depends},
179-
${misc:Depends}
180-
Replaces: libqgis{QGIS_ABI}
181-
Description: QGIS - shared sqlanywhere connection library
182-
QGIS is a Geographic Information System (GIS) which manages, analyzes and
183-
display databases of geographic information.
184-
.
185-
This package contains the shared sqlanywhere connection library.
186-
187174
Package: libqgis-dev
188175
Architecture: any
189176
Section: libdevel
@@ -204,7 +191,6 @@ Depends:
204191
libqgis-networkanalysis{QGIS_ABI} (= ${binary:Version}),
205192
libqgisgrass{QGIS_ABI} (= ${binary:Version}),
206193
libqgispython{QGIS_ABI} (= ${binary:Version}),
207-
libqgissqlanyconnection{QGIS_ABI} (= ${binary:Version}),
208194
libqt4-dev (>=4.6.0),
209195
libsqlite3-dev,
210196
python-qt4 (>=4.1.0),
@@ -352,21 +338,6 @@ Description: QGIS custom widgets for Qt Designer
352338
.
353339
This package contains a library to use specific QGIS widgets in Qt Designer.
354340

355-
Package: qgis-sqlanywhere
356-
Architecture: any
357-
Depends:
358-
${shlibs:Depends},
359-
${misc:Depends}
360-
Conflicts:
361-
qgis-sqlanywhere1.7.0,
362-
qgis-sqlanywhere1.7.1,
363-
qgis-sqlanywhere1.8.0
364-
Description: QGIS sql anywhere plugin and provider
365-
QGIS is a Geographic Information System (GIS) which manages, analyzes and
366-
display databases of geographic information.
367-
.
368-
This package contains the QGIS sqlanywhere plugin and provider.
369-
370341
Package: qgis-api-doc
371342
Architecture: all
372343
Section: doc

‎debian/copyright

-8
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,6 @@ Files: src/plugins/dxf2shp_converter/shapelib-1.2.10/shprewind.c
9191
Copyright: 2002, Frank Warmerdam
9292
License: LGPL-2+
9393

94-
Files: src/providers/sqlanywhere/sqlanyconnection/sacapi/*
95-
Copyright: 2008-2010 iAnywhere Solutions, Inc.
96-
License: Apache-2.0
97-
9894
Files: cmake/PythonCompile.py
9995
Copyright: Simon Edwards <simon@simonzone.com>
10096
License: public-domain
@@ -687,10 +683,6 @@ License: Apache-2.0
687683
See the License for the specific language governing permissions and
688684
limitations under the License.
689685
.
690-
While not a requirement of the license, if you do modify this file, we
691-
would appreciate hearing about it. Please email
692-
sqlany_interfaces@sybase.com
693-
.
694686
On Debian systems, the complete text of the Apache License version 2
695687
an be found in the `/usr/share/common-licenses/Apache-2.0' file.
696688

‎debian/libqgis-dev.install

-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ usr/lib/libqgis_analysis.so
55
usr/lib/libqgis_networkanalysis.so
66
usr/lib/libqgisgrass.so
77
usr/lib/libqgispython.so
8-
usr/lib/libqgissqlanyconnection.so
98
usr/share/qgis/FindQGIS.cmake

‎debian/libqgissqlanyconnection{QGIS_ABI}.install

-1
This file was deleted.

‎debian/libqgissqlanyconnection{QGIS_ABI}.lintian-overrides

-1
This file was deleted.

‎debian/qgis-sqlanywhere.install.in

-2
This file was deleted.

‎doc/AUTHORS

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ René-Luc D'Hont <rldhont at gmail dot com>
4949
Etienne Tourigny <etourigny dot dev at gmail dot com>
5050
Larry Shaffer <larrys at dakotacarto dot com>
5151
Victor Olaya <volayaf at gmail dot com>
52-
Dave DeHaan <dave dot dehaan@sap dot com>
5352
Matthias Kuhn <matthias dot kuhn at gmx dot ch>
5453
Salvatore Larosa <lrssvtml at gmail dot com>
5554
Nyall Dawson <nyall dot dawson at gmail dot com>

‎ms-windows/osgeo4w/package.cmd

-3
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,7 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%-common/%PACKAGENAME
241241
"apps/%PACKAGENAME%/plugins/ogrprovider.dll" ^
242242
"apps/%PACKAGENAME%/plugins/owsprovider.dll" ^
243243
"apps/%PACKAGENAME%/plugins/postgresprovider.dll" ^
244-
"apps/%PACKAGENAME%/plugins/qgissqlanyconnection.dll" ^
245244
"apps/%PACKAGENAME%/plugins/spatialiteprovider.dll" ^
246-
"apps/%PACKAGENAME%/plugins/sqlanywhereprovider.dll" ^
247245
"apps/%PACKAGENAME%/plugins/wcsprovider.dll" ^
248246
"apps/%PACKAGENAME%/plugins/wfsprovider.dll" ^
249247
"apps/%PACKAGENAME%/plugins/wmsprovider.dll" ^
@@ -294,7 +292,6 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%/%PACKAGENAME%-%VERS
294292
"apps/%PACKAGENAME%/plugins/roadgraphplugin.dll" ^
295293
"apps/%PACKAGENAME%/plugins/spatialqueryplugin.dll" ^
296294
"apps/%PACKAGENAME%/plugins/spitplugin.dll" ^
297-
"apps/%PACKAGENAME%/plugins/sqlanywhereplugin.dll" ^
298295
"apps/%PACKAGENAME%/plugins/topolplugin.dll" ^
299296
"apps/%PACKAGENAME%/plugins/zonalstatisticsplugin.dll" ^
300297
"apps/%PACKAGENAME%/qgis_help.exe" ^

‎ms-windows/plugins.nsh

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "rasterterrainplugin
2323
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "roadgraphplugin" "true"
2424
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "spitplugin" "true"
2525
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "spatialqueryplugin" "true"
26-
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "sqlanywhereplugin" "true"
2726
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "topolplugin" "true"
2827
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "zonalstatisticsplugin" "true"
2928

‎resources/context_help/SaNewConnection

-31
This file was deleted.

‎resources/context_help/SaSourceSelect

-37
This file was deleted.

‎scripts/addcopyright.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ for i in $FILES; do
4141
author=volayaf
4242
;;
4343

44-
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/*)
44+
src/app/gps/qwtpolar-*|src/app/qtmain_android.cpp|src/core/spatialite/*|src/core/spatialindex/src/*|src/core/gps/qextserialport/*|src/astyle/*|python/pyspatialite/*)
4545
# Skip third party files
4646
echo $f skipped
4747
continue

‎scripts/astyle.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ $ARTISTIC_STYLE_OPTIONS \
6060

6161
for f in "$@"; do
6262
case "$f" in
63-
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/*)
63+
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/*)
6464
echo $f skipped
6565
continue
6666
;;

‎scripts/update-indent.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ ASTYLEDIFF=astyle.r$REV0-r$REV1.diff
5757
# reformat
5858
for f in $MODIFIED; do
5959
case "$f" in
60-
src/core/spatialite/*|src/core/gps/qextserialport/*|src/plugins/grass/qtermwidget/*|src/astyle/*|python/pyspatialite/*|src/providers/sqlanywhere/sqlanyconnection/*)
60+
src/core/spatialite/*|src/core/gps/qextserialport/*|src/plugins/grass/qtermwidget/*|src/astyle/*|python/pyspatialite/*)
6161
echo $f skipped
6262
continue
6363
;;

‎src/core/qgsvectorlayer.h

-6
Original file line numberDiff line numberDiff line change
@@ -255,12 +255,6 @@ struct CORE_EXPORT QgsVectorJoinInfo
255255
* geometry column, and other attributes. The url can be constructed using the
256256
* QgsDataSourceURI class.
257257
*
258-
* \subsection sqlanywhere SQL Anywhere data provider (sqlanywhere)
259-
*
260-
* Connects to an SQLanywhere database. The url defines the connection parameters, table,
261-
* geometry column, and other attributes. The url can be constructed using the
262-
* QgsDataSourceURI class.
263-
*
264258
* \subsection wfs WFS (web feature service) data provider (wfs)
265259
*
266260
* Used to access data provided by a web feature service.

‎src/plugins/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ ADD_SUBDIRECTORY(coordinate_capture)
99
ADD_SUBDIRECTORY(dxf2shp_converter)
1010
ADD_SUBDIRECTORY(evis)
1111
ADD_SUBDIRECTORY(spatialquery)
12-
ADD_SUBDIRECTORY(sqlanywhere)
1312
ADD_SUBDIRECTORY(roadgraph)
1413
ADD_SUBDIRECTORY(zonal_statistics)
1514
ADD_SUBDIRECTORY(georeferencer)

‎src/plugins/sqlanywhere/CMakeLists.txt

-71
This file was deleted.

0 commit comments

Comments
 (0)