packaging updates for qgis_process (followup bfadf47)

qgis · Apr 24, 2020 · 8ee4d05 · 8ee4d05
1 parent 9183f7b
commit 8ee4d05
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 0 deletions.
diff --git a/debian/rules b/debian/rules
@@ -316,6 +316,7 @@ override_dh_auto_install:
 	# qgis binaries
 	install -o root -g root -m 755 -d $(CURDIR)/debian/qgis/usr/bin
 	install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qgis $(CURDIR)/debian/qgis/usr/bin/qgis.bin
+	install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qgis_process $(CURDIR)/debian/qgis/usr/bin/qgis_process.bin
 
 	$(RM) $(CURDIR)/debian/tmp/usr/bin/qgis
 
@@ -326,6 +327,7 @@ override_dh_auto_install:
 		$(CURDIR)/debian/qgis.sh.in >$(CURDIR)/debian/qgis.sh
 
 	install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis/usr/bin/qgis
+	install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis/usr/bin/qgis_process
 
 override_dh_missing:
 	dh_missing --fail-missing

diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd
@@ -255,6 +255,9 @@ for %%g IN (%GRASS_VERSIONS%) do (
 sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' python.bat.tmpl >%OSGEO4W_ROOT%\bin\python-%PACKAGENAME%.bat.tmpl
 if errorlevel 1 (echo creation of python wrapper template failed & goto error)
 
+sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' process.bat.tmpl >%OSGEO4W_ROOT%\bin\qgis_process-%PACKAGENAME%.bat.tmpl
+if errorlevel 1 (echo creation of qgis process wrapper template failed & goto error)
+
 touch exclude
 if exist ..\skipbuild (echo skip build & goto skipbuild)
 
@@ -292,6 +295,7 @@ if not exist %ARCH%\release\qgis\%PACKAGENAME% mkdir %ARCH%\release\qgis\%PACKAG
 	%batches% ^
 	bin/%PACKAGENAME%-designer.bat.tmpl ^
 	bin/python-%PACKAGENAME%.bat.tmpl ^
+	bin/qgis_process-%PACKAGENAME%.bat.tmpl ^
 	etc/postinstall/%PACKAGENAME%.bat ^
 	etc/preremove/%PACKAGENAME%.bat
 if errorlevel 1 (echo tar failed & goto error)

diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -264,6 +264,9 @@ for %%g IN (%GRASS_VERSIONS%) do (
 sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' python.bat.tmpl >%OSGEO4W_ROOT%\bin\python-%PACKAGENAME%.bat.tmpl
 if errorlevel 1 (echo creation of python wrapper template failed & goto error)
 
+sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' process.bat.tmpl >%OSGEO4W_ROOT%\bin\qgis_process-%PACKAGENAME%.bat.tmpl
+if errorlevel 1 (echo creation of qgis process wrapper template failed & goto error)
+
 sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' preremove-grass-plugin-common.bat >%OSGEO4W_ROOT%\etc\preremove\%PACKAGENAME%-grass-plugin-common.bat
 if errorlevel 1 (echo creation of grass common preremove failed & goto error)
 sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' postinstall-grass-plugin-common.bat >%OSGEO4W_ROOT%\etc\postinstall\%PACKAGENAME%-grass-plugin-common.bat
@@ -285,6 +288,7 @@ for %%i in (%packages%) do (
 	"apps/%PACKAGENAME%/bin/qgis_core.dll" ^
 	"apps/%PACKAGENAME%/bin/qgis_gui.dll" ^
 	"apps/%PACKAGENAME%/bin/qgis_native.dll" ^
+	"apps/%PACKAGENAME%/bin/qgis_process.exe" ^
 	"apps/%PACKAGENAME%/doc/" ^
 	"apps/%PACKAGENAME%/plugins/basicauthmethod.dll" ^
 	"apps/%PACKAGENAME%/plugins/delimitedtextprovider.dll" ^
@@ -369,6 +373,7 @@ if not exist %ARCH%\release\qgis\%PACKAGENAME% mkdir %ARCH%\release\qgis\%PACKAG
 	"bin/%PACKAGENAME%-bin.exe" ^
 	"bin/%PACKAGENAME%-bin.vars" ^
 	"bin/python-%PACKAGENAME%.bat.tmpl" ^
+	"bin/qgis_process-%PACKAGENAME%.bat.tmpl" ^
 	"apps/%PACKAGENAME%/bin/qgis_app.dll" ^
 	"apps/%PACKAGENAME%/bin/qgis.reg.tmpl" ^
 	"apps/%PACKAGENAME%/i18n/" ^

diff --git a/ms-windows/osgeo4w/postinstall-desktop.bat b/ms-windows/osgeo4w/postinstall-desktop.bat
@@ -1,6 +1,7 @@
 textreplace -std -t bin\@package@.bat
 textreplace -std -t bin\@package@-designer.bat
 textreplace -std -t bin\python-@package@.bat
+textreplace -std -t bin\qgis_process-@package@.bat
 
 REM get short path without blanks
 for %%i in ("%OSGEO4W_ROOT%") do set O4W_ROOT=%%~fsi

diff --git a/ms-windows/osgeo4w/postinstall-dev.bat b/ms-windows/osgeo4w/postinstall-dev.bat
@@ -3,6 +3,7 @@ setlocal enabledelayedexpansion
 textreplace -std -t bin\@package@.bat
 textreplace -std -t bin\@package@-designer.bat
 textreplace -std -t bin\python-@package@.bat
+textreplace -std -t bin\qgis_process-@package@.bat
 
 if "%OSGEO4W_DESKTOP%"=="" set OSGEO4W_DESKTOP=~$folder.common_desktop$
 

diff --git a/ms-windows/osgeo4w/preremove-dev.bat b/ms-windows/osgeo4w/preremove-dev.bat
@@ -22,6 +22,7 @@ rmdir "%OSGEO4W_DESKTOP%"
 del "%OSGEO4W_ROOT%\bin\@package@-bin.env"
 del "%OSGEO4W_ROOT%\bin\@package@-designer.bat"
 del "%OSGEO4W_ROOT%\bin\python-@package@.bat"
+del "%OSGEO4W_ROOT%\bin\qgis_process-@package@.bat"
 del "%OSGEO4W_ROOT%\apps\@package@\python\qgis\qgisconfig.py"
 del "%OSGEO4W_ROOT%\apps\@package@\bin\qgis.reg"
 del /s /q "%OSGEO4W_ROOT%\apps\@package@\*.pyc"

diff --git a/ms-windows/osgeo4w/process.bat.tmpl b/ms-windows/osgeo4w/process.bat.tmpl
@@ -0,0 +1,14 @@
+@echo off
+call "%~dp0\o4w_env.bat"
+call qt5_env.bat
+call py3_env.bat
+@echo off
+path %OSGEO4W_ROOT%\apps\@package@\bin;%PATH%
+set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@
+set GDAL_FILENAME_IS_UTF8=YES
+rem Set VSI cache to be used as buffer, see #6448
+set VSI_CACHE=TRUE
+set VSI_CACHE_SIZE=1000000
+set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt5\plugins
+set PYTHONPATH=%OSGEO4W_ROOT%\apps\@package@\python;%PYTHONPATH%
+"%OSGEO4W_ROOT%\apps\@package@\bin\qgis_process.exe" %*