Merge branch 'release-1_7_0' of github.com:qgis/Quantum-GIS into rele…

…ase-1_7_0
qgis · Jun 28, 2011 · db77166 · db77166
2 parents 6eeb8cd + 95b41c8
commit db77166
Show file tree

Hide file tree

Showing 11 changed files with 143 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,3 +37,4 @@ scripts/astyle.exe
 doc/CODING.html
 doc/CODING.tex
 doc/INSTALL.tex
+scripts/RelWithDebInfo
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -472,12 +472,21 @@ ELSE (SVN_MARKER)
   IF (GIT_MARKER)
     FIND_PROGRAM(GIT git PATHS c:/cygwin/bin)
     IF(GIT)
-      ADD_CUSTOM_COMMAND(
-        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
-        COMMAND echo \\\#define QGSSVNVERSION \\\"$$\( ${GIT} log -n1 --grep='git-svn-id' | sed -ne 's/^  *git-svn-id:.*@\\\([0-9]*\\\).*$$/\\1/p' \)$$\( ${GIT} log --oneline $$\( ${GIT} log -n1 --grep='git-svn-id' --pretty=%H \).. | wc -l | sed -e 's/^/+/' -e 's/+0$$//' \)\\\" >${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
-        MAIN_DEPENDENCY ${GIT_MARKER}
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-      )
+      IF(MSVC)
+        ADD_CUSTOM_COMMAND(
+          OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
+          COMMAND for /f \"usebackq tokens=1\" %%a in "(`\"${GIT}\" log -n1 --oneline`)" do echo \#define QGSSVNVERSION \"%%a\" >${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
+          MAIN_DEPENDENCY ${GIT_MARKER}
+          WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        )
+      ELSE(MSVC)
+        ADD_CUSTOM_COMMAND(
+          OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
+          COMMAND echo \\#define QGSSVNVERSION \\\"$$\( ${GIT} log -n1 --pretty=%h \)\\\" >${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
+          MAIN_DEPENDENCY ${GIT_MARKER}
+          WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        )
+      ENDIF(MSVC)
     ELSE(GIT)
       MESSAGE(STATUS "git marker, but no git found - version will be unknown")
       FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h "#define QGSSVNVERSION \"unknown\"")

diff --git a/debian/qgis-plugin-grass-common.install.jaunty b/debian/qgis-plugin-grass-common.install.jaunty
@@ -0,0 +1,7 @@
+usr/share/qgis/grass/locations.gml
+usr/share/qgis/grass/world.png
+usr/share/qgis/grass/config
+usr/share/qgis/grass/modules/*.png
+usr/share/qgis/grass/modules/*.qgm
+usr/share/qgis/grass/modules/*.svg
+usr/share/qgis/themes/*/grass
diff --git a/images/splash/web_banner.jpg b/images/splash/web_banner.jpg
diff --git a/images/splash/web_banner.xcf.bz2 b/images/splash/web_banner.xcf.bz2
diff --git a/ms-windows/osgeo4w/httpd.conf.tmpl b/ms-windows/osgeo4w/httpd.conf.tmpl
@@ -0,0 +1,14 @@
+LoadModule fcgid_module modules/mod_fcgid.so
+
+DefaultInitEnv PATH "@osgeo4w@\bin;@osgeo4w@\apps\@package@\bin;@osgeo4w@\apps\grass\grass-@grassversion@\bin;@osgeo4w@\apps\grass\grass-@grassversion@\lib;@windir@\system32;@windir@;@windir@\System32\Wbem"
+DefaultInitEnv QGIS_PREFIX_PATH "@osgeo4w@\apps\qgis"
+DefaultInitEnv TEMP "@temp@"
+
+Alias /qgis/ @osgeo4w@/apps/qgis/bin/
+
+<Directory "@osgeo4w@/apps/qgis/bin/">
+    SetHandler fcgid-script
+    Options ExecCGI
+    Order allow,deny
+    Allow from all
+</Directory>
diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -1,6 +1,5 @@
 @echo off
 set GRASS_VERSION=6.4.1
-set SVNVERSION=c:/cygwin/bin/svnversion
 
 set BUILDDIR=%CD%\build
 REM set BUILDDIR=%TEMP%\qgis_unstable
