master merge

qgis · Jul 20, 2012 · 73f991f · 73f991f
2 parents 47b8d60 + c517a90
commit 73f991f
Show file tree

Hide file tree

Showing 237 changed files with 42,666 additions and 29,367 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -221,7 +221,8 @@ ELSE ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_M
     SET (WITH_TOUCH FALSE)
 ENDIF ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 )
 IF (WITH_TOUCH)
-    ADD_DEFINITIONS(-DHAVE_TOUCH)
+    # following variable is used in qgsconfig.h
+    SET (HAVE_TOUCH TRUE)
     MESSAGE (STATUS "Touch support enabled")
 ELSE (WITH_TOUCH)
     MESSAGE (STATUS "Touch support disabled")

diff --git a/cmake_templates/qgsconfig.h.in b/cmake_templates/qgsconfig.h.in
@@ -35,5 +35,7 @@
 
 #cmakedefine HAVE_PYTHON
 
+#cmakedefine HAVE_TOUCH
+
 #endif
 
diff --git a/doc/AUTHORS b/doc/AUTHORS
@@ -44,3 +44,4 @@ Alessandro Furieri	<a.furieri at lqt.it>
 Alexander Bruy	<alexander.bruy@gmail.com>
 Marco Bernasocchi	<marco at bernawebdesign dot ch>
 Nathan Woodrow	<woodrow.nathan at gmail.com>
+Etienne Tourigny  <etourigny.dev at gmail.com>
diff --git a/doc/CONTRIBUTORS b/doc/CONTRIBUTORS
@@ -29,9 +29,10 @@ Giuseppe Sucameli
 Horst Duester
 Hyao (IRC nickname)
 Ivan Lucena
-Jean-Denis Giguere 
+Jean-Denis Giguere
 Jeremy Palmer
 Jerrit Collord
+Larry Shaffer
 Luiz Motta
 Magnus Homann
 Marco Pasetti
@@ -53,5 +54,5 @@ Tamas Szekeres
 Tom Russo
 Tyler Mitchell
 Vita Cizek
-Yann Chemin 
+Yann Chemin
 Includes Map icons CC-0 from SJJB Management
diff --git a/doc/INSTALL.t2t b/doc/INSTALL.t2t
@@ -112,4 +112,8 @@ source directory.
 
 %!include: osx.t2t
 
+%!include: wcs-test-server.t2t
+%!include: jenkins.t2t
+
+
 %!include: iauthors.t2t
diff --git a/doc/TRANSLATORS b/doc/TRANSLATORS
diff --git a/doc/iauthors.t2t b/doc/iauthors.t2t
@@ -27,5 +27,11 @@ The following people have contributed to this document:
  - Tim Sutton 2006
  - Debian package section: Juergen Fischer 2008
 
+- WCS Test Server Section
+ - Tim Sutton, Radim Blazek 2012
+
+- Jenkins CI Configuration
+ - Tim Sutton 2012
+
 - Latex Generator
  - Tim Sutton 2011
