Skip to content
Permalink
Browse files

remove standalone browser

  • Loading branch information
jef-n committed Feb 20, 2017
1 parent 4505ba7 commit 74df8754f9c030ee9d3c064a75253c5c80250aad
Showing with 6 additions and 1,404 deletions.
  1. +1 −1 CMakeLists.txt
  2. BIN debian/icons/qbrowser-icon128x128.png
  3. BIN debian/icons/qbrowser-icon16x16.png
  4. BIN debian/icons/qbrowser-icon192x192.png
  5. BIN debian/icons/qbrowser-icon22x22.png
  6. BIN debian/icons/qbrowser-icon24x24.png
  7. BIN debian/icons/qbrowser-icon256x256.png
  8. BIN debian/icons/qbrowser-icon32x32.png
  9. BIN debian/icons/qbrowser-icon36x36.png
  10. BIN debian/icons/qbrowser-icon42x42.png
  11. BIN debian/icons/qbrowser-icon48x48.png
  12. BIN debian/icons/qbrowser-icon512x512.png
  13. BIN debian/icons/qbrowser-icon64x64.png
  14. BIN debian/icons/qbrowser-icon72x72.png
  15. BIN debian/icons/qbrowser-icon80x80.png
  16. BIN debian/icons/qbrowser-icon8x8.png
  17. BIN debian/icons/qbrowser-icon96x96.png
  18. +0 −56 debian/qbrowser.desktop
  19. +2 −13 debian/rules
  20. BIN images/icons/qbrowser-icon-60x60.png
  21. +1 −1 images/images.qrc
  22. +0 −80 mac/browser.info.plist.in
  23. +0 −10 ms-windows/osgeo4w/browser-grass.bat.tmpl
  24. +0 −9 ms-windows/osgeo4w/browser.bat.tmpl
  25. +0 −10 ms-windows/osgeo4w/package-nightly.cmd
  26. +0 −15 ms-windows/osgeo4w/package.cmd
  27. +0 −5 ms-windows/osgeo4w/postinstall-desktop.bat
  28. +0 −8 ms-windows/osgeo4w/postinstall-dev.bat
  29. +0 −4 ms-windows/osgeo4w/postinstall-grass.bat
  30. +0 −3 ms-windows/osgeo4w/preremove-desktop.bat
  31. +0 −5 ms-windows/osgeo4w/preremove-dev.bat
  32. +0 −1 ms-windows/osgeo4w/preremove-grass.bat
  33. +0 −17 qbrowser.1
  34. +1 −5 rpm/qgis.spec.template
  35. +0 −1 scripts/spell_check/.agignore
  36. +0 −1 src/CMakeLists.txt
  37. +0 −131 src/browser/CMakeLists.txt
  38. BIN src/browser/browser.ico
  39. +0 −132 src/browser/main.cpp
  40. +0 −1 src/browser/qgis_win32.rc
  41. +0 −547 src/browser/qgsbrowser.cpp
  42. +0 −89 src/browser/qgsbrowser.h
  43. +0 −258 src/browser/qgsbrowserbase.ui
  44. +1 −1 src/providers/grass/qgsgrassoptionsbase.ui
@@ -762,7 +762,7 @@ ENDIF (APPLE)

# manual page - makes sense only on unix systems
IF (UNIX AND NOT APPLE)
INSTALL (FILES qgis.1 qbrowser.1 DESTINATION ${QGIS_MANUAL_DIR}/man1)
INSTALL (FILES qgis.1 DESTINATION ${QGIS_MANUAL_DIR}/man1)
ENDIF (UNIX AND NOT APPLE)

INSTALL(FILES cmake/FindQGIS.cmake DESTINATION ${QGIS_DATA_DIR})
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

@@ -63,7 +63,6 @@ CMAKE_OPTS := \
-DBINDINGS_GLOBAL_INSTALL=TRUE \
-DPEDANTIC=TRUE \
-DSERVER_SKIP_ECW=TRUE \
-DSUPPRESS_SIP_WARNINGS=TRUE \
-DQGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
-DWITH_APIDOC=TRUE \
-DGENERATE_QHP=TRUE \
@@ -225,7 +224,7 @@ binary binary-arch binary-indep build build-arch build-indep clean install insta
dh $@ --with python3 --parallel --builddirectory=$(QGIS_BUILDDIR)