@@ -47,6 +46,8 @@ set SRCDIR=%CD%
 if "%BUILDDIR:~1,1%"==":" %BUILDDIR:~0,2%
 cd %BUILDDIR%
 
+if exist repackage goto package
+
 if not exist build.log goto build
 
 REM
@@ -110,7 +111,6 @@ cmake -G "Visual Studio 9 2008" ^
 	-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /ZI /Od /D NDEBUG" ^
 	-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^
 	-D FCGI_LIBRARY=%O4W_ROOT%/lib/libfcgi.lib ^
-	-D SVNVERSION="%SVNVERSION%" ^
 	%SRCDIR%>>%LOG% 2>&1
 if errorlevel 1 goto error
 
@@ -132,13 +132,17 @@ echo INSTALL: %DATE% %TIME%>>%LOG% 2>&1
 %DEVENV% qgis%VERSION%.sln /Project INSTALL /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
 if errorlevel 1 goto error
 
+:package
 echo PACKAGE: %DATE% %TIME%>>%LOG% 2>&1
 
 cd ..
-sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' postinstall.bat >%OSGEO4W_ROOT%\etc\postinstall\%PACKAGENAME%.bat
-sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' preremove.bat >%OSGEO4W_ROOT%\etc\preremove\%PACKAGENAME%.bat
+sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' postinstall-desktop.bat >%OSGEO4W_ROOT%\etc\postinstall\%PACKAGENAME%.bat
+sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' preremove-desktop.bat >%OSGEO4W_ROOT%\etc\preremove\%PACKAGENAME%.bat
 sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' qgis.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%.bat.tmpl
 sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' qgis.reg.tmpl >%OSGEO4W_ROOT%\apps\%PACKAGENAME%\bin\qgis.reg.tmpl
+sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' postinstall-server.bat >%OSGEO4W_ROOT%\etc\postinstall\%PACKAGENAME%-server.bat
+sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' preremove-server.bat >%OSGEO4W_ROOT%\etc\preremove\%PACKAGENAME%-server.bat
+sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' httpd.conf.tmpl >%OSGEO4W_ROOT%\httpd.d\httpd_%PACKAGENAME%.conf.tmpl
 
 REM sed -e 's/%OSGEO4W_ROOT:\=\\\\\\\\%/@osgeo4w@/' %OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py >%OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py.tmpl
 REM if errorlevel 1 goto error
@@ -147,21 +151,89 @@ REM del %OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py
 
 touch exclude
 
+tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-common-%VERSION%-%PACKAGE%.tar.bz2 ^
+	--exclude-from exclude ^
+	--exclude "*.pyc" ^
+	"apps/%PACKAGENAME%/bin/Microsoft.VC90.CRT.manifest" ^
+	"apps/%PACKAGENAME%/bin/msvcm90.dll" ^
+	"apps/%PACKAGENAME%/bin/msvcp90.dll" ^
+	"apps/%PACKAGENAME%/bin/msvcr90.dll" ^
+	"apps/%PACKAGENAME%/bin/qgispython.dll" ^
+	"apps/%PACKAGENAME%/bin/qgis_analysis.dll" ^
+	"apps/%PACKAGENAME%/bin/qgis_core.dll" ^
+	"apps/%PACKAGENAME%/bin/qgis_gui.dll" ^
+	"apps/%PACKAGENAME%/doc/" ^
+	"apps/%PACKAGENAME%/plugins/delimitedtextprovider.dll" ^
+	"apps/%PACKAGENAME%/plugins/diagramoverlay.dll" ^
+	"apps/%PACKAGENAME%/plugins/gdalprovider.dll" ^
+	"apps/%PACKAGENAME%/plugins/gpxprovider.dll" ^
+	"apps/%PACKAGENAME%/plugins/memoryprovider.dll" ^
+	"apps/%PACKAGENAME%/plugins/ogrprovider.dll" ^
+	"apps/%PACKAGENAME%/plugins/osmprovider.dll" ^
+	"apps/%PACKAGENAME%/plugins/postgresprovider.dll" ^
+	"apps/%PACKAGENAME%/plugins/spatialiteprovider.dll" ^
+	"apps/%PACKAGENAME%/plugins/sqlanywhereprovider.dll" ^
+	"apps/%PACKAGENAME%/plugins/qgissqlanyconnection.dll" ^
+	"apps/%PACKAGENAME%/plugins/wfsprovider.dll" ^
+	"apps/%PACKAGENAME%/plugins/wmsprovider.dll" ^
+	"apps/%PACKAGENAME%/resources/qgis.db" ^
+	"apps/%PACKAGENAME%/resources/spatialite.db" ^
+	"apps/%PACKAGENAME%/resources/srs.db" ^
+	"apps/%PACKAGENAME%/resources/symbology-ng-style.xml" ^
+	"apps/%PACKAGENAME%/svg/" ^
+	>>%LOG% 2>&1
+if errorlevel 1 goto error
+
+tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-server-%VERSION%-%PACKAGE%.tar.bz2 ^
+	--exclude-from exclude ^
+	--exclude "*.pyc" ^
+	"apps/%PACKAGENAME%/bin/qgis_mapserv.fcgi.exe" ^
+	"apps/%PACKAGENAME%/bin/admin.sld" ^
+	"apps/%PACKAGENAME%/bin/wms_metadata.xml" ^
+	"httpd.d/httpd_%PACKAGENAME%.conf.tmpl" ^
+	"etc/postinstall/%PACKAGENAME%-server.bat" ^
+	"etc/preremove/%PACKAGENAME%-server.bat" ^
+	>>%LOG% 2>&1
+if errorlevel 1 goto error
+
 tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 ^
 	--exclude-from exclude ^
 	--exclude "*.pyc" ^
