Skip to content

Commit 9eb0e6c

Browse files
committed
osgeo4w: also exclude the external python libraries in release packages and
skip the disabled grass direct library
1 parent 747c7ff commit 9eb0e6c

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

ms-windows/osgeo4w/package.cmd

+11-2
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,12 @@ cmake %CMAKE_OPT% ^
158158
-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
159159
-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^
160160
-D FCGI_LIBRARY=%O4W_ROOT%/lib/libfcgi.lib ^
161+
-D WITH_INTERNAL_JINJA2=FALSE ^
162+
-D WITH_INTERNAL_MARKUPSAFE=FALSE ^
163+
-D WITH_INTERNAL_PYGMENTS=FALSE ^
164+
-D WITH_INTERNAL_DATEUTIL=FALSE ^
165+
-D WITH_INTERNAL_PYTZ=FALSE ^
166+
-D WITH_INTERNAL_SIX=FALSE ^
161167
%SRCDIR%
162168
if errorlevel 1 (echo cmake failed & goto error)
163169

@@ -308,10 +314,13 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%-grass-plugin/%PACKA
308314
"apps/%PACKAGENAME%/bin/qgisgrass.dll" ^
309315
"apps/%PACKAGENAME%/plugins/grassrasterprovider.dll" ^
310316
"apps/%PACKAGENAME%/plugins/grassplugin.dll" ^
311-
"apps/%PACKAGENAME%/plugins/grassprovider.dll" ^
312-
"apps/%PACKAGENAME%/plugins/libgrass_gis.%GRASS_VERSION%.dll"
317+
"apps/%PACKAGENAME%/plugins/grassprovider.dll"
313318
if errorlevel 1 (echo tar grass-plugin failed & goto error)
314319

320+
REM grass direct library disabled
321+
REM "apps/%PACKAGENAME%/plugins/libgrass_gis.%GRASS_VERSION%.dll"
322+
323+
315324
tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%-globe-plugin/%PACKAGENAME%-globe-plugin-%VERSION%-%PACKAGE%.tar.bz2 ^
316325
--exclude-from exclude ^
317326
--exclude "*.pyc" ^

0 commit comments

Comments
 (0)