Skip to content

Commit

Permalink
Merge pull request #5493 from gacarrillor/bye_pyspatialite
Browse files Browse the repository at this point in the history
Bye pyspatialite
  • Loading branch information
jef-n authored Oct 29, 2017
2 parents cfba4c4 + 6415fad commit 39816cf
Show file tree
Hide file tree
Showing 30 changed files with 29 additions and 6,051 deletions.
4 changes: 0 additions & 4 deletions debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,6 @@ License: public-domain
is used when saving/restoring a QGIS project.
This file is in the public domain

Files: python/ext-libs/pyspatialite/*
Copyright: 2004-2010, Gerhard Häring <gh@ghaering.de>
License: Zlib

Files: python/plugins/processing/modeler/ModelerArrowItem.py
src/app/qgssettingstree.cpp
src/app/qgssettingstree.h
Expand Down
3 changes: 1 addition & 2 deletions ms-windows/osgeo4w/package-nightly.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ set PYTHONPATH=
if exist "%PF86%\CMake\bin" path %PATH%;c:\cygwin\bin;%PF86%\CMake\bin
if exist "%PROGRAMFILES%\CMake\bin" path %PATH%;c:\cygwin\bin;%PROGRAMFILES%\CMake\bin

PROMPT qgis%VERSION%$g
PROMPT qgis%VERSION%$g

set BUILDCONF=RelWithDebInfo

Expand Down Expand Up @@ -185,7 +185,6 @@ cmake -G Ninja ^
-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^
-D FCGI_LIBRARY=%O4W_ROOT%/lib/libfcgi.lib ^
-D WITH_PYSPATIALITE=TRUE ^
-D QCA_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\Qt5\include\QtCrypto ^
-D QCA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qca-qt5.lib ^
-D QSCINTILLA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qscintilla2.lib ^
Expand Down
3 changes: 1 addition & 2 deletions ms-windows/osgeo4w/package.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ set GRASS_VERSIONS=%GRASS72_VERSION%
set PYTHONPATH=
path %PATH%;c:\cygwin\bin;%PF86%\CMake\bin

PROMPT qgis%VERSION%$g
PROMPT qgis%VERSION%$g

set BUILDCONF=Release

Expand Down Expand Up @@ -178,7 +178,6 @@ cmake -G Ninja ^
-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^
-D FCGI_LIBRARY=%O4W_ROOT%/lib/libfcgi.lib ^
-D WITH_PYSPATIALITE=TRUE ^
-D QCA_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\Qt5\include\QtCrypto ^
-D QCA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qca-qt5.lib ^
-D QSCINTILLA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qscintilla2.lib ^
Expand Down
5 changes: 0 additions & 5 deletions python/ext-libs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@
SET (QGIS_PYTHON_DIR ${QGIS_DATA_DIR}/python)
SET (PYTHON_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/python)

SET (WITH_PYSPATIALITE FALSE CACHE BOOL "Determines whether PYSPATIALITE should be built")
IF (WITH_PYSPATIALITE)
ADD_SUBDIRECTORY(pyspatialite)
ENDIF (WITH_PYSPATIALITE)

MACRO(EXT_PYLIB lib enable_by_default)
STRING(TOUPPER ${lib} ulib)
SET (WITH_INTERNAL_${ulib} ${enable_by_default} CACHE BOOL "Determines whether python ${lib} should be included")
Expand Down
66 changes: 0 additions & 66 deletions python/ext-libs/pyspatialite/CMakeLists.txt

This file was deleted.

19 changes: 0 additions & 19 deletions python/ext-libs/pyspatialite/LICENSE

This file was deleted.

22 changes: 0 additions & 22 deletions python/ext-libs/pyspatialite/lib/__init__.py

This file was deleted.

91 changes: 0 additions & 91 deletions python/ext-libs/pyspatialite/lib/dbapi2.py

This file was deleted.

65 changes: 0 additions & 65 deletions python/ext-libs/pyspatialite/lib/dump.py

This file was deleted.

Loading

0 comments on commit 39816cf

Please sign in to comment.