Skip to content
Permalink
Browse files
install and package pyis (fixes #41264)
  • Loading branch information
jef-n committed Jun 9, 2021
1 parent 76c7d11 commit f8e2adb84c2d5841f25a443f8eddddcfd5761bbc
Showing with 9 additions and 6 deletions.
  1. +1 −1 debian/python3-qgis-common.install
  2. +1 −5 debian/python3-qgis.install
  3. +2 −0 ms-windows/osgeo4w/package.cmd
  4. +5 −0 python/CMakeLists.txt
@@ -1,5 +1,5 @@
usr/lib/python*/*-packages/PyQt?/uic/widget-plugins/qgis_customwidgets.py
usr/lib/python*/*-packages/qgis/*.py
usr/lib/python*/*-packages/qgis/*.py*
usr/lib/python*/*-packages/qgis/PyQt/*
usr/lib/python*/*-packages/qgis/processing/*
usr/lib/python*/*-packages/qgis/testing/*
@@ -1,10 +1,6 @@
usr/lib/python*/*-packages/qgis/3d/__init__.py
usr/lib/python*/*-packages/qgis/_3d.so
usr/lib/python*/*-packages/qgis/_analysis.so
usr/lib/python*/*-packages/qgis/_core.so
usr/lib/python*/*-packages/qgis/_gui.so
usr/lib/python*/*-packages/qgis/_server.so
usr/lib/python*/*-packages/qgis/analysis/__init__.py
usr/lib/python*/*-packages/qgis/core/__init__.py
usr/lib/python*/*-packages/qgis/gui/__init__.py
usr/lib/python*/*-packages/qgis/server/__init__.py
usr/lib/python*/*-packages/qgis/*.so
@@ -334,6 +334,7 @@ if errorlevel 1 (echo tar common failed & goto error)
"apps/%PACKAGENAME%/resources/server/" ^
"apps/%PACKAGENAME%/server/" ^
"apps/%PACKAGENAME%/python/qgis/_server.pyd" ^
"apps/%PACKAGENAME%/python/qgis/_server.pyi" ^
"apps/%PACKAGENAME%/python/qgis/server/" ^
"httpd.d/httpd_%PACKAGENAME%.conf.tmpl" ^
"etc/postinstall/%PACKAGENAME%-server.bat" ^
@@ -369,6 +370,7 @@ if not exist %ARCH%\release\qgis\%PACKAGENAME% mkdir %ARCH%\release\qgis\%PACKAG
--exclude-from exclude ^
--exclude "*.pyc" ^
--exclude "apps/%PACKAGENAME%/python/qgis/_server.pyd" ^
--exclude "apps/%PACKAGENAME%/python/qgis/_server.pyi" ^
--exclude "apps/%PACKAGENAME%/python/qgis/_server.lib" ^
--exclude "apps/%PACKAGENAME%/python/qgis/server" ^
--exclude "apps/%PACKAGENAME%/server/" ^
@@ -369,3 +369,8 @@ foreach(module ${PY_MODULES})
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${module}/auto_generated DESTINATION ${SIP_DEFAULT_SIP_DIR}/qgis/${module})
endif()
endforeach(module)

if((${SIP_VERSION_STR} VERSION_EQUAL 4.18) OR (${SIP_VERSION_STR} VERSION_GREATER 4.18))
file(GLOB PY_PYIS ${QGIS_PYTHON_OUTPUT_DIRECTORY}/*.pyi)
install(FILES ${PY_PYIS} DESTINATION ${QGIS_PYTHON_DIR})
endif()

1 comment on commit f8e2adb

@SrNetoChan

This comment has been minimized.

Copy link
Member

@SrNetoChan SrNetoChan commented on f8e2adb Jun 11, 2021

@jef-n could this be backported to 3.16 release?

Please sign in to comment.