Skip to content

Commit 0de984d

Browse files
jef-njef-n
committed
osgeo4w: detect python version in package.cmd
(cherry picked from commit faeb160)
1 parent 3ce743e commit 0de984d

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ if not exist "%SETUPAPI_LIBRARY%" set SETUPAPI_LIBRARY=%PF86%\Windows Kits\8.0\L
4848
if not exist "%SETUPAPI_LIBRARY%" (echo SETUPAPI_LIBRARY not found & goto error)
4949

5050
set CMAKE_OPT=^
51-
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python36/sip.exe ^
5251
-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /ZI /MP /Od /D NDEBUG" ^
5352
-D CMAKE_PDB_OUTPUT_DIRECTORY_RELWITHDEBINFO=%BUILDDIR%\apps\%PACKAGENAME%\pdb ^
5453
-D SPATIALINDEX_LIBRARY=%O4W_ROOT%/lib/spatialindex_i.lib
@@ -62,7 +61,6 @@ if not exist "%SETUPAPI_LIBRARY%" (echo SETUPAPI_LIBRARY not found & goto error)
6261

6362
set CMAKE_OPT=^
6463
-D SPATIALINDEX_LIBRARY=%O4W_ROOT%/lib/spatialindex-64.lib ^
65-
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python36/sip.exe ^
6664
-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /Zi /MP /Od /D NDEBUG" ^
6765
-D CMAKE_PDB_OUTPUT_DIRECTORY_RELWITHDEBINFO=%BUILDDIR%\apps\%PACKAGENAME%\pdb ^
6866
-D SETUPAPI_LIBRARY="%SETUPAPI_LIBRARY%" ^
@@ -131,6 +129,8 @@ if errorlevel 1 goto error
131129

132130
if "%CMAKEGEN%"=="" set CMAKEGEN=Ninja
133131

132+
for %%i in (%PYTHONHOME%) do set PYVER=%%~ni
133+
134134
cmake -G "%CMAKEGEN%" ^
135135
-D CMAKE_CXX_COMPILER="%CMAKE_COMPILER_PATH:\=/%/cl.exe" ^
136136
-D CMAKE_C_COMPILER="%CMAKE_COMPILER_PATH:\=/%/cl.exe" ^
@@ -154,11 +154,10 @@ cmake -G "%CMAKEGEN%" ^
154154
-D SQLITE3_LIBRARY=%O4W_ROOT%/lib/sqlite3_i.lib ^
155155
-D SPATIALITE_LIBRARY=%O4W_ROOT%/lib/spatialite_i.lib ^
156156
-D PYTHON_EXECUTABLE=%O4W_ROOT%/bin/python3.exe ^
157-
-D PYTHON_INCLUDE_PATH=%O4W_ROOT%/apps/Python36/include ^
158-
-D PYTHON_LIBRARY=%O4W_ROOT%/apps/Python36/libs/python36.lib ^
159-
-D QT_BINARY_DIR=%O4W_ROOT%/bin ^
157+
-D SIP_BINARY_PATH=%PYTHONHOME:\=/%/sip.exe ^
158+
-D PYTHON_INCLUDE_PATH=%PYTHONHOME:\=/%/include ^
159+
-D PYTHON_LIBRARY=%PYTHONHOME:\=/%/libs/%PYVER%.lib ^
160160
-D QT_LIBRARY_DIR=%O4W_ROOT%/lib ^
161-
-D QT_HEADERS_DIR=%O4W_ROOT%/apps/qt5/include ^
162161
-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
163162
-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^
164163
-D FCGI_LIBRARY=%O4W_ROOT%/lib/libfcgi.lib ^
@@ -278,7 +277,7 @@ move %OSGEO4W_ROOT%\apps\qt5\plugins\designer\qgis_customwidgets.dll %PKGDIR%\qt
278277
if errorlevel 1 (echo move of customwidgets failed & goto error)
279278

280279
if not exist %PKGDIR%\python\PyQt5\uic\widget-plugins mkdir %PKGDIR%\python\PyQt5\uic\widget-plugins
281-
move %OSGEO4W_ROOT%\apps\Python36\Lib\site-packages\PyQt5\uic\widget-plugins\qgis_customwidgets.py %PKGDIR%\python\PyQt5\uic\widget-plugins
280+
move %PYTHONHOME%\Lib\site-packages\PyQt5\uic\widget-plugins\qgis_customwidgets.py %PKGDIR%\python\PyQt5\uic\widget-plugins
282281
if errorlevel 1 (echo move of customwidgets binding failed & goto error)
283282

