Skip to content

Commit e5fd81f

Browse files
jef-njef-n
committed
osgeo4w: fix running of python tests
1 parent 5b27d82 commit e5fd81f

File tree

5 files changed

+44
-38
lines changed

5 files changed

+44
-38
lines changed

‎cmake/UsePythonTest.cmake

+21-14
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,30 @@ MACRO(ADD_PYTHON_TEST TESTNAME FILENAME)
2929

3030
IF(WIN32)
3131
STRING(REGEX REPLACE ":" " " wo_semicolon "${ARGN}")
32+
IF(USING_NINJA OR USING_NMAKE)
33+
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME}.cmake "
34+
SET(ENV{QGIS_PREFIX_PATH} \"${QGIS_OUTPUT_DIRECTORY}/bin\")
35+
SET(ENV{PATH} \"${QGIS_OUTPUT_DIRECTORY}/bin;\$ENV{PATH}\")
36+
SET(ENV{PYTHONPATH} \"${QGIS_OUTPUT_DIRECTORY}/python/;${QGIS_OUTPUT_DIRECTORY}/python/plugins;${CMAKE_SOURCE_DIR}/tests/src/python;\$ENV{PYTHONPATH}\")
37+
MESSAGE(\"PATH:\$ENV{PATH}\")
38+
")
39+
ELSE(USING_NINJA OR USING_NMAKE)
40+
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME}.cmake "
41+
SET(ENV{QGIS_PREFIX_PATH} \"${QGIS_OUTPUT_DIRECTORY}/bin/\${CMAKE_BUILD_TYPE}\")
42+
SET(ENV{PATH} \"${QGIS_OUTPUT_DIRECTORY}/bin/\${CMAKE_BUILD_TYPE};\$ENV{PATH}\")
43+
SET(ENV{PYTHONPATH} \"${QGIS_OUTPUT_DIRECTORY}/python/;${QGIS_OUTPUT_DIRECTORY}/python/plugins;${CMAKE_SOURCE_DIR}/tests/src/python;\$ENV{PYTHONPATH}\")
44+
MESSAGE(\"PATH:\$ENV{PATH}\")
45+
")
46+
ENDIF(USING_NINJA OR USING_NMAKE)
3247
ELSE(WIN32)
3348
STRING(REGEX REPLACE ";" " " wo_semicolon "${ARGN}")
34-
ENDIF(WIN32)
35-
36-
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME}.cmake "
37-
IF(WIN32)
38-
SET(ENV{QGIS_PREFIX_PATH} \"${QGIS_OUTPUT_DIRECTORY}/bin/\${CMAKE_BUILD_TYPE}\")
39-
SET(ENV{PATH} \"${QGIS_OUTPUT_DIRECTORY}/bin/\${CMAKE_BUILD_TYPE};\$ENV{PATH}\")
40-
SET(ENV{PYTHONPATH} \"${QGIS_OUTPUT_DIRECTORY}/python/;${QGIS_OUTPUT_DIRECTORY}/python/plugins;${CMAKE_SOURCE_DIR}/tests/src/python;\$ENV{PYTHONPATH}\")
41-
MESSAGE(\"PATH:\$ENV{PATH}\")
42-
ELSE(WIN32)
43-
SET(ENV{QGIS_PREFIX_PATH} \"${QGIS_OUTPUT_DIRECTORY}\")
44-
SET(ENV{LD_LIBRARY_PATH} \"${pyenv}:${QGIS_OUTPUT_DIRECTORY}/lib:\$ENV{LD_LIBRARY_PATH}\")
45-
SET(ENV{PYTHONPATH} \"${QGIS_OUTPUT_DIRECTORY}/python/:${QGIS_OUTPUT_DIRECTORY}/python/plugins:${CMAKE_SOURCE_DIR}/tests/src/python:\$ENV{PYTHONPATH}\")
46-
MESSAGE(\"export LD_LIBRARY_PATH=\$ENV{LD_LIBRARY_PATH}\")
47-
ENDIF(WIN32)
49+
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME}.cmake "
50+
SET(ENV{QGIS_PREFIX_PATH} \"${QGIS_OUTPUT_DIRECTORY}\")
51+
SET(ENV{LD_LIBRARY_PATH} \"${pyenv}:${QGIS_OUTPUT_DIRECTORY}/lib:\$ENV{LD_LIBRARY_PATH}\")
52+
SET(ENV{PYTHONPATH} \"${QGIS_OUTPUT_DIRECTORY}/python/:${QGIS_OUTPUT_DIRECTORY}/python/plugins:${CMAKE_SOURCE_DIR}/tests/src/python:\$ENV{PYTHONPATH}\")
53+
MESSAGE(\"export LD_LIBRARY_PATH=\$ENV{LD_LIBRARY_PATH}\")
4854
")
55+
ENDIF(WIN32)
4956

5057
FOREACH(_in ${ARGN})
5158
STRING(REGEX MATCH "^([^=]+)=(.*)$" _out ${_in})

‎doc/msvc.t2t

+7-3
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ MinGW).
88
This section describes the setup required to allow Visual Studio to be used to
99
build QGIS.
1010

11-
===Visual C++ Express Edition===
11+
===Visual C++ Community Edition===
1212

13-
The free (as in free beer) Express Edition installer is available under:
13+
The free (as in free beer) Community installer is available under:
1414

15-
https://download.my.visualstudio.com/db/en_visual_studio_express_2015_for_windows_10_x86_x64_web_installer_6878617.exe?t=9437eae7-7ff2-462a-a349-312fd069ef2d&e=1486459960&h=1fa3414e467f267c795c01bc38b9472d&su=1
15+
http://download.microsoft.com/download/D/2/3/D23F4D0F-BA2D-4600-8725-6CCECEA05196/vs_community_ENU.exe
1616

1717
===Other tools and dependencies===
1818

@@ -45,6 +45,10 @@ and from OSGeo4W (select //Advanced Installation//):
4545
- pyqt5
4646
- python3-devel
4747
- python3-qscintilla
48+
- python3-nose2
49+
- python3-future
50+
- python3-pyyaml
51+
- python3-mock
4852
- qca-qt5-devel
4953
- qca-qt5-libs
5054
- qscintilla-qt5

‎ms-windows/osgeo4w/package-nightly.cmd

+5-6
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ goto cmake_x86_64
5959

6060
:cmake_x86
6161
call "%PF86%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
62-
if exist "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" call "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /x86 /Release
6362
path %path%;%PF86%\Microsoft Visual Studio 14.0\VC\bin
6463
set CMAKE_COMPILER_PATH=%PF86%\Microsoft Visual Studio 14.0\VC\bin
6564
set SETUPAPI_LIBRARY=c:\Program Files (x86)\Windows Kits\10\Lib\10.0.14393.0\um\x86\SetupAPI.Lib
65+
if not exist "%SETUPAPI_LIBRARY%" (echo SETUPAPI_LIBRARY not found & goto error)
6666

6767
set CMAKE_OPT=^
6868
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python36/sip.exe ^
@@ -74,12 +74,9 @@ goto cmake
7474

7575
:cmake_x86_64
7676
call "%PF86%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
77-
if exist "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" call "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /x64 /Release
7877
path %path%;%PF86%\Microsoft Visual Studio 14.0\VC\bin
7978
set CMAKE_COMPILER_PATH=%PF86%\Microsoft Visual Studio 14.0\VC\bin\amd64
8079
set SETUPAPI_LIBRARY=c:\Program Files (x86)\Windows Kits\10\Lib\10.0.14393.0\um\x64\SetupAPI.Lib
81-
if not exist "%SETUPAPI_LIBRARY%" set SETUPAPI_LIBRARY=%PF86%\Microsoft SDKs\Windows\v7.0A\Lib\x64\SetupAPI.Lib
82-
if not exist "%SETUPAPI_LIBRARY%" set SETUPAPI_LIBRARY=%PROGRAMFILES%\Microsoft SDKs\Windows\v7.1\Lib\x64\SetupAPI.lib
8380
if not exist "%SETUPAPI_LIBRARY%" (echo SETUPAPI_LIBRARY not found & goto error)
8481

8582
set CMAKE_OPT=^
@@ -198,7 +195,7 @@ cmake -G Ninja ^
198195
-D WITH_INTERNAL_MOCK=FALSE ^
199196
-D WITH_INTERNAL_HTTPLIB2=FALSE ^
200197
-D WITH_INTERNAL_FUTURE=FALSE ^
201-
-D WITH_INTERNAL_PYSPATIALITE=TRUE ^
198+
-D WITH_PYSPATIALITE=TRUE ^
202199
-D QCA_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\Qt5\include\QtCrypto ^
203200
-D QCA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qca-qt5.lib ^
204201
-D QSCINTILLA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qscintilla2.lib ^
@@ -208,17 +205,19 @@ cmake -G Ninja ^
208205
if errorlevel 1 (echo cmake failed & goto error)
209206

210207
:skipcmake
211-
if exist noclean (echo skip clean & goto skipclean)
208+
if exist ..\noclean (echo skip clean & goto skipclean)
212209
echo CLEAN: %DATE% %TIME%
213210
cmake --build %BUILDDIR% --target clean --config %BUILDCONF%
214211
if errorlevel 1 (echo clean failed & goto error)
215212

216213
:skipclean
214+
if exist ..\skipbuild (echo skip build & goto skipbuild)
217215
echo ALL_BUILD: %DATE% %TIME%
218216
cmake --build %BUILDDIR% --config %BUILDCONF%
219217
if errorlevel 1 cmake --build %BUILDDIR% --config %BUILDCONF%
220218
if errorlevel 1 (echo build failed twice & goto error)
221219

220+
:skipbuild
222221
if exist ..\skiptests goto skiptests
223222

224223
echo RUN_TESTS: %DATE% %TIME%

‎ms-windows/osgeo4w/package.cmd

+11-13
Original file line numberDiff line numberDiff line change
@@ -59,22 +59,20 @@ goto cmake_x86_64
5959

6060
:cmake_x86
6161
call "%PF86%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
62-
if exist "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" call "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /x86 /Release
6362
path %path%;%PF86%\Microsoft Visual Studio 14.0\VC\bin
6463
set CMAKE_COMPILER_PATH=%PF86%\Microsoft Visual Studio 14.0\VC\bin
64+
set SETUPAPI_LIBRARY=c:\Program Files (x86)\Windows Kits\10\Lib\10.0.14393.0\um\x86\SetupAPI.Lib
65+
if not exist "%SETUPAPI_LIBRARY%" (echo SETUPAPI_LIBRARY not found & goto error)
6566

6667
set CMAKE_OPT=^
6768
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python36/sip.exe ^
6869
goto cmake
6970

7071
:cmake_x86_64
7172
call "%PF86%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
72-
if exist "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" call "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /x64 /Release
7373
path %path%;%PF86%\Microsoft Visual Studio 14.0\VC\bin
7474
set CMAKE_COMPILER_PATH=%PF86%\Microsoft Visual Studio 14.0\VC\bin\amd64
7575
set SETUPAPI_LIBRARY=c:\Program Files (x86)\Windows Kits\10\Lib\10.0.14393.0\um\x64\SetupAPI.Lib
76-
set SETUPAPI_LIBRARY=%PF86%\Microsoft SDKs\Windows\v7.0A\Lib\x64\SetupAPI.Lib
77-
if not exist "%SETUPAPI_LIBRARY%" set SETUPAPI_LIBRARY=%PROGRAMFILES%\Microsoft SDKs\Windows\v7.1\Lib\x64\SetupAPI.lib
7876
if not exist "%SETUPAPI_LIBRARY%" (echo SETUPAPI_LIBRARY not found & goto error)
7977

8078
set CMAKE_OPT=^
@@ -144,8 +142,8 @@ touch %SRCDIR%\CMakeLists.txt
144142
echo CMAKE: %DATE% %TIME%
145143
if errorlevel 1 goto error
146144

147-
set LIB=%LIB%;%OSGEO4W_ROOT%\lib
148-
set INCLUDE=%INCLUDE%;%OSGEO4W_ROOT%\include
145+
set LIB=%LIB%;%OSGEO4W_ROOT%\apps\Qt5\lib;%OSGEO4W_ROOT%\lib
146+
set INCLUDE=%INCLUDE%;%OSGEO4W_ROOT%\apps\Qt5\include;%OSGEO4W_ROOT%\include
149147

150148
cmake -G Ninja ^
151149
-D CMAKE_CXX_COMPILER="%CMAKE_COMPILER_PATH:\=/%/cl.exe" ^
@@ -164,7 +162,6 @@ cmake -G Ninja ^
164162
-D WITH_GLOBE=FALSE ^
165163
-D WITH_TOUCH=TRUE ^
166164
-D WITH_ORACLE=TRUE ^
167-
-D WITH_QTWEBKIT=FALSE ^
168165
-D WITH_CUSTOM_WIDGETS=TRUE ^
169166
-D CMAKE_CXX_FLAGS_RELEASE="/MD /MP /O2 /Ob2 /D NDEBUG" ^
170167
-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
@@ -192,16 +189,17 @@ cmake -G Ninja ^
192189
-D WITH_INTERNAL_MOCK=FALSE ^
193190
-D WITH_INTERNAL_HTTPLIB2=FALSE ^
194191
-D WITH_INTERNAL_FUTURE=FALSE ^
192+
-D WITH_PYSPATIALITE=TRUE ^
195193
-D QCA_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\Qt5\include\QtCrypto ^
196-
-D QCA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qca.lib ^
194+
-D QCA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qca-qt5.lib ^
197195
-D QSCINTILLA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qscintilla2.lib ^
198196
-D SUPPRESS_SIP_WARNINGS=TRUE ^
199197
%CMAKE_OPT% ^
200198
%SRCDIR:\=/%
201199
if errorlevel 1 (echo cmake failed & goto error)
202200

203201
:skipcmake
204-
if exist noclean (echo skip clean & goto skipclean)
202+
if exist ..\noclean (echo skip clean & goto skipclean)
205203
echo CLEAN: %DATE% %TIME%
206204
cmake --build %BUILDDIR% --target clean --config %BUILDCONF%
207205
if errorlevel 1 (echo clean failed & goto error)
@@ -231,7 +229,6 @@ if errorlevel 1 echo TESTS WERE NOT SUCCESSFUL.
231229
PATH %oldpath%
232230

233231
:skiptests
234-
:package
235232

236233
if exist "%PKGDIR%" (
237234
echo REMOVE: %DATE% %TIME%
@@ -242,6 +239,7 @@ echo INSTALL: %DATE% %TIME%
242239
cmake --build %BUILDDIR% --target install --config %BUILDCONF%
243240
if errorlevel 1 (echo INSTALL failed & goto error)
244241

242+
:package
245243
echo PACKAGE: %DATE% %TIME%
246244

247245
cd ..
@@ -363,13 +361,13 @@ move %PKGDIR%\bin\qbrowser.exe %OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser-bin.exe
363361
if errorlevel 1 (echo move of browser executable failed & goto error)
364362

365363
if not exist %PKGDIR%\qtplugins\sqldrivers mkdir %PKGDIR%\qtplugins\sqldrivers
366-
move %OSGEO4W_ROOT%\apps\qt4\plugins\sqldrivers\qsqlocispatial.dll %PKGDIR%\qtplugins\sqldrivers
364+
move %OSGEO4W_ROOT%\apps\qt5\plugins\sqldrivers\qsqlocispatial.dll %PKGDIR%\qtplugins\sqldrivers
367365
if errorlevel 1 (echo move of oci sqldriver failed & goto error)
368-
move %OSGEO4W_ROOT%\apps\qt4\plugins\sqldrivers\qsqlspatialite.dll %PKGDIR%\qtplugins\sqldrivers
366+
move %OSGEO4W_ROOT%\apps\qt5\plugins\sqldrivers\qsqlspatialite.dll %PKGDIR%\qtplugins\sqldrivers
369367
if errorlevel 1 (echo move of spatialite sqldriver failed & goto error)
370368

371369
if not exist %PKGDIR%\qtplugins\designer mkdir %PKGDIR%\qtplugins\designer
372-
move %OSGEO4W_ROOT%\apps\qt4\plugins\designer\qgis_customwidgets.dll %PKGDIR%\qtplugins\designer
370+
move %OSGEO4W_ROOT%\apps\qt5\plugins\designer\qgis_customwidgets.dll %PKGDIR%\qtplugins\designer
373371
if errorlevel 1 (echo move of customwidgets failed & goto error)
374372

375373
if not exist %PKGDIR%\python\PyQt5\uic\widget-plugins mkdir %PKGDIR%\python\PyQt5\uic\widget-plugins

‎scripts/pyuic-wrapper.bat

-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,4 @@ set PYUIC=%1
33
set PATH=%2;%PATH%
44
set PYTHONPATH=%3;%PYTHONPATH%
55
set PYTHON=%4
6-
echo PATH:%PATH%
7-
echo PYTHONPATH:%PYTHONPATH%
86
%PYTHON% %~dp0\pyuic-wrapper.py %5 %6 %7 %8 %9

0 commit comments

Comments
 (0)