Skip to content

Commit 480b103

Browse files
author
jef
committedSep 12, 2009
update osgeo4w packaging
git-svn-id: http://svn.osgeo.org/qgis/branches/Release-1_3_0@11644 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent afeb742 commit 480b103

File tree

5 files changed

+17
-18
lines changed

5 files changed

+17
-18
lines changed
 

‎ms-windows/osgeo4w/package.cmd

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@echo off
22
set GRASS_VERSION=6.4.0svn
33
set SVNVERSION=c:/cygwin/bin/svnversion
4-
set PACKAGENAME=qgis-dev
4+
set PACKAGENAME=qgis-unstable
55

66
set BUILDDIR=%CD%\build
77
REM set BUILDDIR=%TEMP%\qgis_unstable
@@ -36,8 +36,7 @@ if "%DEVENV%"=="" goto error
3636

3737
PROMPT qgis%VERSION%$g
3838

39-
set BUILDCONF=RelWithDebInfo
40-
REM set BUILDCONF=Release
39+
set BUILDCONF=Release
4140

4241

4342
cd ..\..
@@ -129,8 +128,8 @@ echo PACKAGE: %DATE% %TIME%>>%LOG% 2>&1
129128
cd ..
130129
copy postinstall.bat %OSGEO4W_ROOT%\etc\postinstall\%PACKAGENAME%.bat
131130
copy preremove.bat %OSGEO4W_ROOT%\etc\preremove\%PACKAGENAME%.bat
132-
copy %PACKAGENAME%.bat.tmpl %OSGEO4W_ROOT%\bin\%PACKAGENAME%.bat.tmpl
133-
copy qgis-dev.reg.tmpl %OSGEO4W_ROOT%\apps\%PACKAGENAME%\bin\qgis-dev.reg.tmpl
131+
copy qgis.bat.tmpl %OSGEO4W_ROOT%\bin\%PACKAGENAME%.bat.tmpl
132+
copy qgis.reg.tmpl %OSGEO4W_ROOT%\apps\%PACKAGENAME%\bin\%PACKAGENAME%.reg.tmpl
134133

135134
sed -e 's/%OSGEO4W_ROOT:\=\\\\\\\\%/@osgeo4w@/' %OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py >%OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py.tmpl
136135
if errorlevel 1 goto error

‎ms-windows/osgeo4w/postinstall.bat

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
textreplace -std -t bin\qgis-dev.bat
2-
textreplace -std -t apps\qgis-dev\python\qgis\qgisconfig.py
1+
textreplace -std -t bin\qgis-unstable.bat
2+
textreplace -std -t apps\qgis-unstable\python\qgis\qgisconfig.py
33

44
mkdir "%OSGEO4W_STARTMENU%"
5-
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"
6-
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"
5+
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"
6+
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"
77

88
set O4W_ROOT=%OSGEO4W_ROOT%
99
set OSGEO4W_ROOT=%OSGEO4W_ROOT:\=\\%
10-
textreplace -std -t "%O4W_ROOT%\apps\qgis-dev\bin\qgis-dev.reg"
11-
"%WINDIR%\regedit" /s "%O4W_ROOT%\apps\qgis-dev\bin\qgis-dev.reg"
10+
textreplace -std -t "%O4W_ROOT%\apps\qgis-unstable\bin\qgis-unstable.reg"
11+
"%WINDIR%\regedit" /s "%O4W_ROOT%\apps\qgis-unstable\bin\qgis-unstable.reg"

‎ms-windows/osgeo4w/preremove.bat

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
del "%OSGEO4W_STARTMENU%\Quantum GIS (trunk).lnk"
2-
del "%ALLUSERSPROFILE%\Desktop\Quantum GIS (trunk).lnk"
3-
del "%OSGEO4W_ROOT%"\bin\qgis-dev.bat
4-
del "%OSGEO4W_ROOT%"\apps\qgis-dev\python\qgis\qgisconfig.py
1+
del "%OSGEO4W_STARTMENU%\Quantum GIS (1.3).lnk"
2+
del "%ALLUSERSPROFILE%\Desktop\Quantum GIS (1.3).lnk"
3+
del "%OSGEO4W_ROOT%"\bin\qgis-unstable.bat
4+
del "%OSGEO4W_ROOT%"\apps\qgis-unstable\python\qgis\qgisconfig.py

‎ms-windows/osgeo4w/qgis-dev.bat.tmpl renamed to ‎ms-windows/osgeo4w/qgis.bat.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ call "%OSGEO4W_ROOT%"\bin\o4w_env.bat
55
call "%OSGEO4W_ROOT%"\bin\gdal16.bat
66
@echo off
77
path %PATH%;%GISBASE%\bin
8-
start "Quantum GIS" /B "%OSGEO4W_ROOT%"\apps\qgis-dev\bin\qgis.exe %*
8+
start "Quantum GIS" /B "%OSGEO4W_ROOT%"\apps\qgis-unstable\bin\qgis.exe %*

‎ms-windows/osgeo4w/qgis-dev.reg.tmpl renamed to ‎ms-windows/osgeo4w/qgis.reg.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ Windows Registry Editor Version 5.00
44
@="Quantum GIS Project"
55

66
[HKEY_CLASSES_ROOT\Quantum GIS Project\DefaultIcon]
7-
@="@osgeo4w@\\apps\\qgis-dev\\icons\\qgis.ico"
7+
@="@osgeo4w@\\apps\\qgis-unstable\\icons\\qgis.ico"
88

99
[HKEY_CLASSES_ROOT\Quantum GIS Project\Shell]
1010

1111
[HKEY_CLASSES_ROOT\Quantum GIS Project\Shell\open]
1212
@=""
1313

1414
[HKEY_CLASSES_ROOT\Quantum GIS Project\Shell\open\command]
15-
@="\"@osgeo4w@\\bin\\qgis-dev.bat\" \"%1\""
15+
@="\"@osgeo4w@\\bin\\qgis-unstable.bat\" \"%1\""
1616

1717
[HKEY_CLASSES_ROOT\.qgs]
1818
@="Quantum GIS Project"

0 commit comments

Comments
 (0)
Please sign in to comment.