Skip to content

Commit e6556a2

Browse files
jef-njef-n
committedJun 25, 2015
osgeo4w: update release packaging for dual grass support
·
ltr-3_40archive/master_2
1 parent 492c6d9 commit e6556a2

11 files changed

+157
-43
lines changed
 

‎ms-windows/osgeo4w/browser-grass.bat.tmpl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
@echo off
2+
call "%~dp0\o4w_env.bat"
3+
call "%OSGEO4W_ROOT%"\apps\grass\grass-@grassversion@\etc\env.bat
4+
@echo off
5+
path %OSGEO4W_ROOT%\apps\@package@\bin;%OSGEO4W_ROOT%\apps\grass\grass-@grassversion@\lib;%PATH%
6+
set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@
7+
start "QGIS Browser" /B "%OSGEO4W_ROOT%"\bin\@package@-browser-bin.exe %*

‎ms-windows/osgeo4w/browser.bat.tmpl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@echo off
22
call "%~dp0\o4w_env.bat"
3-
call "%OSGEO4W_ROOT%"\apps\grass\grass-@grassversion@\etc\env.bat
43
@echo off
5-
path %OSGEO4W_ROOT%\apps\@package@\bin;%OSGEO4W_ROOT%\apps\grass\grass-@grassversion@\lib;%PATH%
4+
path %OSGEO4W_ROOT%\apps\@package@\bin;%PATH%
65
set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@
76
start "QGIS Browser" /B "%OSGEO4W_ROOT%"\bin\@package@-browser-bin.exe %*

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ set CMAKE_OPT=^
6161
-G "Visual Studio 10" ^
6262
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python27/sip.exe ^
6363
-D QWT_LIBRARY=%O4W_ROOT%/lib/qwt.lib ^
64-
-D WITH_GRASS6=TRUE ^
64+
-D WITH_GRASS=TRUE ^
6565
-D WITH_GRASS7=TRUE ^
6666
-D GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-6.4.4 ^
6767
-D GRASS_PREFIX7=%O4W_ROOT%/apps/grass/grass-7.0.1RC1 ^
@@ -82,7 +82,7 @@ if not exist "%SETUPAPI_LIBRARY%" (echo SETUPAPI_LIBRARY not found & goto error)
8282
set CMAKE_OPT=^
8383
-G "Visual Studio 10 Win64" ^
8484
-D SPATIALINDEX_LIBRARY=%O4W_ROOT%/lib/spatialindex-64.lib ^
85-
-D WITH_GRASS6=TRUE ^
85+
-D WITH_GRASS=TRUE ^
8686
-D WITH_GRASS7=FALSE ^
8787
-D GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-6.4.3 ^
8888
-D SIP_BINARY_PATH=%O4W_ROOT%/bin/sip.exe ^
@@ -307,7 +307,6 @@ exit
307307

308308
:error
309309
echo BUILD ERROR %ERRORLEVEL%: %DATE% %TIME%
310-
echo BUILD ERROR %ERRORLEVEL%: %DATE% %TIME%
311310
if exist %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 del %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2
312311

313312
:end

‎ms-windows/osgeo4w/package.cmd

Lines changed: 114 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ REM * the Free Software Foundation; either version 2 of the License, or *
1313
REM * (at your option) any later version. *
1414
REM * *
1515
REM ***************************************************************************
16+
17+
setlocal enabledelayedexpansion
18+
1619
set VERSION=%1
1720
set PACKAGE=%2
1821
set PACKAGENAME=%3
@@ -49,19 +52,23 @@ if "%ARCH%"=="x86" goto devenv_x86
4952
goto devenv_x86_64
5053

5154
:devenv_x86
52-
set GRASS_VERSION=6.4.4
55+
set GRASS_VERSIONS=6.4.4 7.0.1RC1
5356
call "%PF86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86
5457
if exist "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" call "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /x86 /Release
5558
path %path%;%PF86%\Microsoft Visual Studio 10.0\VC\bin
5659