284283
if not exist %ARCH%\release\qgis\%PACKAGENAME% mkdir %ARCH%\release\qgis\%PACKAGENAME%

‎ms-windows/osgeo4w/package.cmd‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ if not exist "%SETUPAPI_LIBRARY%" set SETUPAPI_LIBRARY=%PF86%\Windows Kits\8.0\L
4848
if not exist "%SETUPAPI_LIBRARY%" (echo SETUPAPI_LIBRARY not found & goto error)
4949

5050
set CMAKE_OPT=^
51-
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python36/sip.exe ^
5251
-D SPATIALINDEX_LIBRARY=%O4W_ROOT%/lib/spatialindex_i.lib
5352
goto cmake
5453

@@ -60,7 +59,6 @@ if not exist "%SETUPAPI_LIBRARY%" (echo SETUPAPI_LIBRARY not found & goto error)
6059

6160
set CMAKE_OPT=^
6261
-D SPATIALINDEX_LIBRARY=%O4W_ROOT%/lib/spatialindex-64.lib ^
63-
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python36/sip.exe ^
6462
-D SETUPAPI_LIBRARY="%SETUPAPI_LIBRARY%" ^
6563
-D CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS=TRUE
6664

@@ -133,6 +131,8 @@ if errorlevel 1 goto error
133131

134132
if "%CMAKEGEN%"=="" set CMAKEGEN=Ninja
135133

134+
for %%i in (%PYTHONHOME%) do set PYVER=%%~ni
135+
136136
cmake -G "%CMAKEGEN%" ^
137137
-D CMAKE_CXX_COMPILER="%CMAKE_COMPILER_PATH:\=/%/cl.exe" ^
138138
-D CMAKE_C_COMPILER="%CMAKE_COMPILER_PATH:\=/%/cl.exe" ^
@@ -159,11 +159,10 @@ cmake -G "%CMAKEGEN%" ^
159159
-D SQLITE3_LIBRARY=%O4W_ROOT%/lib/sqlite3_i.lib ^
160160
-D SPATIALITE_LIBRARY=%O4W_ROOT%/lib/spatialite_i.lib ^
161161
-D PYTHON_EXECUTABLE=%O4W_ROOT%/bin/python3.exe ^
162-
-D PYTHON_INCLUDE_PATH=%O4W_ROOT%/apps/Python36/include ^
163-
-D PYTHON_LIBRARY=%O4W_ROOT%/apps/Python36/libs/python36.lib ^
164-
-D QT_BINARY_DIR=%O4W_ROOT%/bin ^
162+
-D SIP_BINARY_PATH=%PYTHONHOME:\=/%/sip.exe ^
163+
-D PYTHON_INCLUDE_PATH=%PYTHONHOME:\=/%/include ^
164+
-D PYTHON_LIBRARY=%PYTHONHOME:\=/%/libs/%PYVER%.lib ^
165165
-D QT_LIBRARY_DIR=%O4W_ROOT%/lib ^
166-
-D QT_HEADERS_DIR=%O4W_ROOT%/apps/qt5/include ^
167166
-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
168167
-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^
169168
-D FCGI_LIBRARY=%O4W_ROOT%/lib/libfcgi.lib ^
@@ -366,7 +365,7 @@ move %OSGEO4W_ROOT%\apps\qt5\plugins\designer\qgis_customwidgets.dll %PKGDIR%\qt
366365
if errorlevel 1 (echo move of customwidgets failed & goto error)
367366

368367
if not exist %PKGDIR%\python\PyQt5\uic\widget-plugins mkdir %PKGDIR%\python\PyQt5\uic\widget-plugins
369-
move %OSGEO4W_ROOT%\apps\Python36\Lib\site-packages\PyQt5\uic\widget-plugins\qgis_customwidgets.py %PKGDIR%\python\PyQt5\uic\widget-plugins
368+
move %PYTHONHOME%\Lib\site-packages\PyQt5\uic\widget-plugins\qgis_customwidgets.py %PKGDIR%\python\PyQt5\uic\widget-plugins
370369
if errorlevel 1 (echo move of customwidgets binding failed & goto error)
371370

372371
if not exist %ARCH%\release\qgis\%PACKAGENAME% mkdir %ARCH%\release\qgis\%PACKAGENAME%

0 commit comments

Comments
 (0)