Skip to content

Commit 72e779c

Browse files
jef-njef-n
committedAug 20, 2014
osgeo4w: move Qt plugins (sql and designer) into qgis directory
1 parent a34240d commit 72e779c

File tree

4 files changed

+16
-3
lines changed

4 files changed

+16
-3
lines changed
 

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ cd ..
208208
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
209209
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
210210
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
211+
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
211212
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
212213
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' qgis.reg.tmpl >%OSGEO4W_ROOT%\apps\%PACKAGENAME%\bin\qgis.reg.tmpl
213214

@@ -221,6 +222,13 @@ touch exclude
221222
move %PKGDIR%\bin\qgis.exe %OSGEO4W_ROOT%\bin\%PACKAGENAME%-bin.exe
222223
move %PKGDIR%\bin\qbrowser.exe %OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser-bin.exe
223224

225+
if not exist %OSGEO4W_ROOT%\apps\%PACKAGENAME%\qtplugins\sqldrivers mkdir %OSGEO4W_ROOT%\apps\%PACKAGENAME%\qtplugins\sqldrivers
226+
move %PKGDIR%\qt4\plugins\sqldrivers\qsqlocispatial.dll %OSGEO4W_ROOT%\apps\%PACKAGENAME%\qtplugins\sqldrivers
227+
move %PKGDIR%\qt4\plugins\sqldrivers\qsqlspatiallite.dll %OSGEO4W_ROOT%\apps\%PACKAGENAME%\qtplugins\sqldrivers
228+
229+
if not exist %OSGEO4W_ROOT%\apps\%PACKAGENAME%\qtplugins\designer mkdir %OSGEO4W_ROOT%\apps\%PACKAGENAME%\qtplugins\designer
230+
move %PKGDIR%\qt4\plugins\designer\qgis_customwidgets.dll %OSGEO4W_ROOT%\apps\%PACKAGENAME%\qtplugins\designer
231+
224232
if not exist %ARCH%\release\qgis\%PACKAGENAME% mkdir %ARCH%\release\qgis\%PACKAGENAME%
225233
tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%/%PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 ^
226234
--exclude-from exclude ^
@@ -229,9 +237,7 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%/%PACKAGENAME%-%VERS
229237
bin/%PACKAGENAME%-browser-bin.exe ^
230238
bin/%PACKAGENAME%.bat.tmpl ^
231239
bin/%PACKAGENAME%-browser.bat.tmpl ^
232-
apps/qt4/plugins/sqldrivers/qsqlocispatial.dll ^
233-
apps/qt4/plugins/sqldrivers/qsqlspatialite.dll ^
234-
apps/qt4/plugins/designer/qgis_customwidgets.dll ^
240+
bin/designer-%PACKAGENAME%.bat.tmpl ^
235241
etc/postinstall/%PACKAGENAME%.bat ^
236242
etc/preremove/%PACKAGENAME%.bat
237243
if errorlevel 1 (echo tar failed & goto error)

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

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

45
if not %OSGEO4W_MENU_LINKS%==0 mkdir "%OSGEO4W_STARTMENU%"
56
if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_STARTMENU%" "QGIS Desktop @version@" "exec hide """%OSGEO4W_ROOT%\bin\@package@.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
67
if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_STARTMENU%" "QGIS Browser @version@" "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" "exec hide """%OSGEO4W_ROOT%\bin\designer-@package@.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
79

810
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "~$folder.desktop$" "QGIS Desktop @version@" "exec hide """%OSGEO4W_ROOT%\bin\@package@.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
911
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "~$folder.desktop$" "QGIS Browser @version@" "exec hide """%OSGEO4W_ROOT%\bin\@package@-browser.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
12+
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "~$folder.desktop$" "Qt Designer with QGIS @version@ custom widgets" "exec hide """%OSGEO4W_ROOT%\bin\designer-@package@.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
1013

1114
set O4W_ROOT=%OSGEO4W_ROOT%
1215
set OSGEO4W_ROOT=%OSGEO4W_ROOT:\=\\%

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
del "%OSGEO4W_STARTMENU%\QGIS Desktop @version@.lnk"
22
del "%OSGEO4W_STARTMENU%\QGIS Browser @version@.lnk"
3+
del "%OSGEO4W_STARTMENU%\Qt Designer with QGIS @version@ custom widgets.lnk"
34
del "%ALLUSERSPROFILE%\Desktop\QGIS Desktop @version@.lnk"
45
del "%ALLUSERSPROFILE%\Desktop\QGIS Browser @version@.lnk"
6+
del "%ALLUSERSPROFILE%\Desktop\Qt Designer with QGIS @version@ custom widgets.lnk"
57
del "%OSGEO4W_ROOT%"\bin\@package@.bat
68
del "%OSGEO4W_ROOT%"\bin\@package@-browser.bat
9+
del "%OSGEO4W_ROOT%"\bin\designer-@package@.bat
710
del "%OSGEO4W_ROOT%"\apps\@package@\python\qgis\qgisconfig.py
811
del "%OSGEO4W_ROOT%"\apps\@package@\bin\qgis.reg

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ set GDAL_FILENAME_IS_UTF8=YES
88
rem Set VSI cache to be used as buffer, see #6448
99
set VSI_CACHE=TRUE
1010
set VSI_CACHE_SIZE=1000000
11+
set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt4\plugins
1112
start "QGIS" /B "%OSGEO4W_ROOT%"\bin\@package@-bin.exe %*

0 commit comments

Comments
 (0)