Skip to content

Commit 3707092

Browse files
author
jef
committed
update osgeo4w build script
git-svn-id: http://svn.osgeo.org/qgis/branches/Release-1_2_0@11483 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 00a2956 commit 3707092

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

‎ms-windows/osgeo4w/package.cmd‎

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

56
set BUILDDIR=%CD%\build
67
REM set BUILDDIR=%TEMP%\qgis_unstable
@@ -35,8 +36,7 @@ if "%DEVENV%"=="" goto error
3536

3637
PROMPT qgis%VERSION%$g
3738

38-
set BUILDCONF=RelWithDebInfo
39-
REM set BUILDCONF=Release
39+
set BUILDCONF=Release
4040

4141

4242
cd ..\..
@@ -99,7 +99,7 @@ cmake -G "Visual Studio 9 2008" ^
9999
-D QT_HEADERS_DIR=%O4W_ROOT%/include/qt4 ^
100100
-D QT_ZLIB_LIBRARY=%O4W_ROOT%/lib/zlib.lib ^
101101
-D QT_PNG_LIBRARY=%O4W_ROOT%/lib/libpng13.lib ^
102-
-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/qgis-dev ^
102+
-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
103103
-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /ZI /Od /D NDEBUG" ^
104104
-D SVNVERSION="%SVNVERSION%" ^
105105
%SRCDIR%>>%LOG% 2>&1
@@ -126,31 +126,31 @@ if errorlevel 1 goto error
126126
echo PACKAGE: %DATE% %TIME%>>%LOG% 2>&1
127127

128128
cd ..
129-
copy postinstall.bat %OSGEO4W_ROOT%\etc\postinstall\qgis-dev.bat
130-
copy preremove.bat %OSGEO4W_ROOT%\etc\preremove\qgis-dev.bat
131-
copy qgis-dev.bat.tmpl %OSGEO4W_ROOT%\bin\qgis-dev.bat.tmpl
129+
copy postinstall.bat %OSGEO4W_ROOT%\etc\postinstall\%PACKAGENAME%.bat
130+
copy preremove.bat %OSGEO4W_ROOT%\etc\preremove\%PACKAGENAME%.bat
131+
copy qgis.bat.tmpl %OSGEO4W_ROOT%\bin\%PACKAGENAME%.bat.tmpl
132132

133-
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
133+
sed -e 's/%OSGEO4W_ROOT:\=\\\\\\\\%/@osgeo4w@/' %OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py >%OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py.tmpl
134134
if errorlevel 1 goto error
135135

136-
del %OSGEO4W_ROOT%\apps\qgis-dev\python\qgis\qgisconfig.py
136+
del %OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py
137137

138138
touch exclude
139139

140-
tar -C %OSGEO4W_ROOT% -cjf qgis-dev-%VERSION%-%PACKAGE%.tar.bz2 ^
140+
tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 ^
141141
--exclude-from exclude ^
142-
apps/qgis-dev ^
143-
bin/qgis-dev.bat.tmpl ^
144-
etc/postinstall/qgis-dev.bat ^
145-
etc/preremove/qgis-dev.bat>>%LOG% 2>&1
142+
apps/%PACKAGENAME% ^
143+
bin/%PACKAGENAME%.bat.tmpl ^
144+
etc/postinstall/%PACKAGENAME%.bat ^
145+
etc/preremove/%PACKAGENAME%.bat>>%LOG% 2>&1
146146
if errorlevel 1 goto error
147147

148148
goto end
149149

150150
:error
151151
echo BUILD ERROR %ERRORLEVEL%: %DATE% %TIME%
152152
echo BUILD ERROR %ERRORLEVEL%: %DATE% %TIME%>>%LOG% 2>&1
153-
if exist qgis-dev-%VERSION%-%PACKAGE%.tar.bz2 del qgis-dev-%VERSION%-%PACKAGE%.tar.bz2
153+
if exist %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 del %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2
154154

155155
:end
156156
echo FINISHED: %DATE% %TIME% >>%LOG% 2>&1

‎ms-windows/osgeo4w/postinstall.bat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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.2).lnk" "%OSGEO4W_ROOT%\bin\qgis-unstable.bat" " " \ "Quantum GIS - Desktop GIS (1.2)" 1 "%OSGEO4W_ROOT%\apps\qgis-unstable\icons\QGIS.ico"
6+
xxmklink "%ALLUSERSPROFILE%\Desktop\Quantum GIS (1.2).lnk" "%OSGEO4W_ROOT%\bin\qgis-unstable.bat" " " \ "Quantum GIS - Desktop GIS (1.2)" 1 "%OSGEO4W_ROOT%\apps\qgis-unstable\icons\QGIS.ico"

‎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.2).lnk"
2+
del "%ALLUSERSPROFILE%\Desktop\Quantum GIS (1.2).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 %*

0 commit comments

Comments
 (0)