[QGIS Commit] r11271 - trunk/qgis/ms-windows/osgeo4w

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-08-05 04:15:05 -0400 (Wed, 05 Aug 2009)
New Revision: 11271

Modified:
   trunk/qgis/ms-windows/osgeo4w/package.cmd
   trunk/qgis/ms-windows/osgeo4w/postinstall.bat
   trunk/qgis/ms-windows/osgeo4w/preremove.bat
Log:
replace osgeo4w path in qgisconfig.py

Modified: trunk/qgis/ms-windows/osgeo4w/package.cmd
===================================================================
--- trunk/qgis/ms-windows/osgeo4w/package.cmd	2009-08-04 20:22:25 UTC (rev 11270)
+++ trunk/qgis/ms-windows/osgeo4w/package.cmd	2009-08-05 08:15:05 UTC (rev 11271)
@@ -108,6 +108,13 @@
 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 ^

Modified: trunk/qgis/ms-windows/osgeo4w/postinstall.bat
===================================================================
--- trunk/qgis/ms-windows/osgeo4w/postinstall.bat	2009-08-04 20:22:25 UTC (rev 11270)
+++ trunk/qgis/ms-windows/osgeo4w/postinstall.bat	2009-08-05 08:15:05 UTC (rev 11271)
@@ -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"

Modified: trunk/qgis/ms-windows/osgeo4w/preremove.bat
===================================================================
--- trunk/qgis/ms-windows/osgeo4w/preremove.bat	2009-08-04 20:22:25 UTC (rev 11270)
+++ trunk/qgis/ms-windows/osgeo4w/preremove.bat	2009-08-05 08:15:05 UTC (rev 11271)
@@ -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