override_dh_clean: cleantemplates
dh_clean qgis.bin.1 qbrowser.bin.1
dh_clean qgis.bin.1

-$(RM) -r $(CURDIR)/$(QGIS_BUILDDIR)/

@@ -282,17 +281,14 @@ override_dh_auto_install:

# Man pages are installed by dh_installman
$(RM) $(CURDIR)/debian/tmp/usr/man/man1/qgis.1
$(RM) $(CURDIR)/debian/tmp/usr/man/man1/qbrowser.1

# Don't ship srs.db, automatically updated in postinst with crssync
mv $(CURDIR)/debian/tmp/usr/share/qgis/resources/srs.db $(CURDIR)/debian/tmp/usr/share/qgis/resources/srs-template.db

# Install menu pixmap
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis_icon.svg $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis.svg
install -o root -g root -m 644 $(CURDIR)/images/icons/qbrowser_icon.svg $(CURDIR)/debian/tmp/usr/share/pixmaps/qbrowser.svg
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis.png
install -o root -g root -m 644 $(CURDIR)/images/icons/qbrowser-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps/qbrowser.png
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-mime-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis-mime.png

# Install MIME type icon
@@ -315,17 +311,14 @@ override_dh_auto_install:
for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128 192x192 256x256 512x512; do \
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}/apps ; \
install -o root -g root -m 644 $(CURDIR)/debian/icons/qgis-icon$${size}.png $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}/apps/qgis.png ; \
install -o root -g root -m 644 $(CURDIR)/debian/icons/qbrowser-icon$${size}.png $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}/apps/qbrowser.png ; \
done

install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/icons/hicolor/scalable/apps
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis_icon.svg $(CURDIR)/debian/tmp/usr/share/icons/hicolor/scalable/apps/qgis.svg
install -o root -g root -m 644 $(CURDIR)/images/icons/qbrowser_icon.svg $(CURDIR)/debian/tmp/usr/share/icons/hicolor/scalable/apps/qbrowser.svg

# Install desktop files
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/applications
install -o root -g root -m 644 $(CURDIR)/debian/qgis.desktop $(CURDIR)/debian/tmp/usr/share/applications
install -o root -g root -m 644 $(CURDIR)/debian/qbrowser.desktop $(CURDIR)/debian/tmp/usr/share/applications

# Mime info
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/mime/packages
@@ -337,10 +330,8 @@ override_dh_auto_install:
# qgis binaries
install -o root -g root -m 755 -d $(CURDIR)/debian/qgis/usr/bin
install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qgis $(CURDIR)/debian/qgis/usr/bin/qgis.bin
install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qbrowser $(CURDIR)/debian/qgis/usr/bin/qbrowser.bin

$(RM) $(CURDIR)/debian/tmp/usr/bin/qgis
$(RM) $(CURDIR)/debian/tmp/usr/bin/qbrowser

# qgis binary wrappers
sed -r \
@@ -349,7 +340,6 @@ override_dh_auto_install:
$(CURDIR)/debian/qgis.sh.in >$(CURDIR)/debian/qgis.sh

install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis/usr/bin/qgis
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis/usr/bin/qbrowser

override_dh_install:
dh_install --autodest --list-missing
@@ -359,9 +349,8 @@ override_dh_installchangelogs:

override_dh_installman:
cp qgis.1 qgis.bin.1
cp qbrowser.1 qbrowser.bin.1

dh_installman -pqgis qgis.1 qbrowser.1 qgis.bin.1 qbrowser.bin.1
dh_installman -pqgis qgis.1 qgis.bin.1

override_dh_installmime:
dh_installmime -pqgis
Binary file not shown.
@@ -43,7 +43,7 @@
<file>flags/xh.png</file>
<file>icons/qgis-icon-16x16.png</file>
<file>icons/qgis-icon-60x60.png</file>
<file>icons/qbrowser-icon-60x60.png</file>
<file>icons/qbrowser_icon.svg</file>
<file>north_arrows/default.png</file>
<file>north_arrows/gpsarrow.svg</file>
<file>north_arrows/gpsarrow2.svg</file>

This file was deleted.

This file was deleted.

This file was deleted.