diff --git a/doc/jenkins.t2t b/doc/jenkins.t2t
@@ -0,0 +1,89 @@
+
+= Setting up a Jenkins Build Server =
+
+**Assumption:** You know how to make a working build environment and want to
+deploy it under Jenkins for continuous integration testing now.
+
+These notes are terse, I will expand on them later as the need arises. The 
+procedure is:
+
+- Install Jenkins and get it configured according to your own preferences
+- Make sure you have the git, github, junit etc plugins installed. A complete
+  list of the plugins I have installed follows (note that you almost certainly
+  don't need evey plugin listed here):
+ - External Monitor Job Type Plugin
+ - LDAP Plugin
+ - pam-auth
+ - javadoc
+ - ant
+ - Jenkins Subversion Plug-in
+ - Git Plugin
+ - Maven 2 Project Plugin
+ - Jenkins SLOCCount Plug-in
+ - Jenkins Sounds plugin
+ - Jenkins Translation Assistance plugin
+ - ruby-runtime
+ - Jenkins CVS Plug-in
+ - Coverage/Complexity Scatter Plot PlugIn
+ - Status Monitor Plugin
+ - Git Parameter Plug-In
+ - github-api
+ - GitHub plugin
+ - Jenkins Violations plugin
+ - git-notes Plugin
+ - Twitter plugin
+ - Jenkins Cobertura Plugin
+ - Jenkins Gravatar plugin
+ - Jenkins SSH Slaves plugin
+- Create a Job called 'QGIS'
+- Use the following options for your job:
+ - Job Name: QGIS
+ - Job Type: Build a free-style software project
+ - Tick enable project based security (you need to elsewhere configure your
+   Jenkins security to per project settings)
+ - Allow Anonymous user Read and Discover access
+ - Set the github project to https://github.com/qgis/Quantum-GIS/
+ - Set source code management to Git
+ - Set repository url to git://github.com/qgis/Quantum-GIS.git
+ - In advanced repository url settings set refspec to : 
+
+```
++refs/heads/master:refs/remotes/origin/master
+```
+
+ - Set branch to build to master
+ - Repository Browser: Auto
+ - Build triggers: set to Poll SCM and set schedule to ``* * * * *`` (polls every minute)
+ - Build - Execute shell and set shell script to:
+
+```
+  cd build
+  cmake ..
+  xvfb-run --auto-servernum --server-num=1 \
+           --server-args="-screen 0 1024x768x24" \
+           make Experimental || true
+  if [ -f Testing/TAG ] ; then
+     xsltproc ../tests/ctest2junix.xsl \
+       Testing/`head -n 1 < Testing/TAG`/Test.xml > \
+       CTestResults.xml
+  fi
+```
+
+ - Add Junit post build action and set 'Publish Junit test result report' to:
+   ``build/CTestResults.xml``
+ - Email notification: Send separate e-mails to individuals who broke the build
+ - Jenkins sounds - set up sounds for Failure, Success and Unstable.
+ - Save
+ -
+
+Now open the Job dash board and push something to QGIS and wait a minute to
+validate automated builds work.
+
+**Note:** You will need to log in to the Jenkins user account and go to
+/var/lib/jenkins/jobs/QGIS/workspace, then make a ``build`` directory and run
+the initial cmake setup and then do test build. This process is the same as
+described elsewhere in this doc.
+
+I based some of the set up from this nice blog article here:
+
+* http://alexott.blogspot.com/2012/03/jenkins-cmakectest.html
diff --git a/doc/qgis-download-stats.ods b/doc/qgis-download-stats.ods
diff --git a/doc/wcs-test-server.t2t b/doc/wcs-test-server.t2t
@@ -0,0 +1,114 @@
+
+
+= Setting up the WCS test server on GNU/Linux =
+
+**Requires:** Ubuntu / Debian derived distro
+
+These notes are for Ubuntu - other versions and Debian derived distros may
+require slight variations in package names.
+
+== Preparation ==
+
+Note the git repo below will change to the default QGIS repo once this work
+is integrated into master.
+
+  git remote add blazek git://github.com/blazek/Quantum-GIS.git
+  git fetch blazek
+  git branch --track wcs2 blazek/wcs2
+  git checkout wcs2
+  cd /var/www/
+  sudo mkdir wcs
+  sudo chown timlinux wcs
+  cd wcs/
+  mkdir cgi-bin
+  cd cgi-bin/
+
+== Setup mapserver ==
+
+```sudo apt-get install cgi-mapserver```
+
+Set the contents of cgi-bin/wcstest-1.9.0 to:
+
+```
+  #! /bin/sh
+  MS_MAPFILE=/var/www/wcs/testdata/qgis-1.9.0/raster/wcs.map
+  export MS_MAPFILE
+  /usr/lib/cgi-bin/mapserv
+```
+
+Then do:
+
+```
+  chmod +x cgi-bin/wcstest-1.9.0
+  mkdir -p /var/www/wcs/testdata/qgis-1.9.0/raster/
+  cd /var/www/wcs/testdata/qgis-1.9.0/raster/
+  cp -r /home/timlinux/Quantum-GIS/tests/testdata/raster/* .
+```
+
+Edit wcs.map and set the shapepath to this:
+
+```
+  SHAPEPATH "/var/www/wcs/testdata/qgis-1.9.0/raster"
+```
+
+Then create /var/www/wcs/7-wcs.qgis.org.conf setting the contents to this:
+
+```
+  <VirtualHost *:80>
+  ServerName wcs.qgis.org
+  ServerAdmin tim@linfiniti.com
+
+  LogLevel warn
+  LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" \"%{forensic-id}n\"" combined
+  CustomLog /var/log/apache2/wcs_qgis.org/access.log combined
+  ErrorLog /var/log/apache2/wcs_qgis.org/error.log
+
+  DocumentRoot /var/www/wcs/html
+
+  ScriptAlias /cgi-bin/ /var/www/wcs/cgi-bin/
+  <Directory "/var/www/wcs/cgi-bin">
+        AllowOverride None
+        Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+        Order allow,deny
+        Allow from all
+  </Directory>
+
+  RewriteEngine on
+  RewriteRule /1.9.0/wcs /cgi-bin/wcstest-1.9.0 [PT]
+
+  </VirtualHost>
+```
+
+== Create a home page ==
+
+```
+  mkdir html
+  vim html/index.html
+```
+
+Set the contents to:
+
+```
+  This is the test platform for QGIS' wcs client. You can use these services
+  from QGIS directly (to try out WCS for example) by pointing your QGIS to:
+  http://wcs.qgis.org/1.9.0/wcs
+```
+
+
+== Now deploy it ==
+
+```
+  sudo mkdir /var/log/apache2/wcs_qgis.org
+  sudo chown www-data /var/log/apache2/wcs_qgis.org
+  cd /etc/apache2/sites-available/
+  sudo ln -s /var/www/wcs/7-wcs.qgis.org.conf .
+  cd /var/www/wcs/
+  sudo a2ensite 7-wcs.qgis.org.conf
+  sudo /etc/init.d/apache2 reload
+```
+
+== Debugging ==
+
+```
+  sudo tail -f /var/log/apache2/wcs_qgis.org/error.log
+```