-	--exclude "apps/%PACKAGENAME%/themes/classic/grass" ^
-	--exclude "apps/%PACKAGENAME%/themes/default/grass" ^
-	--exclude "apps/%PACKAGENAME%/themes/gis/grass" ^
-	--exclude "apps/%PACKAGENAME%/grass" ^
-	--exclude "apps/%PACKAGENAME%/bin/qgisgrass.dll" ^
-	--exclude "apps/%PACKAGENAME%/plugins/grassrasterprovider.dll" ^
-	--exclude "apps/%PACKAGENAME%/plugins/grassplugin.dll" ^
-	--exclude "apps/%PACKAGENAME%/plugins/grassprovider.dll" ^
-	apps/%PACKAGENAME% ^
-	bin/%PACKAGENAME%.bat.tmpl ^
-	etc/postinstall/%PACKAGENAME%.bat ^
-	etc/preremove/%PACKAGENAME%.bat ^
+	--exclude apps/%PACKAGENAME%/themes/classic/grass ^
+	--exclude apps/%PACKAGENAME%/themes/default/grass ^
+	--exclude apps/%PACKAGENAME%/themes/gis/grass ^
+	"apps/%PACKAGENAME%/bin/qgis.exe" ^
+	"apps/%PACKAGENAME%/bin/qgis.reg.tmpl" ^
+	"apps/%PACKAGENAME%/i18n/" ^
+	"apps/%PACKAGENAME%/icons/" ^
+	"apps/%PACKAGENAME%/images/" ^
+	"apps/%PACKAGENAME%/plugins/coordinatecaptureplugin.dll" ^
+	"apps/%PACKAGENAME%/plugins/copyrightlabelplugin.dll" ^
+	"apps/%PACKAGENAME%/plugins/delimitedtextplugin.dll" ^
+	"apps/%PACKAGENAME%/plugins/displacementplugin.dll" ^
+	"apps/%PACKAGENAME%/plugins/dxf2shpconverterplugin.dll" ^
+	"apps/%PACKAGENAME%/plugins/evis.dll" ^
+	"apps/%PACKAGENAME%/plugins/georefplugin.dll" ^
+	"apps/%PACKAGENAME%/plugins/gpsimporterplugin.dll" ^
+	"apps/%PACKAGENAME%/plugins/interpolationplugin.dll" ^
+	"apps/%PACKAGENAME%/plugins/northarrowplugin.dll" ^
+	"apps/%PACKAGENAME%/plugins/offlineeditingplugin.dll" ^
+	"apps/%PACKAGENAME%/plugins/oracleplugin.dll" ^
+	"apps/%PACKAGENAME%/plugins/rasterterrainplugin.dll" ^
+	"apps/%PACKAGENAME%/plugins/roadgraphplugin.dll" ^
+	"apps/%PACKAGENAME%/plugins/scalebarplugin.dll" ^
+	"apps/%PACKAGENAME%/plugins/spatialqueryplugin.dll" ^
+	"apps/%PACKAGENAME%/plugins/spitplugin.dll" ^
+	"apps/%PACKAGENAME%/plugins/sqlanywhereplugin.dll" ^
+	"apps/%PACKAGENAME%/plugins/wfsplugin.dll" ^
+	"apps/%PACKAGENAME%/qgis_help.exe" ^
+	"apps/%PACKAGENAME%/python/" ^
+	"apps/%PACKAGENAME%/resources/context_help/" ^
+	"apps/%PACKAGENAME%/resources/qgis_help.db" ^
+	"apps/%PACKAGENAME%/themes/" ^
+	"bin/%PACKAGENAME%.bat.tmpl" ^
+	"etc/postinstall/%PACKAGENAME%.bat" ^
+	"etc/preremove/%PACKAGENAME%.bat" ^
 	>>%LOG% 2>&1
 if errorlevel 1 goto error
 