@@ -200,7 +200,6 @@ cmake -G Ninja ^
-D QCA_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\Qt5\include\QtCrypto ^
-D QCA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qca-qt5.lib ^
-D QSCINTILLA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qscintilla2.lib ^
-D SUPPRESS_SIP_WARNINGS=TRUE ^
%CMAKE_OPT% ^
%SRCDIR:\=/%
if errorlevel 1 (echo cmake failed & goto error)
@@ -277,10 +276,6 @@ for %%g IN (%GRASS_VERSIONS%) do (
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%%g/g' qgis-grass.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%-g%%g.bat.tmpl
if errorlevel 1 (echo creation of desktop template failed & goto error)
set batches=!batches! bin/%PACKAGENAME%-g%%g.bat.tmpl

sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%%g/g' browser-grass.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser-g%%g.bat.tmpl
if errorlevel 1 (echo creation of browser template & goto error)
set batches=!batches! bin/%PACKAGENAME%-browser-g%%g.bat.tmpl
)

sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' python.bat.tmpl >%OSGEO4W_ROOT%\bin\python-%PACKAGENAME%.bat.tmpl
@@ -297,10 +292,6 @@ move %PKGDIR%\bin\qgis.exe %OSGEO4W_ROOT%\bin\%PACKAGENAME%-bin.exe
if errorlevel 1 (echo move of desktop executable failed & goto error)
copy qgis.vars %OSGEO4W_ROOT%\bin\%PACKAGENAME%-bin.vars
if errorlevel 1 (echo copy of desktop executable vars failed & goto error)
move %PKGDIR%\bin\qbrowser.exe %OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser-bin.exe
if errorlevel 1 (echo move of browser executable failed & goto error)
copy qgis.vars %OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser-bin.vars
if errorlevel 1 (echo copy of browser executable vars failed & goto error)

if not exist %PKGDIR%\qtplugins\sqldrivers mkdir %PKGDIR%\qtplugins\sqldrivers
move %OSGEO4W_ROOT%\apps\qt5\plugins\sqldrivers\qsqlocispatial.dll %PKGDIR%\qtplugins\sqldrivers
@@ -322,7 +313,6 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%/%PACKAGENAME%-%VERS
--exclude "*.pyc" ^
apps/%PACKAGENAME% ^
bin/%PACKAGENAME%-bin.exe ^
bin/%PACKAGENAME%-browser-bin.exe ^
%batches% ^
bin/%PACKAGENAME%-designer.bat.tmpl ^
bin/python-%PACKAGENAME%.bat.tmpl ^
@@ -192,7 +192,6 @@ cmake -G Ninja ^
-D QCA_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\Qt5\include\QtCrypto ^
-D QCA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qca-qt5.lib ^
-D QSCINTILLA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qscintilla2.lib ^
-D SUPPRESS_SIP_WARNINGS=TRUE ^
%CMAKE_OPT% ^
%SRCDIR:\=/%
if errorlevel 1 (echo cmake failed & goto error)
@@ -254,9 +253,6 @@ if errorlevel 1 (echo creation of desktop preremove failed & goto error)
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' qgis.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%.bat.tmpl
if errorlevel 1 (echo creation of desktop template failed & goto error)

sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' browser.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser.bat.tmpl
if errorlevel 1 (echo creation of browser template & goto error)

sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' designer.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%-designer.bat.tmpl
if errorlevel 1 (echo creation of designer template failed & goto error)

@@ -289,8 +285,6 @@ for %%g IN (%GRASS_VERSIONS%) do (
if errorlevel 1 (echo creation of grass desktop preremove failed & goto error)
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
if errorlevel 1 (echo creation of grass desktop template failed & goto error)
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
if errorlevel 1 (echo creation of grass browser template & goto error)

set packages=!packages! "-grass-plugin!w!"
)
@@ -358,10 +352,6 @@ move %PKGDIR%\bin\qgis.exe %OSGEO4W_ROOT%\bin\%PACKAGENAME%-bin.exe
if errorlevel 1 (echo move of desktop executable failed & goto error)
copy qgis.vars %OSGEO4W_ROOT%\bin\%PACKAGENAME%-bin.vars
if errorlevel 1 (echo copy of desktop executable vars failed & goto error)
move %PKGDIR%\bin\qbrowser.exe %OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser-bin.exe
if errorlevel 1 (echo move of browser executable failed & goto error)
copy qgis.vars %OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser-bin.vars
if errorlevel 1 (echo copy of browser executable vars failed & goto error)