5760
set CMAKE_OPT=^
5861
-G "Visual Studio 10" ^
5962
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python27/sip.exe ^
60-
-D QWT_LIBRARY=%O4W_ROOT%/lib/qwt.lib
63+
-D QWT_LIBRARY=%O4W_ROOT%/lib/qwt.lib ^
64+
-D WITH_GRASS=TRUE ^
65+
-D WITH_GRASS7=TRUE ^
66+
-D GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-6.4.4 ^
67+
-D GRASS_PREFIX7=%O4W_ROOT%/apps/grass/grass-7.0.1RC1
6168
goto devenv
6269

6370
:devenv_x86_64
64-
set GRASS_VERSION=6.4.3
71+
set GRASS_VERSIONS=6.4.3
6572
call "%PF86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64
6673
if exist "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" call "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /x64 /Release
6774
path %path%;%PF86%\Microsoft Visual Studio 10.0\VC\bin
@@ -73,6 +80,9 @@ if not exist "%SETUPAPI_LIBRARY%" (echo SETUPAPI_LIBRARY not found & goto error)
7380
set CMAKE_OPT=^
7481
-G "Visual Studio 10 Win64" ^
7582
-D SPATIALINDEX_LIBRARY=%O4W_ROOT%/lib/spatialindex-64.lib ^
83+
-D WITH_GRASS=TRUE ^
84+
-D WITH_GRASS7=FALSE ^
85+
-D GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-6.4.3 ^
7686
-D SIP_BINARY_PATH=%O4W_ROOT%/bin/sip.exe ^
7787
-D QWT_LIBRARY=%O4W_ROOT%/lib/qwt5.lib ^
7888
-D SETUPAPI_LIBRARY="%SETUPAPI_LIBRARY%" ^
@@ -92,6 +102,8 @@ set SRCDIR=%CD%
92102
if "%BUILDDIR:~1,1%"==":" %BUILDDIR:~0,2%
93103
cd %BUILDDIR%
94104

105+
set PKGDIR=%OSGEO4W_ROOT%\apps\%PACKAGENAME%
106+
95107
if exist repackage goto package
96108

97109
if not exist build.log goto build
@@ -132,7 +144,6 @@ if errorlevel 1 goto error
132144

133145
set LIB=%LIB%;%OSGEO4W_ROOT%\lib
134146
set INCLUDE=%INCLUDE%;%OSGEO4W_ROOT%\include
135-
set GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-%GRASS_VERSION%
136147

137148
cmake %CMAKE_OPT% ^
138149
-D PEDANTIC=TRUE ^
@@ -142,7 +153,6 @@ cmake %CMAKE_OPT% ^
142153
-D WITH_GLOBE=TRUE ^
143154
-D WITH_TOUCH=TRUE ^
144155
-D WITH_ORACLE=TRUE ^
145-
-D WITH_GRASS=TRUE ^
146156
-D WITH_CUSTOM_WIDGETS=TRUE ^
147157
-D CMAKE_CXX_FLAGS_RELEASE="/MD /MP /O2 /Ob2 /D NDEBUG" ^
148158
-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
@@ -181,13 +191,24 @@ cmake --build %BUILDDIR% --config %BUILDCONF%
181191
if errorlevel 1 cmake --build %BUILDDIR% --config %BUILDCONF%
182192
if errorlevel 1 (echo build failed twice & goto error)
183193