@@ -179,12 +251,24 @@ tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-grass-plugin-%VERSION%-%PACKAGE%.tar.bz
 	>>%LOG% 2>&1
 if errorlevel 1 goto error
 
+tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-devel-%VERSION%-%PACKAGE%.tar.bz2 ^
+	--exclude-from exclude ^
+	--exclude "*.pyc" ^
+	"apps/%PACKAGENAME%/FindQGIS.cmake" ^
+	"apps/%PACKAGENAME%/include/" ^
+	"apps/%PACKAGENAME%/lib/" ^
+	>>%LOG% 2>&1
+if errorlevel 1 goto error
+
 goto end
 
 :error
 echo BUILD ERROR %ERRORLEVEL%: %DATE% %TIME%
 echo BUILD ERROR %ERRORLEVEL%: %DATE% %TIME%>>%LOG% 2>&1
+if exist %PACKAGENAME%-common-%VERSION%-%PACKAGE%.tar.bz2 del %PACKAGENAME%-common-%VERSION%-%PACKAGE%.tar.bz2
 if exist %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 del %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2
+if exist %PACKAGENAME%-server-%VERSION%-%PACKAGE%.tar.bz2 del %PACKAGENAME%-server-%VERSION%-%PACKAGE%.tar.bz2
+if exist %PACKAGENAME%-devel-%VERSION%-%PACKAGE%.tar.bz2 del %PACKAGENAME%-devel-%VERSION%-%PACKAGE%.tar.bz2
 if exist %PACKAGENAME%-grass-plugin-%VERSION%-%PACKAGE%.tar.bz2 del %PACKAGENAME%-grass-plugin-%VERSION%-%PACKAGE%.tar.bz2
 
 :end

diff --git a/ms-windows/osgeo4w/postinstall.bat → ms-windows/osgeo4w/postinstall-desktop.bat b/ms-windows/osgeo4w/postinstall.bat → ms-windows/osgeo4w/postinstall-desktop.bat
diff --git a/ms-windows/osgeo4w/postinstall-server.bat b/ms-windows/osgeo4w/postinstall-server.bat
@@ -0,0 +1,5 @@
+textreplace -std ^
+	-map @windir@ "%WINDIR%" ^
+	-map @temp@ "%TEMP%" ^
+	-t httpd.d\httpd_@package@.conf
+del httpd.d\httpd_@package@.conf.tmpl
diff --git a/ms-windows/osgeo4w/preremove.bat → ms-windows/osgeo4w/preremove-desktop.bat b/ms-windows/osgeo4w/preremove.bat → ms-windows/osgeo4w/preremove-desktop.bat
diff --git a/ms-windows/osgeo4w/preremove-server.bat b/ms-windows/osgeo4w/preremove-server.bat
@@ -0,0 +1 @@
+del "%OSGEO4W_ROOT%"\httpd.d\httpd_@package@.conf