if not exist %PKGDIR%\qtplugins\sqldrivers mkdir %PKGDIR%\qtplugins\sqldrivers
move %OSGEO4W_ROOT%\apps\qt5\plugins\sqldrivers\qsqlocispatial.dll %PKGDIR%\qtplugins\sqldrivers
@@ -384,13 +374,10 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%/%PACKAGENAME%-%VERS
--exclude "apps/%PACKAGENAME%/python/qgis/_server.pyd" ^
--exclude "apps/%PACKAGENAME%/python/qgis/_server.lib" ^
--exclude "apps/%PACKAGENAME%/python/qgis/server" ^
"bin/%PACKAGENAME%-browser-bin.exe" ^
"bin/%PACKAGENAME%-browser-bin.vars" ^
"bin/%PACKAGENAME%-bin.exe" ^
"bin/%PACKAGENAME%-bin.vars" ^
"bin/python-%PACKAGENAME%.bat.tmpl" ^
"apps/%PACKAGENAME%/bin/qgis_app.dll" ^
"apps/%PACKAGENAME%/bin/qgis_browser.dll" ^
"apps/%PACKAGENAME%/bin/qgis.reg.tmpl" ^
"apps/%PACKAGENAME%/i18n/" ^
"apps/%PACKAGENAME%/icons/" ^
@@ -410,7 +397,6 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%/%PACKAGENAME%-%VERS
"apps/%PACKAGENAME%/resources/customization.xml" ^
"apps/%PACKAGENAME%/resources/themes/" ^
"bin/%PACKAGENAME%.bat.tmpl" ^
"bin/%PACKAGENAME%-browser.bat.tmpl" ^
"bin/%PACKAGENAME%-designer.bat.tmpl" ^
"etc/postinstall/%PACKAGENAME%.bat" ^
"etc/preremove/%PACKAGENAME%.bat"
@@ -447,7 +433,6 @@ for %%g IN (%GRASS_VERSIONS%) do (
"apps/%PACKAGENAME%/plugins/grassplugin!v!.dll" ^
"apps/%PACKAGENAME%/plugins/grassprovider!v!.dll" ^
"apps/%PACKAGENAME%/plugins/grassrasterprovider!v!.dll" ^
"bin/%PACKAGENAME%-browser-grass!v!.bat.tmpl" ^
"bin/%PACKAGENAME%-grass!v!.bat.tmpl" ^
"etc/postinstall/%PACKAGENAME%-grass-plugin!w!.bat" ^
"etc/preremove/%PACKAGENAME%-grass-plugin!w!.bat"
@@ -1,5 +1,4 @@
textreplace -std -t bin\@package@.bat
textreplace -std -t bin\@package@-browser.bat
textreplace -std -t bin\@package@-designer.bat
textreplace -std -t bin\python-@package@.bat

@@ -8,17 +7,13 @@ for %%i in ("%OSGEO4W_ROOT%") do set O4W_ROOT=%%~fsi
if "%OSGEO4W_DESKTOP%"=="" set OSGEO4W_DESKTOP=~$folder.common_desktop$

"%OSGEO4W_ROOT%\bin\@package@.bat" --exit
"%OSGEO4W_ROOT%\bin\@package@-browser.bat" --exit

if not %OSGEO4W_MENU_LINKS%==0 mkdir "%OSGEO4W_STARTMENU%"
if not %OSGEO4W_DESKTOP_LINKS%==0 mkdir "%OSGEO4W_DESKTOP%"

if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\@package@-bin.exe" "%OSGEO4W_STARTMENU%" "QGIS Desktop @version@"
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\package@-bin.exe" "%OSGEO4W_DESKTOP%" "QGIS Desktop @version@"

if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\@package@-browser-bin.exe" "%OSGEO4W_STARTMENU%" "QGIS Browser @version@"
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\@package@-browser-bin.exe" "%OSGEO4W_DESKTOP%" "QGIS Browser @version@"

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"
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_DESKTOP%" "Qt Designer with QGIS @version@ custom widgets" "exec hide %O4W_ROOT%\bin\@package@-designer.bat" "%O4W_ROOT%\apps\@package@\icons\QGIS.ico"

0 comments on commit 74df875

Please sign in to comment.
You can’t perform that action at this time.