Skip to content

Commit 7219336

Browse files
jef-njef-n
committed
GRASS 6/7 build fixes:
* fix build on windows * fix grass build on precise (using cmake <2.8.8, ie. without INCLUDE_DIRECTORIES target property) * support desktop & browser shortcut for GRASS 6/7 in OSGeo4W nightly build
1 parent 5aaa125 commit 7219336

27 files changed

+261
-185
lines changed

‎debian/rules‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ CMAKE_OPTS := \
5151
-DWITH_QSPATIALITE=TRUE \
5252
-DWITH_SERVER=TRUE \
5353
-DWITH_SERVER_PLUGINS=TRUE \
54+
-DWITH_GRASS7=FALSE \
5455
-DSERVER_SKIP_ECW=TRUE \
5556
-DQGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
5657
-DWITH_APIDOC=TRUE \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@echo off
22
call "%~dp0\o4w_env.bat"
3-
path %OSGEO4W_ROOT%\apps\@package@\bin;%OSGEO4W_ROOT%\apps\grass\grass-@grassversion@\lib;%PATH%
3+
path %OSGEO4W_ROOT%\apps\@package@\bin;%PATH%
44
set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@
55
set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt4\plugins
66
start "Qt Designer with QGIS custom widgets" /B "%OSGEO4W_ROOT%"\bin\designer.exe %*

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

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ if "%ARCH%"=="x86" goto devenv_x86
4949
goto devenv_x86_64
5050

5151
:devenv_x86
52-
set GRASS_VERSION=6.4.4
52+
set GRASS_VERSIONS=6.4.4 7.0.0
5353
call "%PF86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86
5454
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
5555
path %path%;%PF86%\Microsoft Visual Studio 10.0\VC\bin
@@ -59,12 +59,16 @@ set CMAKE_OPT=^
5959
-D BUILDNAME="OSGeo4W-Nightly-VC10-32" ^
6060
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python27/sip.exe ^
6161
-D QWT_LIBRARY=%O4W_ROOT%/lib/qwt.lib ^
62+
-D WITH_GRASS6=TRUE ^
63+
-D WITH_GRASS7=TRUE ^
64+
-D GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-6.4.4 ^
65+
-D GRASS_PREFIX7=%O4W_ROOT%/apps/grass/grass-7.0.0 ^
6266
-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /ZI /MP /Od /D NDEBUG /D QGISDEBUG" ^
6367
-D CMAKE_PDB_OUTPUT_DIRECTORY_RELWITHDEBINFO=%BUILDDIR%\apps\%PACKAGENAME%\pdb
6468
goto devenv
6569

6670
:devenv_x86_64
67-
set GRASS_VERSION=6.4.3
71+
set GRASS_VERSIONS=6.4.3
6872
call "%PF86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64
6973
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
7074
path %path%;%PF86%\Microsoft Visual Studio 10.0\VC\bin
@@ -77,6 +81,9 @@ set CMAKE_OPT=^
7781
-G "Visual Studio 10 Win64" ^
7882
-D BUILDNAME="OSGeo4W-Nightly-VC10-64" ^
7983
-D SPATIALINDEX_LIBRARY=%O4W_ROOT%/lib/spatialindex-64.lib ^
84+
-D WITH_GRASS6=TRUE ^
85+
-D WITH_GRASS7=FALSE ^
86+
-D GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-6.4.3 ^
8087
-D SIP_BINARY_PATH=%O4W_ROOT%/bin/sip.exe ^
8188
-D QWT_LIBRARY=%O4W_ROOT%/lib/qwt5.lib ^
8289
-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /Zi /MP /Od /D NDEBUG /D QGISDEBUG" ^
@@ -98,6 +105,8 @@ set SRCDIR=%CD%
98105
if "%BUILDDIR:~1,1%"==":" %BUILDDIR:~0,2%
99106
cd %BUILDDIR%
100107

108+
set PKGDIR=%OSGEO4W_ROOT%\apps\%PACKAGENAME%
109+
101110
if exist repackage goto package
102111

103112
if not exist build.log goto build
@@ -138,7 +147,6 @@ if errorlevel 1 goto error
138147

139148
set LIB=%LIB%;%OSGEO4W_ROOT%\lib
140149
set INCLUDE=%INCLUDE%;%OSGEO4W_ROOT%\include
141-
set GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-%GRASS_VERSION%
142150

