Skip to content

Commit 7ddb48f

Browse files
author
jef
committed
replace osgeo4w path in qgisconfig.py
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11271 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 1e36124 commit 7ddb48f

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

ms-windows/osgeo4w/package.cmd

+7
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,13 @@ copy postinstall.bat %OSGEO4W_ROOT%\etc\postinstall\qgis-dev.bat
108108
copy preremove.bat %OSGEO4W_ROOT%\etc\preremove\qgis-dev.bat
109109
copy qgis-dev.bat.tmpl %OSGEO4W_ROOT%\bin\qgis-dev.bat.tmpl
110110

111+
sed -e 's/%OSGEO4W_ROOT:\=\\\\\\\\%/@osgeo4w@/' %OSGEO4W_ROOT%\apps\qgis-dev\python\qgis\qgisconfig.py >%OSGEO4W_ROOT%\apps\qgis-dev\python\qgis\qgisconfig.py.tmpl
112+
if errorlevel 1 goto error
113+
114+
del %OSGEO4W_ROOT%\apps\qgis-dev\python\qgis\qgisconfig.py
115+
116+
touch exclude
117+
111118
tar -C %OSGEO4W_ROOT% -cjf qgis-dev-%VERSION%-%PACKAGE%.tar.bz2 ^
112119
--exclude-from exclude ^
113120
apps/qgis-dev ^

ms-windows/osgeo4w/postinstall.bat

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
textreplace -std -t bin\qgis-dev.bat
2+
textreplace -std -t apps\qgis-dev\python\qgis\qgisconfig.py
23

34
mkdir "%OSGEO4W_STARTMENU%"
45
xxmklink "%OSGEO4W_STARTMENU%\Quantum GIS (trunk).lnk" "%OSGEO4W_ROOT%\bin\qgis-dev.bat" " " \ "Quantum GIS - Desktop GIS (trunk)" 1 "%OSGEO4W_ROOT%\apps\qgis-dev\icons\QGIS.ico"

ms-windows/osgeo4w/preremove.bat

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
del "%OSGEO4W_STARTMENU%\Quantum GIS (trunk).lnk"
22
del "%ALLUSERSPROFILE%\Desktop\Quantum GIS (trunk).lnk"
3-
del "%OSGEO4W_ROOT%\bin\qgis-dev.bat
3+
del "%OSGEO4W_ROOT%"\bin\qgis-dev.bat
4+
del "%OSGEO4W_ROOT%"\apps\qgis-dev\python\qgis\qgisconfig.py

0 commit comments

Comments
 (0)