Skip to content

Commit da8d308

Browse files
author
timlinux
committed
Include grass dir in installer
git-svn-id: http://svn.osgeo.org/qgis/trunk@6070 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent c803d12 commit da8d308

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

win_build/qgis-debug.nsi

+2
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ Section "MainSection" SEC01
100100
;------- proj and gdal Related
101101
File "C:\dev\cpp\qgis\qgis-debug\*.csv"
102102
;subdirs
103+
File /r "C:\dev\cpp\qgis\qgis-debug\grass"
103104
File /r "C:\dev\cpp\qgis\qgis-debug\lib"
104105
File /r "C:\dev\cpp\qgis\qgis-debug\share"
105106
File /r "C:\dev\cpp\qgis\qgis-debug\nad"
@@ -179,6 +180,7 @@ Section Uninstall
179180
Delete "$INSTDIR\*.dll"
180181
Delete "$INSTDIR\*.csv"
181182
;----------------- subdirs
183+
RMDir /r "$INSTDIR/grass"
182184
RMDir /r "$INSTDIR/lib"
183185
RMDir /r "$INSTDIR/share"
184186
RMDir /r "$INSTDIR/nad"

win_build/qgis.nsi

+2
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ Section "MainSection" SEC01
9999
;------- proj and gdal Related
100100
File "C:\dev\cpp\qgis\qgis-release\*.csv"
101101
;subdirs
102+
File /r "C:\dev\cpp\qgis\qgis-release\grass"
102103
File /r "C:\dev\cpp\qgis\qgis-release\lib"
103104
File /r "C:\dev\cpp\qgis\qgis-release\share"
104105
File /r "C:\dev\cpp\qgis\qgis-release\nad"
@@ -178,6 +179,7 @@ Section Uninstall
178179
Delete "$INSTDIR\*.dll"
179180
Delete "$INSTDIR\*.csv"
180181
;----------------- subdirs
182+
RMDir /r "$INSTDIR/grass"
181183
RMDir /r "$INSTDIR/lib"
182184
RMDir /r "$INSTDIR/share"
183185
RMDir /r "$INSTDIR/nad"

0 commit comments

Comments
 (0)