143151
cmake %CMAKE_OPT% ^
144152
-D SITE="qgis.org" ^
@@ -150,7 +158,6 @@ cmake %CMAKE_OPT% ^
150158
-D WITH_GLOBE=TRUE ^
151159
-D WITH_TOUCH=TRUE ^
152160
-D WITH_ORACLE=TRUE ^
153-
-D WITH_GRASS=TRUE ^
154161
-D WITH_CUSTOM_WIDGETS=TRUE ^
155162
-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
156163
-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
@@ -194,8 +201,6 @@ if not exist ..\skiptests (
194201
if errorlevel 1 echo TESTS WERE NOT SUCCESSFUL.
195202
)
196203

197-
set PKGDIR=%OSGEO4W_ROOT%\apps\%PACKAGENAME%
198-
199204
if exist %PKGDIR% (
200205
echo REMOVE: %DATE% %TIME%
201206
rmdir /s /q %PKGDIR%
@@ -209,19 +214,25 @@ if errorlevel 1 (echo INSTALL failed & goto error)
209214
echo PACKAGE: %DATE% %TIME%
210215

211216
cd ..
212-
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' postinstall-dev.bat >%OSGEO4W_ROOT%\etc\postinstall\%PACKAGENAME%.bat
217+
218+
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversions@/%GRASS_VERSIONS%/g' postinstall-dev.bat >%OSGEO4W_ROOT%\etc\postinstall\%PACKAGENAME%.bat
213219
if errorlevel 1 (echo creation of desktop postinstall failed & goto error)
214-
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' preremove-dev.bat >%OSGEO4W_ROOT%\etc\preremove\%PACKAGENAME%.bat
220+
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversions@/%GRASS_VERSIONS%/g' preremove-dev.bat >%OSGEO4W_ROOT%\etc\preremove\%PACKAGENAME%.bat
215221
if errorlevel 1 (echo creation of desktop preremove failed & goto error)
216-
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
217-
if errorlevel 1 (echo creation of desktop template failed & goto error)
218-
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
222+
223+
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' designer-qgis.bat.tmpl >%OSGEO4W_ROOT%\bin\designer-%PACKAGENAME%.bat.tmpl
219224
if errorlevel 1 (echo creation of designer template failed & goto error)
220-
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
221-
if errorlevel 1 (echo creation of browser template & goto error)
222-
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
225+
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' qgis.reg.tmpl >%PKGDIR%\bin\qgis.reg.tmpl
223226
if errorlevel 1 (echo creation of registry template & goto error)
224227

228+
for %%g IN (%GRASS_VERSIONS%) do (
229+
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%%g/g' qgis.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%-g%%g.bat.tmpl
230+
if errorlevel 1 (echo creation of desktop template failed & goto error)
231+
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%%g/g' browser.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser-g%%g.bat.tmpl
232+
if errorlevel 1 (echo creation of browser template & goto error)
233+
)
234+
235+
225236
REM sed -e 's/%OSGEO4W_ROOT:\=\\\\\\\\%/@osgeo4w@/' %PKGDIR%\python\qgis\qgisconfig.py >%PKGDIR%\python\qgis\qgisconfig.py.tmpl
226237
REM if errorlevel 1 (echo creation of qgisconfig.py.tmpl failed & goto error)
227238

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

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1-
textreplace -std -t bin\@package@.bat
2-
textreplace -std -t bin\@package@-browser.bat
31
textreplace -std -t bin\designer-@package@.bat
42

5-
if not %OSGEO4W_MENU_LINKS%==0 mkdir "%OSGEO4W_STARTMENU%"
6-
if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_STARTMENU%" "QGIS Desktop @version@ (Nightly)" "exec hide """%OSGEO4W_ROOT%\bin\@package@.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
7-
if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_STARTMENU%" "QGIS Browser @version@ (Nightly)" "exec hide """%OSGEO4W_ROOT%\bin\@package@-browser.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
8-
if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_STARTMENU%" "Qt Designer with QGIS @version@ custom widgets (Nightly)" "exec hide """%OSGEO4W_ROOT%\bin\designer-@package@.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
3+
for %%g in (@grassversions@) do (
4+
textreplace -std -t bin\@package@-g%%g.bat
5+
textreplace -std -t bin\@package@-browser-g%%g.bat
6+
7+
if not %OSGEO4W_MENU_LINKS%==0 mkdir "%OSGEO4W_STARTMENU%"
8+
if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_STARTMENU%" "QGIS Desktop @version@ with GRASS %%g (Nightly)" "exec hide """%OSGEO4W_ROOT%\bin\@package@-g%%g.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
9+
if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_STARTMENU%" "QGIS Browser @version@ with GRASS %%g (Nightly)" "exec hide """%OSGEO4W_ROOT%\bin\@package@-browser-g%%g.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
910

10-
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "~$folder.desktop$" "QGIS Desktop @version@ (Nightly)" "exec hide """%OSGEO4W_ROOT%\bin\@package@.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
11-
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "~$folder.desktop$" "QGIS Browser @version@ (Nightly)" "exec hide """%OSGEO4W_ROOT%\bin\@package@-browser.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
11+
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "~$folder.desktop$" "QGIS Desktop @version@ with GRASS %%g (Nightly)" "exec hide """%OSGEO4W_ROOT%\bin\@package@-g%%g.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
12+
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "~$folder.desktop$" "QGIS Browser @version@ with GRASS %%g (Nightly)" "exec hide """%OSGEO4W_ROOT%\bin\@package@-browser-g%%g.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
13+
)
14+
15+
if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_STARTMENU%" "Qt Designer with QGIS @version@ custom widgets (Nightly)" "exec hide """%OSGEO4W_ROOT%\bin\designer-@package@.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
1216
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "~$folder.desktop$" "Qt Designer with QGIS @version@ custom widgets (Nightly)" "exec hide """%OSGEO4W_ROOT%\bin\designer-@package@.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
1317

