qgis{,-ltr}-server: set python home dynamically (fixes #711)

jef-n · Dec 19, 2021 · d178d64 · d178d64
1 parent 6fec4f5
commit d178d64
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/src/qgis-ltr/osgeo4w/httpd.conf.tmpl b/src/qgis-ltr/osgeo4w/httpd.conf.tmpl
@@ -12,8 +12,8 @@ DefaultInitEnv PATH "@osgeo4w@\apps\qt5\bin;@osgeo4w@\bin;@osgeo4w@\apps\@packag
 DefaultInitEnv QGIS_PREFIX_PATH "@osgeo4w@\apps\@package@"
 DefaultInitEnv QT_PLUGIN_PATH "@osgeo4w@\apps\@package@\qtplugins;@osgeo4w@\apps\qt5\plugins"
 DefaultInitEnv TEMP "@temp@"
-DefaultInitEnv PYTHONHOME "@osgeo4w@\apps\Python37"
-DefaultInitEnv PYTHONPATH "@osgeo4w@\apps\Python37;@osgeo4w@\apps\Python37\Scripts"
+DefaultInitEnv PYTHONHOME "@pythonhome@"
+DefaultInitEnv PYTHONPATH "@pythonhome@;@pythonhome@\Scripts"
 
 Alias /@package@/ @osgeo4w@/apps/@package@/bin/
 

diff --git a/src/qgis-ltr/osgeo4w/postinstall-server.bat b/src/qgis-ltr/osgeo4w/postinstall-server.bat
@@ -2,5 +2,6 @@ call "%OSGEO4W_ROOT%\bin\o4w_env.bat"
 textreplace -std ^
 	-map @windir@ "%WINDIR%" ^
 	-map @temp@ "%TEMP%" ^
+	-map @pythonhome@ "%PYTHONHOME%" ^
 	-t httpd.d\httpd_@package@.conf
 del httpd.d\httpd_@package@.conf.tmpl
diff --git a/src/qgis/osgeo4w/httpd.conf.tmpl b/src/qgis/osgeo4w/httpd.conf.tmpl
@@ -12,8 +12,8 @@ DefaultInitEnv PATH "@osgeo4w@\apps\qt5\bin;@osgeo4w@\bin;@osgeo4w@\apps\@packag
 DefaultInitEnv QGIS_PREFIX_PATH "@osgeo4w@\apps\@package@"
 DefaultInitEnv QT_PLUGIN_PATH "@osgeo4w@\apps\@package@\qtplugins;@osgeo4w@\apps\qt5\plugins"
 DefaultInitEnv TEMP "@temp@"
-DefaultInitEnv PYTHONHOME "@osgeo4w@\apps\Python37"
-DefaultInitEnv PYTHONPATH "@osgeo4w@\apps\Python37;@osgeo4w@\apps\Python37\Scripts"
+DefaultInitEnv PYTHONHOME "@pythonhome@"
+DefaultInitEnv PYTHONPATH "@pythonhome@;@pythonhome@\Scripts"
 
 Alias /@package@/ @osgeo4w@/apps/@package@/bin/
 

diff --git a/src/qgis/osgeo4w/postinstall-server.bat b/src/qgis/osgeo4w/postinstall-server.bat
@@ -2,5 +2,6 @@ call "%OSGEO4W_ROOT%\bin\o4w_env.bat"
 textreplace -std ^
 	-map @windir@ "%WINDIR%" ^
 	-map @temp@ "%TEMP%" ^
+	-map @pythonhome@ "%PYTHONHOME%" ^
 	-t httpd.d\httpd_@package@.conf
 del httpd.d\httpd_@package@.conf.tmpl