replace osgeo4w path in qgisconfig.py

git-svn-id: http://svn.osgeo.org/qgis/trunk@11271 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Aug 5, 2009 · 650f3bd · 650f3bd
1 parent 951d2a5
commit 650f3bd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -108,6 +108,13 @@ copy postinstall.bat %OSGEO4W_ROOT%\etc\postinstall\qgis-dev.bat
 copy preremove.bat %OSGEO4W_ROOT%\etc\preremove\qgis-dev.bat
 copy qgis-dev.bat.tmpl %OSGEO4W_ROOT%\bin\qgis-dev.bat.tmpl
 
+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
+if errorlevel 1 goto error
+
+del %OSGEO4W_ROOT%\apps\qgis-dev\python\qgis\qgisconfig.py
+
+touch exclude
+
 tar -C %OSGEO4W_ROOT% -cjf qgis-dev-%VERSION%-%PACKAGE%.tar.bz2 ^
 	--exclude-from exclude ^
 	apps/qgis-dev ^

diff --git a/ms-windows/osgeo4w/postinstall.bat b/ms-windows/osgeo4w/postinstall.bat
@@ -1,4 +1,5 @@
 textreplace -std -t bin\qgis-dev.bat
+textreplace -std -t apps\qgis-dev\python\qgis\qgisconfig.py
 
 mkdir "%OSGEO4W_STARTMENU%"
 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"

diff --git a/ms-windows/osgeo4w/preremove.bat b/ms-windows/osgeo4w/preremove.bat
@@ -1,3 +1,4 @@
 del "%OSGEO4W_STARTMENU%\Quantum GIS (trunk).lnk"
 del "%ALLUSERSPROFILE%\Desktop\Quantum GIS (trunk).lnk"
-del "%OSGEO4W_ROOT%\bin\qgis-dev.bat
+del "%OSGEO4W_ROOT%"\bin\qgis-dev.bat
+del "%OSGEO4W_ROOT%"\apps\qgis-dev\python\qgis\qgisconfig.py