1418
set O4W_ROOT=%OSGEO4W_ROOT%

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
del "%OSGEO4W_STARTMENU%\QGIS Desktop @version@ (Nightly).lnk"
2-
del "%OSGEO4W_STARTMENU%\QGIS Browser @version@ (Nightly).lnk"
1+
for %%g in (@grassversions@) do (
2+
del "%OSGEO4W_STARTMENU%\QGIS Desktop @version@ with GRASS %%g (Nightly).lnk"
3+
del "%OSGEO4W_STARTMENU%\QGIS Browser @version@ with GRASS %%g (Nightly).lnk"
4+
del "%ALLUSERSPROFILE%\Desktop\QGIS Desktop @version@ with GRASS %%g (Nightly).lnk"
5+
del "%ALLUSERSPROFILE%\Desktop\QGIS Browser @version@ with GRASS %%g (Nightly).lnk"
6+
del "%OSGEO4W_ROOT%"\bin\@package@-g%%g.bat
7+
del "%OSGEO4W_ROOT%"\bin\@package@-browser-g%%g.bat
8+
)
9+
310
del "%OSGEO4W_STARTMENU%\Qt Designer with QGIS @version@ custom widgets (Nightly).lnk"
4-
del "%ALLUSERSPROFILE%\Desktop\QGIS Desktop @version@ (Nightly).lnk"
5-
del "%ALLUSERSPROFILE%\Desktop\QGIS Browser @version@ (Nightly).lnk"
611
del "%ALLUSERSPROFILE%\Desktop\Qt Designer with QGIS @version@ custom widgets (Nightly).lnk"
7-
del "%OSGEO4W_ROOT%"\bin\@package@.bat
8-
del "%OSGEO4W_ROOT%"\bin\@package@-browser.bat
12+
913
del "%OSGEO4W_ROOT%"\bin\designer-@package@.bat
1014
del "%OSGEO4W_ROOT%"\apps\@package@\python\qgis\qgisconfig.py
1115
del "%OSGEO4W_ROOT%"\apps\@package@\bin\qgis.reg

‎src/app/qgsjoindialog.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "ui_qgsjoindialogbase.h"
2222

2323
class QgsVectorLayer;
24-
class QgsVectorJoinInfo;
24+
struct QgsVectorJoinInfo;
2525

2626
class APP_EXPORT QgsJoinDialog: public QDialog, private Ui::QgsJoinDialogBase
2727
{

‎src/plugins/grass/6/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
INCLUDE_DIRECTORIES(${GRASS_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
2+
ADD_GRASSPLUGIN(6)

‎src/plugins/grass/7/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
INCLUDE_DIRECTORIES(${GRASS_INCLUDE_DIR7} ${CMAKE_CURRENT_BINARY_DIR})
2+
ADD_GRASSPLUGIN(7)

0 commit comments

Comments
 (0)