Skip to content

Commit 748acc6

Browse files
committed
osgeo4w: packaging fixes
1 parent 737c92d commit 748acc6

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

ms-windows/osgeo4w/package-nightly.cmd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ cmake -G Ninja ^
172172
-D WITH_GLOBE=FALSE ^
173173
-D WITH_TOUCH=TRUE ^
174174
-D WITH_ORACLE=TRUE ^
175-
-D WITH_QTWEBKIT=FALSE ^
176175
-D WITH_CUSTOM_WIDGETS=TRUE ^
177176
-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
178177
-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
@@ -199,6 +198,7 @@ cmake -G Ninja ^
199198
-D WITH_INTERNAL_MOCK=FALSE ^
200199
-D WITH_INTERNAL_HTTPLIB2=FALSE ^
201200
-D WITH_INTERNAL_FUTURE=FALSE ^
201+
-D WITH_INTERNAL_PYSPATIALITE=TRUE ^
202202
-D QCA_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\Qt5\include\QtCrypto ^
203203
-D QCA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qca-qt5.lib ^
204204
-D QSCINTILLA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qscintilla2.lib ^
@@ -298,13 +298,13 @@ move %PKGDIR%\bin\qbrowser.exe %OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser-bin.exe
298298
if errorlevel 1 (echo move of browser executable failed & goto error)
299299

300300
if not exist %PKGDIR%\qtplugins\sqldrivers mkdir %PKGDIR%\qtplugins\sqldrivers
301-
move %OSGEO4W_ROOT%\apps\qt4\plugins\sqldrivers\qsqlocispatial.dll %PKGDIR%\qtplugins\sqldrivers
301+
move %OSGEO4W_ROOT%\apps\qt5\plugins\sqldrivers\qsqlocispatial.dll %PKGDIR%\qtplugins\sqldrivers
302302
if errorlevel 1 (echo move of oci sqldriver failed & goto error)
303-
move %OSGEO4W_ROOT%\apps\qt4\plugins\sqldrivers\qsqlspatialite.dll %PKGDIR%\qtplugins\sqldrivers
303+
move %OSGEO4W_ROOT%\apps\qt5\plugins\sqldrivers\qsqlspatialite.dll %PKGDIR%\qtplugins\sqldrivers
304304
if errorlevel 1 (echo move of spatialite sqldriver failed & goto error)
305305

306306
if not exist %PKGDIR%\qtplugins\designer mkdir %PKGDIR%\qtplugins\designer
307-
move %OSGEO4W_ROOT%\apps\qt4\plugins\designer\qgis_customwidgets.dll %PKGDIR%\qtplugins\designer
307+
move %OSGEO4W_ROOT%\apps\qt5\plugins\designer\qgis_customwidgets.dll %PKGDIR%\qtplugins\designer
308308
if errorlevel 1 (echo move of customwidgets failed & goto error)
309309

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

ms-windows/osgeo4w/postinstall-dev.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ REM Do not register extensions if release is installed
2929
if not exist "%O4W_ROOT%\apps\qgis\bin\qgis.reg" nircmd elevate "%WINDIR%\regedit" /s "%O4W_ROOT%\apps\@package@\bin\qgis.reg"
3030

3131
call "%OSGEO4W_ROOT%\bin\o4w_env.bat"
32+
call "%OSGEO4W_ROOT%\bin\qt5_env.bat"
3233
path %PATH%;%OSGEO4W_ROOT%\apps\@package@\bin
3334
set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@
3435
"%OSGEO4W_ROOT%\apps\@package@\crssync"

ms-windows/osgeo4w/qgis-grass.bat.tmpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
@echo off
22
call "%~dp0\o4w_env.bat"
33
call "%OSGEO4W_ROOT%"\apps\grass\grass-@grassversion@\etc\env.bat
4+
call qt5_env.bat
5+
call py3_env.bat
46
@echo off
57
path %OSGEO4W_ROOT%\apps\@package@\bin;%OSGEO4W_ROOT%\apps\grass\grass-@grassversion@\lib;%OSGEO4W_ROOT%\apps\grass\grass-@grassversion@\bin;%PATH%
68
set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@

ms-windows/osgeo4w/qgis.bat.tmpl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@echo off
22
call "%~dp0\o4w_env.bat"
3-
call "%~dp0\qt5_env.bat"
3+
call qt5_env.bat
4+
call py3_env.bat
45
@echo off
56
path %OSGEO4W_ROOT%\apps\@package@\bin;%PATH%
67
set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@

0 commit comments

Comments
 (0)