Skip to content

Commit

Permalink
Set icon for qgis.exe.
Browse files Browse the repository at this point in the history
Installer now works for code as in head
Added installer sidebar and master image of sidebar

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5994 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Oct 22, 2006
1 parent 8a761d9 commit 06b384c
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 12 deletions.
3 changes: 3 additions & 0 deletions settings.pro
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ win32:QGISLIBDIR=$${DESTDIR}
QGISPLUGINDIR=$${QGISBINDIR}/plugins
macx:QGISPLUGINDIR=$${DESTDIR}/$${QGIS_APP_NAME}.app/Contents/plugins

QGISPROVIDERDIR=$${QGISBINDIR}/lib/qgis
macx:QGISPROVIDERDIR=$${DESTDIR}/$${QGIS_APP_NAME}.app/Contents/lib/qgis

message(WORKDIR : $${WORKDIR})
message(DESTDIR : $${DESTDIR})
message(QGISBINDIR : $${QGISBINDIR})
Expand Down
1 change: 1 addition & 0 deletions src/gui/guiapp.pro
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,6 @@ DESTDIR=$${QGISBINDIR}
QT += qt3support svg core gui xml network
message("Building libs into $${DESTDIR}")

win32: RC_FILE = ../../win_build/qgis.rc

SOURCES = main.cpp \
33 changes: 21 additions & 12 deletions win_build/qgis.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -66,24 +66,28 @@ ShowUnInstDetails show

Section "MainSection" SEC01
SetOutPath "$INSTDIR"

SetOverwrite ifnewer
File "C:\dev/cpp/qgis/\qgis-release\qgis_core.dll"
SetOverwrite try
;------- Qt
;File "C:\dev/cpp/qgis/\qgis-release\QtCore4.dll"
;File "C:\dev/cpp/qgis/\qgis-release\QtGui4.dll"
;File "C:\dev/cpp/qgis/\qgis-release\QtNetwork4.dll"
;File "C:\dev/cpp/qgis/\qgis-release\QtXml4.dll"
;File "C:\dev/cpp/qgis/\qgis-release\QtSvg4.dll"
;File "C:\dev/cpp/qgis/\qgis-release\mingwm10.dll"
File "C:\dev\cpp\qgis\qgis-release\QtCore4.dll"
File "C:\dev\cpp\qgis\qgis-release\QtGui4.dll"
File "C:\dev\cpp\qgis\qgis-release\QtNetwork4.dll"
File "C:\dev\cpp\qgis\qgis-release\QtXml4.dll"
File "C:\dev\cpp\qgis\qgis-release\QtSvg4.dll"
File "C:\dev\cpp\qgis\qgis-release\mingwm10.dll"
;------- qgis Related
File "C:\dev/cpp/qgis/\qgis-release\*.dll"
;File "C:\dev/cpp/qgis/\qgis-release\*.exe"
File "C:\dev\cpp\qgis\qgis-release\*.dll"
File "C:\dev\cpp\qgis\qgis-release\*.exe"
;------- proj and gdal Related
File "C:\dev\cpp\qgis\qgis-release\*.csv"
;subdirs
File /r "C:\dev\cpp\qgis\qgis-release\lib"
File /r "C:\dev\cpp\qgis\qgis-release\share"
File /r "C:\dev\cpp\qgis\qgis-release\nad"

; Shortcuts
; Next line is important - added by Tim
; if its not there the application working dir will be the last used
;outpath and libom wont be able to find its alg
; outpath
SetOutPath "$INSTDIR"
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
Expand Down Expand Up @@ -153,6 +157,11 @@ Section Uninstall
Delete "$INSTDIR\uninst.exe"
Delete "$INSTDIR\*.exe"
Delete "$INSTDIR\*.dll"
Delete "$INSTDIR\*.csv"
;----------------- subdirs
RMDir /r "C:\dev/cpp/qgis/qgis-release/lib"
RMDir /r "C:\dev/cpp/qgis/qgis-release/share"
RMDir /r "C:\dev/cpp/qgis/qgis-release/nad"
;----------------- icons and shortcuts
Delete "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk"
Delete "$SMPROGRAMS\$ICONS_GROUP\Website.lnk"
Expand Down
Binary file modified win_build/sidebar.bmp
Binary file not shown.
Binary file added win_build/sidebar.xcf
Binary file not shown.

0 comments on commit 06b384c

Please sign in to comment.