[QGIS Commit] r11684 - trunk/qgis/ms-windows/osgeo4w
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sun Sep 20 04:46:25 EDT 2009
Author: jef
Date: 2009-09-20 04:46:24 -0400 (Sun, 20 Sep 2009)
New Revision: 11684
Added:
trunk/qgis/ms-windows/osgeo4w/qgis.bat.tmpl
trunk/qgis/ms-windows/osgeo4w/qgis.reg.tmpl
Removed:
trunk/qgis/ms-windows/osgeo4w/qgis-dev.bat.tmpl
trunk/qgis/ms-windows/osgeo4w/qgis-dev.reg.tmpl
Modified:
trunk/qgis/ms-windows/osgeo4w/package.cmd
trunk/qgis/ms-windows/osgeo4w/postinstall.bat
trunk/qgis/ms-windows/osgeo4w/preremove.bat
Log:
osgeo4w packaging update
Modified: trunk/qgis/ms-windows/osgeo4w/package.cmd
===================================================================
--- trunk/qgis/ms-windows/osgeo4w/package.cmd 2009-09-19 23:55:49 UTC (rev 11683)
+++ trunk/qgis/ms-windows/osgeo4w/package.cmd 2009-09-20 08:46:24 UTC (rev 11684)
@@ -1,7 +1,6 @@
@echo off
set GRASS_VERSION=6.4.0svn
set SVNVERSION=c:/cygwin/bin/svnversion
-set PACKAGENAME=qgis-dev
set BUILDDIR=%CD%\build
REM set BUILDDIR=%TEMP%\qgis_unstable
@@ -12,8 +11,10 @@
set VERSION=%1
set PACKAGE=%2
+set PACKAGENAME=%3
if "%VERSION%"=="" goto error
if "%PACKAGE%"=="" goto error
+if "%PACKAGENAME%"=="" set PACKAGENAME=qgis-dev
path %SYSTEMROOT%\system32;%SYSTEMROOT%;%SYSTEMROOT%\System32\Wbem;%PROGRAMFILES%\CMake 2.6\bin
set PYTHONPATH=
@@ -127,10 +128,10 @@
echo PACKAGE: %DATE% %TIME%>>%LOG% 2>&1
cd ..
-copy postinstall.bat %OSGEO4W_ROOT%\etc\postinstall\%PACKAGENAME%.bat
-copy preremove.bat %OSGEO4W_ROOT%\etc\preremove\%PACKAGENAME%.bat
-copy %PACKAGENAME%.bat.tmpl %OSGEO4W_ROOT%\bin\%PACKAGENAME%.bat.tmpl
-copy qgis-dev.reg.tmpl %OSGEO4W_ROOT%\apps\%PACKAGENAME%\bin\qgis-dev.reg.tmpl
+sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' postinstall.bat >%OSGEO4W_ROOT%\etc\postinstall\%PACKAGENAME%.bat
+sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' preremove.bat >%OSGEO4W_ROOT%\etc\preremove\%PACKAGENAME%.bat
+sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' qgis.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%.bat.tmpl
+sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' qgis.reg.tmpl >%OSGEO4W_ROOT%\apps\%PACKAGENAME%\bin\qgis.reg.tmpl
sed -e 's/%OSGEO4W_ROOT:\=\\\\\\\\%/@osgeo4w@/' %OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py >%OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py.tmpl
if errorlevel 1 goto error
Modified: trunk/qgis/ms-windows/osgeo4w/postinstall.bat
===================================================================
--- trunk/qgis/ms-windows/osgeo4w/postinstall.bat 2009-09-19 23:55:49 UTC (rev 11683)
+++ trunk/qgis/ms-windows/osgeo4w/postinstall.bat 2009-09-20 08:46:24 UTC (rev 11684)
@@ -1,11 +1,11 @@
-textreplace -std -t bin\qgis-dev.bat
-textreplace -std -t apps\qgis-dev\python\qgis\qgisconfig.py
+textreplace -std -t bin\@package at .bat
+textreplace -std -t apps\@package@\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"
-xxmklink "%ALLUSERSPROFILE%\Desktop\Quantum GIS (trunk).lnk" "%OSGEO4W_ROOT%\bin\qgis-dev.bat" " " \ "Quantum GIS - Desktop GIS (trunk)" 1 "%OSGEO4W_ROOT%\apps\qgis-dev\icons\QGIS.ico"
+xxmklink "%OSGEO4W_STARTMENU%\Quantum GIS (@version@).lnk" "%OSGEO4W_ROOT%\bin\@package at .bat" " " \ "Quantum GIS - Desktop GIS (@version@)" 1 "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
+xxmklink "%ALLUSERSPROFILE%\Desktop\Quantum GIS (@version@).lnk" "%OSGEO4W_ROOT%\bin\@package at .bat" " " \ "Quantum GIS - Desktop GIS (@version@)" 1 "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
set O4W_ROOT=%OSGEO4W_ROOT%
set OSGEO4W_ROOT=%OSGEO4W_ROOT:\=\\%
-textreplace -std -t "%O4W_ROOT%\apps\qgis-dev\bin\qgis-dev.reg"
-"%WINDIR%\regedit" /s "%O4W_ROOT%\apps\qgis-dev\bin\qgis-dev.reg"
+textreplace -std -t "%O4W_ROOT%\apps\@package@\bin\qgis.reg"
+"%WINDIR%\regedit" /s "%O4W_ROOT%\apps\@package@\bin\qgis.reg"
Modified: trunk/qgis/ms-windows/osgeo4w/preremove.bat
===================================================================
--- trunk/qgis/ms-windows/osgeo4w/preremove.bat 2009-09-19 23:55:49 UTC (rev 11683)
+++ trunk/qgis/ms-windows/osgeo4w/preremove.bat 2009-09-20 08:46:24 UTC (rev 11684)
@@ -1,4 +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%"\apps\qgis-dev\python\qgis\qgisconfig.py
+del "%OSGEO4W_STARTMENU%\Quantum GIS (@version@).lnk"
+del "%ALLUSERSPROFILE%\Desktop\Quantum GIS (@version@).lnk"
+del "%OSGEO4W_ROOT%"\bin\@package at .bat
+del "%OSGEO4W_ROOT%"\apps\@package@\python\qgis\qgisconfig.py
Deleted: trunk/qgis/ms-windows/osgeo4w/qgis-dev.bat.tmpl
===================================================================
--- trunk/qgis/ms-windows/osgeo4w/qgis-dev.bat.tmpl 2009-09-19 23:55:49 UTC (rev 11683)
+++ trunk/qgis/ms-windows/osgeo4w/qgis-dev.bat.tmpl 2009-09-20 08:46:24 UTC (rev 11684)
@@ -1,8 +0,0 @@
- at echo off
-
-SET OSGEO4W_ROOT=@osgeo4w@
-call "%OSGEO4W_ROOT%"\bin\o4w_env.bat
-call "%OSGEO4W_ROOT%"\bin\gdal16.bat
- at echo off
-path %PATH%;%GISBASE%\bin
-start "Quantum GIS" /B "%OSGEO4W_ROOT%"\apps\qgis-dev\bin\qgis.exe %*
Deleted: trunk/qgis/ms-windows/osgeo4w/qgis-dev.reg.tmpl
===================================================================
--- trunk/qgis/ms-windows/osgeo4w/qgis-dev.reg.tmpl 2009-09-19 23:55:49 UTC (rev 11683)
+++ trunk/qgis/ms-windows/osgeo4w/qgis-dev.reg.tmpl 2009-09-20 08:46:24 UTC (rev 11684)
@@ -1,19 +0,0 @@
-Windows Registry Editor Version 5.00
-
-[HKEY_CLASSES_ROOT\Quantum GIS Project]
-@="Quantum GIS Project"
-
-[HKEY_CLASSES_ROOT\Quantum GIS Project\DefaultIcon]
-@="@osgeo4w@\\apps\\qgis-dev\\icons\\qgis.ico"
-
-[HKEY_CLASSES_ROOT\Quantum GIS Project\Shell]
-
-[HKEY_CLASSES_ROOT\Quantum GIS Project\Shell\open]
-@=""
-
-[HKEY_CLASSES_ROOT\Quantum GIS Project\Shell\open\command]
-@="\"@osgeo4w@\\bin\\qgis-dev.bat\" \"%1\""
-
-[HKEY_CLASSES_ROOT\.qgs]
-@="Quantum GIS Project"
-
Copied: trunk/qgis/ms-windows/osgeo4w/qgis.bat.tmpl (from rev 11635, trunk/qgis/ms-windows/osgeo4w/qgis-dev.bat.tmpl)
===================================================================
--- trunk/qgis/ms-windows/osgeo4w/qgis.bat.tmpl (rev 0)
+++ trunk/qgis/ms-windows/osgeo4w/qgis.bat.tmpl 2009-09-20 08:46:24 UTC (rev 11684)
@@ -0,0 +1,8 @@
+ at echo off
+
+SET OSGEO4W_ROOT=@osgeo4w@
+call "%OSGEO4W_ROOT%"\bin\o4w_env.bat
+call "%OSGEO4W_ROOT%"\bin\gdal16.bat
+ at echo off
+path %PATH%;%GISBASE%\bin
+start "Quantum GIS" /B "%OSGEO4W_ROOT%"\apps\@package@\bin\qgis.exe %*
Copied: trunk/qgis/ms-windows/osgeo4w/qgis.reg.tmpl (from rev 11635, trunk/qgis/ms-windows/osgeo4w/qgis-dev.reg.tmpl)
===================================================================
--- trunk/qgis/ms-windows/osgeo4w/qgis.reg.tmpl (rev 0)
+++ trunk/qgis/ms-windows/osgeo4w/qgis.reg.tmpl 2009-09-20 08:46:24 UTC (rev 11684)
@@ -0,0 +1,19 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_CLASSES_ROOT\Quantum GIS Project]
+@="Quantum GIS Project"
+
+[HKEY_CLASSES_ROOT\Quantum GIS Project\DefaultIcon]
+@="@osgeo4w@\\apps\\@package@\\icons\\qgis.ico"
+
+[HKEY_CLASSES_ROOT\Quantum GIS Project\Shell]
+
+[HKEY_CLASSES_ROOT\Quantum GIS Project\Shell\open]
+@=""
+
+[HKEY_CLASSES_ROOT\Quantum GIS Project\Shell\open\command]
+@="\"@osgeo4w@\\bin\\@package at .bat\" \"%1\""
+
+[HKEY_CLASSES_ROOT\.qgs]
+@="Quantum GIS Project"
+
More information about the QGIS-commit
mailing list