[QGIS Commit] r11483 - branches/Release-1_2_0/ms-windows/osgeo4w
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Aug 22 11:24:12 EDT 2009
Author: jef
Date: 2009-08-22 11:24:11 -0400 (Sat, 22 Aug 2009)
New Revision: 11483
Added:
branches/Release-1_2_0/ms-windows/osgeo4w/qgis.bat.tmpl
Removed:
branches/Release-1_2_0/ms-windows/osgeo4w/qgis-dev.bat.tmpl
Modified:
branches/Release-1_2_0/ms-windows/osgeo4w/package.cmd
branches/Release-1_2_0/ms-windows/osgeo4w/postinstall.bat
branches/Release-1_2_0/ms-windows/osgeo4w/preremove.bat
Log:
update osgeo4w build script
Modified: branches/Release-1_2_0/ms-windows/osgeo4w/package.cmd
===================================================================
--- branches/Release-1_2_0/ms-windows/osgeo4w/package.cmd 2009-08-22 11:01:34 UTC (rev 11482)
+++ branches/Release-1_2_0/ms-windows/osgeo4w/package.cmd 2009-08-22 15:24:11 UTC (rev 11483)
@@ -1,6 +1,7 @@
- at echo off
+REM @echo off
set GRASS_VERSION=6.4.0svn
set SVNVERSION=c:/cygwin/bin/svnversion
+set PACKAGENAME=qgis-unstable
set BUILDDIR=%CD%\build
REM set BUILDDIR=%TEMP%\qgis_unstable
@@ -35,8 +36,7 @@
PROMPT qgis%VERSION%$g
-set BUILDCONF=RelWithDebInfo
-REM set BUILDCONF=Release
+set BUILDCONF=Release
cd ..\..
@@ -99,7 +99,7 @@
-D QT_HEADERS_DIR=%O4W_ROOT%/include/qt4 ^
-D QT_ZLIB_LIBRARY=%O4W_ROOT%/lib/zlib.lib ^
-D QT_PNG_LIBRARY=%O4W_ROOT%/lib/libpng13.lib ^
- -D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/qgis-dev ^
+ -D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /ZI /Od /D NDEBUG" ^
-D SVNVERSION="%SVNVERSION%" ^
%SRCDIR%>>%LOG% 2>&1
@@ -126,23 +126,23 @@
echo PACKAGE: %DATE% %TIME%>>%LOG% 2>&1
cd ..
-copy postinstall.bat %OSGEO4W_ROOT%\etc\postinstall\qgis-dev.bat
-copy preremove.bat %OSGEO4W_ROOT%\etc\preremove\qgis-dev.bat
-copy qgis-dev.bat.tmpl %OSGEO4W_ROOT%\bin\qgis-dev.bat.tmpl
+copy postinstall.bat %OSGEO4W_ROOT%\etc\postinstall\%PACKAGENAME%.bat
+copy preremove.bat %OSGEO4W_ROOT%\etc\preremove\%PACKAGENAME%.bat
+copy qgis.bat.tmpl %OSGEO4W_ROOT%\bin\%PACKAGENAME%.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
+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
-del %OSGEO4W_ROOT%\apps\qgis-dev\python\qgis\qgisconfig.py
+del %OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py
touch exclude
-tar -C %OSGEO4W_ROOT% -cjf qgis-dev-%VERSION%-%PACKAGE%.tar.bz2 ^
+tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 ^
--exclude-from exclude ^
- apps/qgis-dev ^
- bin/qgis-dev.bat.tmpl ^
- etc/postinstall/qgis-dev.bat ^
- etc/preremove/qgis-dev.bat>>%LOG% 2>&1
+ apps/%PACKAGENAME% ^
+ bin/%PACKAGENAME%.bat.tmpl ^
+ etc/postinstall/%PACKAGENAME%.bat ^
+ etc/preremove/%PACKAGENAME%.bat>>%LOG% 2>&1
if errorlevel 1 goto error
goto end
@@ -150,7 +150,7 @@
:error
echo BUILD ERROR %ERRORLEVEL%: %DATE% %TIME%
echo BUILD ERROR %ERRORLEVEL%: %DATE% %TIME%>>%LOG% 2>&1
-if exist qgis-dev-%VERSION%-%PACKAGE%.tar.bz2 del qgis-dev-%VERSION%-%PACKAGE%.tar.bz2
+if exist %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 del %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2
:end
echo FINISHED: %DATE% %TIME% >>%LOG% 2>&1
Modified: branches/Release-1_2_0/ms-windows/osgeo4w/postinstall.bat
===================================================================
--- branches/Release-1_2_0/ms-windows/osgeo4w/postinstall.bat 2009-08-22 11:01:34 UTC (rev 11482)
+++ branches/Release-1_2_0/ms-windows/osgeo4w/postinstall.bat 2009-08-22 15:24:11 UTC (rev 11483)
@@ -1,6 +1,6 @@
-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.2).lnk" "%OSGEO4W_ROOT%\bin\qgis-unstable.bat" " " \ "Quantum GIS - Desktop GIS (1.2)" 1 "%OSGEO4W_ROOT%\apps\qgis-unstable\icons\QGIS.ico"
+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"
Modified: branches/Release-1_2_0/ms-windows/osgeo4w/preremove.bat
===================================================================
--- branches/Release-1_2_0/ms-windows/osgeo4w/preremove.bat 2009-08-22 11:01:34 UTC (rev 11482)
+++ branches/Release-1_2_0/ms-windows/osgeo4w/preremove.bat 2009-08-22 15:24:11 UTC (rev 11483)
@@ -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.2).lnk"
+del "%ALLUSERSPROFILE%\Desktop\Quantum GIS (1.2).lnk"
+del "%OSGEO4W_ROOT%"\bin\qgis-unstable.bat
+del "%OSGEO4W_ROOT%"\apps\qgis-unstable\python\qgis\qgisconfig.py
Deleted: branches/Release-1_2_0/ms-windows/osgeo4w/qgis-dev.bat.tmpl
===================================================================
--- branches/Release-1_2_0/ms-windows/osgeo4w/qgis-dev.bat.tmpl 2009-08-22 11:01:34 UTC (rev 11482)
+++ branches/Release-1_2_0/ms-windows/osgeo4w/qgis-dev.bat.tmpl 2009-08-22 15:24:11 UTC (rev 11483)
@@ -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 %*
Copied: branches/Release-1_2_0/ms-windows/osgeo4w/qgis.bat.tmpl (from rev 11481, branches/Release-1_2_0/ms-windows/osgeo4w/qgis-dev.bat.tmpl)
===================================================================
--- branches/Release-1_2_0/ms-windows/osgeo4w/qgis.bat.tmpl (rev 0)
+++ branches/Release-1_2_0/ms-windows/osgeo4w/qgis.bat.tmpl 2009-08-22 15:24:11 UTC (rev 11483)
@@ -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 %*
More information about the QGIS-commit
mailing list