[QGIS Commit] r11644 - branches/Release-1_3_0/ms-windows/osgeo4w
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Sep 12 18:06:41 EDT 2009
Author: jef
Date: 2009-09-12 18:06:41 -0400 (Sat, 12 Sep 2009)
New Revision: 11644
Added:
branches/Release-1_3_0/ms-windows/osgeo4w/qgis.bat.tmpl
branches/Release-1_3_0/ms-windows/osgeo4w/qgis.reg.tmpl
Removed:
branches/Release-1_3_0/ms-windows/osgeo4w/qgis-dev.bat.tmpl
branches/Release-1_3_0/ms-windows/osgeo4w/qgis-dev.reg.tmpl
Modified:
branches/Release-1_3_0/ms-windows/osgeo4w/package.cmd
branches/Release-1_3_0/ms-windows/osgeo4w/postinstall.bat
branches/Release-1_3_0/ms-windows/osgeo4w/preremove.bat
Log:
update osgeo4w packaging
Modified: branches/Release-1_3_0/ms-windows/osgeo4w/package.cmd
===================================================================
--- branches/Release-1_3_0/ms-windows/osgeo4w/package.cmd 2009-09-12 21:52:30 UTC (rev 11643)
+++ branches/Release-1_3_0/ms-windows/osgeo4w/package.cmd 2009-09-12 22:06:41 UTC (rev 11644)
@@ -1,7 +1,7 @@
@echo off
set GRASS_VERSION=6.4.0svn
set SVNVERSION=c:/cygwin/bin/svnversion
-set PACKAGENAME=qgis-dev
+set PACKAGENAME=qgis-unstable
set BUILDDIR=%CD%\build
REM set BUILDDIR=%TEMP%\qgis_unstable
@@ -36,8 +36,7 @@
PROMPT qgis%VERSION%$g
-set BUILDCONF=RelWithDebInfo
-REM set BUILDCONF=Release
+set BUILDCONF=Release
cd ..\..
@@ -129,8 +128,8 @@
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
+copy qgis.bat.tmpl %OSGEO4W_ROOT%\bin\%PACKAGENAME%.bat.tmpl
+copy qgis.reg.tmpl %OSGEO4W_ROOT%\apps\%PACKAGENAME%\bin\%PACKAGENAME%.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: branches/Release-1_3_0/ms-windows/osgeo4w/postinstall.bat
===================================================================
--- branches/Release-1_3_0/ms-windows/osgeo4w/postinstall.bat 2009-09-12 21:52:30 UTC (rev 11643)
+++ branches/Release-1_3_0/ms-windows/osgeo4w/postinstall.bat 2009-09-12 22:06:41 UTC (rev 11644)
@@ -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\qgis-unstable.bat
+textreplace -std -t apps\qgis-unstable\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 (1.3).lnk" "%OSGEO4W_ROOT%\bin\qgis-unstable.bat" " " \ "Quantum GIS - Desktop GIS (1.3)" 1 "%OSGEO4W_ROOT%\apps\qgis-unstable\icons\QGIS.ico"
+xxmklink "%ALLUSERSPROFILE%\Desktop\Quantum GIS (1.3).lnk" "%OSGEO4W_ROOT%\bin\qgis-unstable.bat" " " \ "Quantum GIS - Desktop GIS (1.3)" 1 "%OSGEO4W_ROOT%\apps\qgis-unstable\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\qgis-unstable\bin\qgis-unstable.reg"
+"%WINDIR%\regedit" /s "%O4W_ROOT%\apps\qgis-unstable\bin\qgis-unstable.reg"
Modified: branches/Release-1_3_0/ms-windows/osgeo4w/preremove.bat
===================================================================
--- branches/Release-1_3_0/ms-windows/osgeo4w/preremove.bat 2009-09-12 21:52:30 UTC (rev 11643)
+++ branches/Release-1_3_0/ms-windows/osgeo4w/preremove.bat 2009-09-12 22:06:41 UTC (rev 11644)
@@ -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 (1.3).lnk"
+del "%ALLUSERSPROFILE%\Desktop\Quantum GIS (1.3).lnk"
+del "%OSGEO4W_ROOT%"\bin\qgis-unstable.bat
+del "%OSGEO4W_ROOT%"\apps\qgis-unstable\python\qgis\qgisconfig.py
Deleted: branches/Release-1_3_0/ms-windows/osgeo4w/qgis-dev.bat.tmpl
===================================================================
--- branches/Release-1_3_0/ms-windows/osgeo4w/qgis-dev.bat.tmpl 2009-09-12 21:52:30 UTC (rev 11643)
+++ branches/Release-1_3_0/ms-windows/osgeo4w/qgis-dev.bat.tmpl 2009-09-12 22:06:41 UTC (rev 11644)
@@ -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: branches/Release-1_3_0/ms-windows/osgeo4w/qgis-dev.reg.tmpl
===================================================================
--- branches/Release-1_3_0/ms-windows/osgeo4w/qgis-dev.reg.tmpl 2009-09-12 21:52:30 UTC (rev 11643)
+++ branches/Release-1_3_0/ms-windows/osgeo4w/qgis-dev.reg.tmpl 2009-09-12 22:06:41 UTC (rev 11644)
@@ -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: branches/Release-1_3_0/ms-windows/osgeo4w/qgis.bat.tmpl (from rev 11643, branches/Release-1_3_0/ms-windows/osgeo4w/qgis-dev.bat.tmpl)
===================================================================
--- branches/Release-1_3_0/ms-windows/osgeo4w/qgis.bat.tmpl (rev 0)
+++ branches/Release-1_3_0/ms-windows/osgeo4w/qgis.bat.tmpl 2009-09-12 22:06:41 UTC (rev 11644)
@@ -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\qgis-unstable\bin\qgis.exe %*
Copied: branches/Release-1_3_0/ms-windows/osgeo4w/qgis.reg.tmpl (from rev 11643, branches/Release-1_3_0/ms-windows/osgeo4w/qgis-dev.reg.tmpl)
===================================================================
--- branches/Release-1_3_0/ms-windows/osgeo4w/qgis.reg.tmpl (rev 0)
+++ branches/Release-1_3_0/ms-windows/osgeo4w/qgis.reg.tmpl 2009-09-12 22:06:41 UTC (rev 11644)
@@ -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\\qgis-unstable\\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-unstable.bat\" \"%1\""
+
+[HKEY_CLASSES_ROOT\.qgs]
+@="Quantum GIS Project"
+
More information about the QGIS-commit
mailing list