184-
if not exist ..\skiptests (
185-
echo RUN_TESTS: %DATE% %TIME%
186-
cmake --build %BUILDDIR% --target Experimental --config %BUILDCONF%
187-
if errorlevel 1 echo TESTS WERE NOT SUCCESSFUL.
194+
if exist ..\skiptests goto skiptests
195+
196+
echo RUN_TESTS: %DATE% %TIME%
197+
198+
set oldpath=%PATH%
199+
for %%g IN (%GRASS_VERSIONS%) do (
200+
set path=!path!;%OSGEO4W_ROOT%\apps\grass\grass-%%g\lib
201+
set GISBASE=%OSGEO4W_ROOT%\apps\grass\grass-%%g
188202
)
203+
PATH %path%;%BUILDDIR%\output\plugins\%BUILDCONF%
189204

190-
set PKGDIR=%OSGEO4W_ROOT%\apps\%PACKAGENAME%
205+
cmake --build %BUILDDIR% --target Experimental --config %BUILDCONF%
206+
if errorlevel 1 echo TESTS WERE NOT SUCCESSFUL.
207+
208+
PATH %oldpath%
209+
210+
:skiptests
211+
:package
191212

192213
if exist %PKGDIR% (
193214
echo REMOVE: %DATE% %TIME%
@@ -198,40 +219,65 @@ echo INSTALL: %DATE% %TIME%
198219
cmake --build %BUILDDIR% --target INSTALL --config %BUILDCONF%
199220
if errorlevel 1 (echo INSTALL failed & goto error)
200221

201-
:package
202222
echo PACKAGE: %DATE% %TIME%
203223

204224
cd ..
205-
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' postinstall-common.bat >%OSGEO4W_ROOT%\etc\postinstall\%PACKAGENAME%-common.bat
225+
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' postinstall-common.bat >%OSGEO4W_ROOT%\etc\postinstall\%PACKAGENAME%-common.bat
206226
if errorlevel 1 (echo creation of common postinstall failed & goto error)
207-
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' postinstall-desktop.bat >%OSGEO4W_ROOT%\etc\postinstall\%PACKAGENAME%.bat
227+
228+
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' postinstall-desktop.bat >%OSGEO4W_ROOT%\etc\postinstall\%PACKAGENAME%.bat
208229
if errorlevel 1 (echo creation of desktop postinstall failed & goto error)
209-
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' preremove-desktop.bat >%OSGEO4W_ROOT%\etc\preremove\%PACKAGENAME%.bat
230+
231+
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' preremove-desktop.bat >%OSGEO4W_ROOT%\etc\preremove\%PACKAGENAME%.bat
210232
if errorlevel 1 (echo creation of desktop preremove failed & goto error)
211-
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' qgis.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%.bat.tmpl
233+
234+
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' qgis.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%.bat.tmpl
212235
if errorlevel 1 (echo creation of desktop template failed & goto error)
213-
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' designer-qgis.bat.tmpl >%OSGEO4W_ROOT%\bin\designer-%PACKAGENAME%.bat.tmpl
214-
if errorlevel 1 (echo creation of designer template failed & goto error)
215-
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' browser.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser.bat.tmpl
236+
237+
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' browser.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser.bat.tmpl
216238
if errorlevel 1 (echo creation of browser template & goto error)
217-
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' qgis.reg.tmpl >%PKGDIR%\bin\qgis.reg.tmpl
239+
240+
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' designer.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%-designer.bat.tmpl
241+
if errorlevel 1 (echo creation of designer template failed & goto error)
242+
243+
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' python.bat.tmpl >%OSGEO4W_ROOT%\bin\python-%PACKAGENAME%.bat.tmpl
244+
if errorlevel 1 (echo creation of python wrapper template failed & goto error)
245+
246+
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' qgis.reg.tmpl >%PKGDIR%\bin\qgis.reg.tmpl
218247
if errorlevel 1 (echo creation of registry template & goto error)
219-
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' postinstall-server.bat >%OSGEO4W_ROOT%\etc\postinstall\%PACKAGENAME%-server.bat
248+
249+
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' postinstall-server.bat >%OSGEO4W_ROOT%\etc\postinstall\%PACKAGENAME%-server.bat
220250
if errorlevel 1 (echo creation of server postinstall failed & goto error)
221-
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' preremove-server.bat >%OSGEO4W_ROOT%\etc\preremove\%PACKAGENAME%-server.bat
251+
252+
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' preremove-server.bat >%OSGEO4W_ROOT%\etc\preremove\%PACKAGENAME%-server.bat
222253
if errorlevel 1 (echo creation of server preremove failed & goto error)
254+
223255
if not exist %OSGEO4W_ROOT%\httpd.d mkdir %OSGEO4W_ROOT%\httpd.d
224-
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' httpd.conf.tmpl >%OSGEO4W_ROOT%\httpd.d\httpd_%PACKAGENAME%.conf.tmpl
256+
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' httpd.conf.tmpl >%OSGEO4W_ROOT%\httpd.d\httpd_%PACKAGENAME%.conf.tmpl
225257
if errorlevel 1 (echo creation of httpd.conf template failed & goto error)
226258

227-
REM sed -e 's/%OSGEO4W_ROOT:\=\\\\\\\\%/@osgeo4w@/' %PKGDIR%\python\qgis\qgisconfig.py >%PKGDIR%\python\qgis\qgisconfig.py.tmpl
228-
REM if errorlevel 1 (echo creation of qgisconfig.py.tmpl failed & goto error)
259+
set packages="" "-common" "-server" "-devel" "-globe-plugin" "-oracle-provider" "-grass-plugin-common"
260+
261+
for %%g IN (%GRASS_VERSIONS%) do (
262+
for /F "delims=." %%i in ("%%g") do set v=%%i
263+
set w=!v!
264+
if !v!==6 set w=
265+
266+
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%%g/g' -e 's/@grassmajor@/!v!/g' postinstall-grass.bat >%OSGEO4W_ROOT%\etc\postinstall\%PACKAGENAME%-grass-plugin!w!.bat
267+
if errorlevel 1 (echo creation of grass desktop postinstall failed & goto error)
268+
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%%g/g' -e 's/@grassmajor@/!v!/g' preremove-grass.bat >%OSGEO4W_ROOT%\etc\preremove\%PACKAGENAME%-grass-plugin!w!.bat
269+
if errorlevel 1 (echo creation of grass desktop preremove failed & goto error)
270+
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%%g/g' -e 's/@grassmajor@/!v!/g' qgis-grass.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%-grass!v!.bat.tmpl
271+
if errorlevel 1 (echo creation of grass desktop template failed & goto error)
272+
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%%g/g' -e 's/@grassmajor@/!v!/g' browser-grass.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser-grass!v!.bat.tmpl
273+
if errorlevel 1 (echo creation of grass browser template & goto error)
229274

230-
REM del %PKGDIR%\python\qgis\qgisconfig.py
275+
set packages=!packages! "-grass-plugin!w!"
276+
)
231277

232278
touch exclude
233279

234-
for %%i in ("" "-common" "-server" "-devel" "-grass-plugin" "-globe-plugin" "-oracle-provider") do (
280+
for %%i in (%packages%) do (
235281
if not exist %ARCH%\release\qgis\%PACKAGENAME%%%i mkdir %ARCH%\release\qgis\%PACKAGENAME%%%i
236282
)
237283

@@ -273,6 +319,7 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%-server/%PACKAGENAME
273319
"apps/%PACKAGENAME%/bin/qgis_server.dll" ^
274320
"apps/%PACKAGENAME%/bin/admin.sld" ^
275321
"apps/%PACKAGENAME%/bin/wms_metadata.xml" ^
322+
"apps/%PACKAGENAME%/bin/schemaExtension.xsd" ^
276323
"apps/%PACKAGENAME%/python/qgis/_server.pyd" ^
277324
"apps/%PACKAGENAME%/python/qgis/_server.lib" ^
278325
"apps/%PACKAGENAME%/python/qgis/server/" ^
@@ -306,7 +353,7 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%/%PACKAGENAME%-%VERS
306353
--exclude "*.pyc" ^
307354
--exclude "apps/%PACKAGENAME%/python/qgis/_server.pyd" ^
308355
--exclude "apps/%PACKAGENAME%/python/qgis/_server.lib" ^
309-
--exclude "apps/%PACKAGENAME%/python/qgis/server/" ^
356+
--exclude "apps/%PACKAGENAME%/python/qgis/server" ^
310357
"bin/%PACKAGENAME%-browser-bin.exe" ^
311358
"bin/%PACKAGENAME%-bin.exe" ^
312359
"apps/%PACKAGENAME%/bin/qgis.reg.tmpl" ^
@@ -335,22 +382,52 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%/%PACKAGENAME%-%VERS
335382
"apps/%PACKAGENAME%/resources/customization.xml" ^
336383
"bin/%PACKAGENAME%.bat.tmpl" ^
337384
"bin/%PACKAGENAME%-browser.bat.tmpl" ^
385+
"bin/%PACKAGENAME%-designer.bat.tmpl" ^
338386
"etc/postinstall/%PACKAGENAME%.bat" ^
339387
"etc/preremove/%PACKAGENAME%.bat"
340388
if errorlevel 1 (echo tar desktop failed & goto error)
341389

342-
tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%-grass-plugin/%PACKAGENAME%-grass-plugin-%VERSION%-%PACKAGE%.tar.bz2 ^
390+
tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%-grass-plugin-common/%PACKAGENAME%-grass-plugin-common-%VERSION%-%PACKAGE%.tar.bz2 ^
343391
--exclude-from exclude ^
344392
--exclude "*.pyc" ^
345-
"apps/%PACKAGENAME%/grass" ^
346-
"apps/%PACKAGENAME%/bin/qgisgrass.dll" ^
347-
"apps/%PACKAGENAME%/plugins/grassrasterprovider.dll" ^
348-
"apps/%PACKAGENAME%/plugins/grassplugin.dll" ^
349-
"apps/%PACKAGENAME%/plugins/grassprovider.dll"
393+
--exclude "apps/%PACKAGENAME%/grass/modules/qgis.d.rast6.exe" ^
394+
--exclude "apps/%PACKAGENAME%/grass/modules/qgis.d.rast7.exe" ^
395+
--exclude "apps/%PACKAGENAME%/grass/modules/qgis.g.info6.exe" ^
396+
--exclude "apps/%PACKAGENAME%/grass/modules/qgis.g.info7.exe" ^
397+
--exclude "apps/%PACKAGENAME%/grass/modules/qgis.r.in6.exe" ^
398+
--exclude "apps/%PACKAGENAME%/grass/modules/qgis.r.in7.exe" ^
399+
--exclude "apps/%PACKAGENAME%/grass/modules/qgis.v.in6.exe" ^
400+
--exclude "apps/%PACKAGENAME%/grass/modules/qgis.v.in7.exe" ^
401+
--exclude "apps/%PACKAGENAME%/grass/bin/qgis.g.browser6.exe" ^
402+
--exclude "apps/%PACKAGENAME%/grass/bin/qgis.g.browser7.exe" ^
403+
"apps/%PACKAGENAME%/grass"
350404
if errorlevel 1 (echo tar grass-plugin failed & goto error)
351405

352-
REM grass direct library disabled
353-
REM "apps/%PACKAGENAME%/plugins/libgrass_gis.%GRASS_VERSION%.dll"
406+
for %%g IN (%GRASS_VERSIONS%) do (
407+
for /F "delims=." %%i in ("%%g") do set v=%%i
408+
set w=!v!
409+
if !v!==6 set w=
410+
411+
set files="apps/%PACKAGENAME%/bin/qgisgrass!v!.dll" ^
412+
"apps/%PACKAGENAME%/grass/modules/qgis.d.rast!v!.exe" ^
413+
"apps/%PACKAGENAME%/grass/modules/qgis.g.info!v!.exe" ^
414+
"apps/%PACKAGENAME%/grass/modules/qgis.r.in!v!.exe" ^
415+
"apps/%PACKAGENAME%/grass/modules/qgis.v.in!v!.exe" ^
416+
"apps/%PACKAGENAME%/plugins/grassrasterprovider!v!.dll" ^
417+
"apps/%PACKAGENAME%/plugins/grassprovider!v!.dll" ^
418+
"etc/preremove/%PACKAGENAME%-grass-plugin!v!.bat" ^
419+
"bin/%PACKAGENAME%-grass!v!.bat.tmpl" ^
420+
"bin/%PACKAGENAME%-browser-grass!v!.bat.tmpl" ^
421+
"etc/postinstall/%PACKAGENAME%-grass-plugin!v!.bat"
422+
423+
if !v!==6 set files=!files! ^
424+
"apps/%PACKAGENAME%/plugins/grassplugin!v!.dll" ^
425+
"apps/%PACKAGENAME%/grass/bin/qgis.g.browser!v!.exe"
426+
427+
tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%-grass-plugin!w!/%PACKAGENAME%-grass-plugin!w!-%VERSION%-%PACKAGE%.tar.bz2 ^
428+
!files!
429+
if errorlevel 1 (echo tar grass-plugin!w! failed & goto error)
430+
)
354431

355432
tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%-globe-plugin/%PACKAGENAME%-globe-plugin-%VERSION%-%PACKAGE%.tar.bz2 ^
356433
--exclude-from exclude ^
@@ -387,3 +464,5 @@ for %%i in ("" "-common" "-server" "-devel" "-grass-plugin" "-globe-plugin" "-or
387464

388465
:end
389466
echo FINISHED: %DATE% %TIME%
467+
468+
endlocal

‎ms-windows/osgeo4w/postinstall-desktop.bat

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
textreplace -std -t bin\@package@.bat
22
textreplace -std -t bin\@package@-browser.bat
3+
textreplace -std -t bin\@package@-designer.bat
4+
textreplace -std -t bin\python-@package@.bat
35

46
REM get short path without blanks
57
for %%i in ("%OSGEO4W_ROOT%") do set O4W_ROOT=%%~fsi
68

79
if not %OSGEO4W_MENU_LINKS%==0 mkdir "%OSGEO4W_STARTMENU%"
810
if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_STARTMENU%" "QGIS Desktop @version@" "exec hide %O4W_ROOT%\bin\@package@.bat" "%O4W_ROOT%\apps\@package@\icons\QGIS.ico"
911
if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_STARTMENU%" "QGIS Browser @version@" "exec hide %O4W_ROOT%\bin\@package@-browser.bat" "%O4W_ROOT%\apps\@package@\icons\browser.ico"
12+
if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_STARTMENU%" "Qt Designer with QGIS @version@ custom widgets" "exec hide """%OSGEO4W_ROOT%\bin\@package@-designer.bat"" "%O4W_ROOT%\apps\@package@\icons\QGIS.ico"
1013

1114
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\nircmd.exe" "~$folder.desktop$" "QGIS Desktop @version@" "exec hide %O4W_ROOT%\bin\@package@.bat" "%O4W_ROOT%\apps\@package@\icons\QGIS.ico"
1215
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\nircmd.exe" "~$folder.desktop$" "QGIS Browser @version@" "exec hide %O4W_ROOT%\bin\@package@-browser.bat" "%O4W_ROOT%\apps\@package@\icons\browser.ico"
16+
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\nircmd.exe" "~$folder.desktop$" "Qt Designer with QGIS @version@ custom widgets" "exec hide %O4W_ROOT%\bin\@package@-designer.bat" "%O4W_ROOT%\apps\@package@\icons\QGIS.ico"
1317

1418
set OSGEO4W_ROOT=%OSGEO4W_ROOT:\=\\%
1519
textreplace -std -t "%O4W_ROOT%\apps\@package@\bin\qgis.reg"

‎ms-windows/osgeo4w/postinstall-grass.bat

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
textreplace -std -t bin\@package@-grass@grassmajor@.bat
2+
textreplace -std -t bin\@package@-browser-grass@grassmajor@.bat
3+
4+
if not %OSGEO4W_MENU_LINKS%==0 mkdir "%OSGEO4W_STARTMENU%"
5+
if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_STARTMENU%" "QGIS Desktop @version@ with GRASS @grassversion@" "exec hide %OSGEO4W_ROOT%\bin\@package@-grass@grassmajor@.bat" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
6+
if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_STARTMENU%" "QGIS Browser @version@ with GRASS @grassversion@" "exec hide %OSGEO4W_ROOT%\bin\@package@-browser-grass@grassmajor@.bat" "%OSGEO4W_ROOT%\apps\@package@\icons\browser.ico"
7+
8+
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "~$folder.desktop$" "QGIS Desktop @version@ with GRASS @grassversion@" "exec hide %OSGEO4W_ROOT%\bin\@package@-grass@grassmajor@.bat" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
9+
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "~$folder.desktop$" "QGIS Browser @version@ with GRASS @grassversion@" "exec hide %OSGEO4W_ROOT%\bin\@package@-browser-grass@grassmajor@.bat" "%OSGEO4W_ROOT%\apps\@package@\icons\browser.ico"

‎ms-windows/osgeo4w/preremove-desktop.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ del "%ALLUSERSPROFILE%\Desktop\QGIS Browser @version@.lnk"
66
del "%ALLUSERSPROFILE%\Desktop\Qt Designer with QGIS @version@ custom widgets.lnk"
77
del "%OSGEO4W_ROOT%"\bin\@package@.bat
88
del "%OSGEO4W_ROOT%"\bin\@package@-browser.bat
9-
del "%OSGEO4W_ROOT%"\bin\designer-@package@.bat
9+
del "%OSGEO4W_ROOT%"\bin\@package@-designer.bat
1010
del "%OSGEO4W_ROOT%"\apps\@package@\python\qgis\qgisconfig.py
1111
del "%OSGEO4W_ROOT%"\apps\@package@\bin\qgis.reg

‎ms-windows/osgeo4w/preremove-grass.bat

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
del "%OSGEO4W_STARTMENU%\QGIS Desktop @version@ with GRASS @grassversion@.lnk"
2+
del "%OSGEO4W_STARTMENU%\QGIS Browser @version@ with GRASS @grassversion@.lnk"
3+
del "%ALLUSERSPROFILE%\Desktop\QGIS Desktop @version@ with GRASS @grassversion@.lnk"
4+
del "%ALLUSERSPROFILE%\Desktop\QGIS Browser @version@ with GRASS @grassversion@.lnk"
5+
del "%OSGEO4W_ROOT%"\bin\@package@-grass@grassmajor@.bat
6+
del "%OSGEO4W_ROOT%"\bin\@package@-browser-grass@grassmajor@.bat

‎ms-windows/osgeo4w/qgis-grass.bat.tmpl

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
@echo off
2+
call "%~dp0\o4w_env.bat"
3+
call "%OSGEO4W_ROOT%"\apps\grass\grass-@grassversion@\etc\env.bat
4+
@echo off
5+
path %OSGEO4W_ROOT%\apps\@package@\bin;%OSGEO4W_ROOT%\apps\grass\grass-@grassversion@\lib;%PATH%
6+
set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@
7+
set GDAL_FILENAME_IS_UTF8=YES
8+
rem Set VSI cache to be used as buffer, see #6448
9+
set VSI_CACHE=TRUE
10+
set VSI_CACHE_SIZE=1000000
11+
set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt4\plugins
12+
start "QGIS" /B "%OSGEO4W_ROOT%"\bin\@package@-bin.exe %*

‎ms-windows/osgeo4w/qgis.bat.tmpl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
@echo off
22
call "%~dp0\o4w_env.bat"
3-
call "%OSGEO4W_ROOT%"\apps\grass\grass-@grassversion@\etc\env.bat
43
@echo off
5-
path %OSGEO4W_ROOT%\apps\@package@\bin;%OSGEO4W_ROOT%\apps\grass\grass-@grassversion@\lib;%PATH%
4+
path %OSGEO4W_ROOT%\apps\@package@\bin;%PATH%
65
set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@
76
set GDAL_FILENAME_IS_UTF8=YES
87
rem Set VSI cache to be used as buffer, see #6448

0 commit comments

Comments
 (0)
Please sign in to comment.