master merge

qgis · Jul 29, 2012 · d875c96 · d875c96
2 parents 5a5928e + 1eeb537
commit d875c96
Show file tree

Hide file tree

Showing 391 changed files with 46,244 additions and 28,164 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/MacBundleMacros.cmake b/cmake/MacBundleMacros.cmake
@@ -2,13 +2,13 @@
 
 # BundleUtilities has functions to bundle and fixup libraries into an
 # application package, but it's all-or-nothing and is missing some features:
-# 
+#
 # - @loader_path
 # - helper functions can't get install_name, just dependencies
 
 # the following cmakecache vars must be set, redefine them
 # with config-file substitutions in install-run scripts:
-# 
+#
 # CPACK_PACKAGE_VERSION_MAJOR, CPACK_PACKAGE_VERSION_MINOR
 # CMAKE_INSTALL_PREFIX, CMAKE_VERBOSE_MAKEFILE, CMAKE_BUILD_TYPE
 # CMAKE_OSX_ARCHITECTURES, OSX_HAVE_LOADERPATH
@@ -118,8 +118,8 @@ FUNCTION (UPDATEQGISPATHS LIBFROM LIBTO)
         # libs
         IF (${OSX_HAVE_LOADERPATH})
             # bundled frameworks can use short relative path
-            IF (ISLIB})
-                SET (LIB_CHG_TO "${ATLOADER}/${QGIS_FW_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
+            IF (ISLIB)
+                SET (LIB_CHG_TO "${ATLOADER}/../../../${QGIS_FW_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
             ElSE ()
                 SET (LIB_CHG_TO "${ATLOADER}/../../../${LIBPOST}")
             ENDIF ()

diff --git a/cmake/SIPMacros.cmake b/cmake/SIPMacros.cmake
@@ -46,7 +46,7 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP)
     SET(EXTRA_LINK_LIBRARIES ${ARGN})
 
     STRING(REPLACE "." "/" _x ${MODULE_NAME})
-    GET_FILENAME_COMPONENT(_parent_module_path ${_x}  PATH)
+    GET_FILENAME_COMPONENT(_parent_module_path ${_x} PATH)
     GET_FILENAME_COMPONENT(_child_module_name ${_x} NAME)
 
     GET_FILENAME_COMPONENT(_module_path ${MODULE_SIP} PATH)
@@ -127,6 +127,16 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP)
       SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES SUFFIX ".pyd")
     ENDIF (WIN32)
 
+    IF(WIN32)
+      GET_TARGET_PROPERTY(_target_location ${_logical_name} LOCATION)
+      GET_TARGET_PROPERTY(_runtime_output ${_logical_name} RUNTIME_OUTPUT_DIRECTORY)
+      ADD_CUSTOM_COMMAND(TARGET ${_logical_name} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E echo "Copying extension ${_child_module_name}"
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different "${_target_location}" "${_runtime_output}/${_child_module_name}.pyd"
+        DEPENDS ${_logical_name}
+      )
+    ENDIF(WIN32)
+
     INSTALL(TARGETS ${_logical_name} DESTINATION "${PYTHON_SITE_PACKAGES_DIR}/${_parent_module_path}")
 
 ENDMACRO(ADD_SIP_PYTHON_MODULE)
diff --git a/cmake/UsePythonTest.cmake b/cmake/UsePythonTest.cmake
@@ -0,0 +1,77 @@
+# Add a python test from a python file # One cannot simply do:
+# SET(ENV{PYTHONPATH} ${LIBRARY_OUTPUT_PATH})
+# SET(my_test "from test_mymodule import *\;test_mymodule()")
+# ADD_TEST(PYTHON-TEST-MYMODULE  python -c ${my_test})
+# Since cmake is only transmitting the ADD_TEST line to ctest thus you are loosing
+# the env var. The only way to store the env var is to physically write in the cmake script
+# whatever PYTHONPATH you want and then add the test as 'cmake -P python_test.cmake'
+#
+# Usage:
+# SET_SOURCE_FILES_PROPERTIES(test.py PROPERTIES PYTHONPATH
+#   "${LIBRARY_OUTPUT_PATH}:${VTK_DIR}")
+# ADD_PYTHON_TEST(PYTHON-TEST test.py)
+#
+#  Copyright (c) 2006-2010 Mathieu Malaterre <mathieu.malaterre@gmail.com>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS
+#
+
+# Need python interpreter:
+FIND_PACKAGE(PythonInterp REQUIRED)
+MARK_AS_ADVANCED(PYTHON_EXECUTABLE)
+
+MACRO(ADD_PYTHON_TEST TESTNAME FILENAME)
+  GET_SOURCE_FILE_PROPERTY(loc ${FILENAME} LOCATION)
+  GET_SOURCE_FILE_PROPERTY(pyenv ${FILENAME} PYTHONPATH)
+
+  IF(WIN32)
+    STRING(REGEX REPLACE ":" " " wo_semicolon "${ARGN}")
+  ELSE(WIN32)
+    STRING(REGEX REPLACE ";" " " wo_semicolon "${ARGN}")
+  ENDIF(WIN32)
+
+  FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME}.cmake
+"
+IF(WIN32)
+  SET(ENV{QGIS_PREFIX_PATH} \"${QGIS_OUTPUT_DIRECTORY}/bin/${CMAKE_BUILD_TYPE}\")
+  SET(ENV{PATH} \"${QGIS_OUTPUT_DIRECTORY}/bin/${CMAKE_BUILD_TYPE};\$ENV{PATH}\")
+  SET(ENV{PYTHONPATH} \"${QGIS_OUTPUT_DIRECTORY}/python/;\$ENV{PYTHONPATH}\")
+  MESSAGE(\"PATH:\$ENV{PATH}\")
+ELSE(WIN32)
+  SET(ENV{QGIS_PREFIX_PATH} \"${QGIS_OUTPUT_DIRECTORY}\")
+  SET(ENV{LD_LIBRARY_PATH} \"${pyenv}:${QGIS_OUTPUT_DIRECTORY}/lib:\$ENV{LD_LIBRARY_PATH}\")
+  SET(ENV{PYTHONPATH} \"${QGIS_OUTPUT_DIRECTORY}/python/:\$ENV{PYTHONPATH}\")
+  MESSAGE(\"LD_LIBRARY_PATH:\$ENV{LD_LIBRARY_PATH}\")
+ENDIF(WIN32)
+MESSAGE(\"PYTHONPATH:\$ENV{PYTHONPATH}\")
+MESSAGE(STATUS \"Running ${PYTHON_EXECUTABLE} ${loc} ${wo_semicolon}\")
+EXECUTE_PROCESS(
+  COMMAND ${PYTHON_EXECUTABLE} ${loc} ${wo_semicolumn}
+  #WORKING_DIRECTORY @LIBRARY_OUTPUT_PATH@
+  RESULT_VARIABLE import_res
+  OUTPUT_VARIABLE import_output
+  ERROR_VARIABLE  import_output
+)
+# Pass the output back to ctest
+IF(import_output)
+  MESSAGE("\${import_output}")
+ENDIF(import_output)
+IF(import_res)
+  MESSAGE(SEND_ERROR "\${import_res}")
+ENDIF(import_res)
+"
+)
+  ADD_TEST(${TESTNAME} ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME}.cmake)
+ENDMACRO(ADD_PYTHON_TEST)
+
+# Byte compile recursively a directory (DIRNAME)
+MACRO(ADD_PYTHON_COMPILEALL_TEST DIRNAME)
+  # First get the path:
+  GET_FILENAME_COMPONENT(temp_path "${PYTHON_LIBRARIES}" PATH)
+  # Find the python script:
+  GET_FILENAME_COMPONENT(PYTHON_COMPILE_ALL_PY "${temp_path}/../compileall.py" ABSOLUTE)
+  # add test, use DIRNAME to create uniq name for the test:
+  ADD_TEST(COMPILE_ALL-${DIRNAME} ${PYTHON_EXECUTABLE} "${PYTHON_COMPILE_ALL_PY}" -q ${DIRNAME})
+ENDMACRO(ADD_PYTHON_COMPILEALL_TEST)
diff --git a/cmake_templates/qgsconfig.h.in b/cmake_templates/qgsconfig.h.in
@@ -17,6 +17,7 @@
 //reinstate this more generic approach below at some point though
 //#define VERSION_INT ${CPACK_PACKAGE_VERSION_MAJOR}${CPACK_PACKAGE_VERSION_MINOR}${CPACK_PACKAGE_VERSION_PATCH}
 #define VERSION_INT ${QGIS_VERSION_INT}
+#define ABISYM(x) x ## ${QGIS_VERSION_INT}
 //used in main.cpp and anywhere else where the release name is needed
 #define RELEASE_NAME "${RELEASE_NAME}"
 
@@ -35,5 +36,7 @@
 
 #cmakedefine HAVE_PYTHON
 
+#cmakedefine HAVE_TOUCH
+
 #endif
 
diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,9 @@
 qgis (1.9.0) UNRELEASED; urgency=low
 
   * new development version 1.9 after branch of 1.8
+  * include ows provider
 
- -- Jürgen E. Fischer <jef@norbit.de>  Thu, 14 Jun 2012 10:56:27 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Thu, 26 Jul 2012 13:54:05 +0200
 
 qgis (1.8.0) UNRELEASED; urgency=low
 

diff --git a/debian/qgis-providers.install b/debian/qgis-providers.install
@@ -6,6 +6,7 @@ usr/lib/qgis/plugins/libmemoryprovider.so
 usr/lib/qgis/plugins/libmssqlprovider.so
 usr/lib/qgis/plugins/libogrprovider.so
 usr/lib/qgis/plugins/libosmprovider.so
+usr/lib/qgis/plugins/libowsprovider.so
 usr/lib/qgis/plugins/libpostgresprovider.so
 usr/lib/qgis/plugins/libspatialiteprovider.so
 usr/lib/qgis/plugins/libwfsprovider.so

diff --git a/doc/AUTHORS b/doc/AUTHORS
@@ -1,7 +1,7 @@
 # The following have contributed to QGis:
 # --------------------------------------------------------
-# Please note that this file is parsed by the about box 
-# for the contributors list, so names should be strictly 
+# Please note that this file is parsed by the about box
+# for the contributors list, so names should be strictly
 # in the format:
 # name [tab] <email>
 #
@@ -44,4 +44,7 @@ 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>
+Sergey Yakushev	<yakushevs at gmail.com >
+René-Luc D'Hont	<rldhont at gmail.com>
+Etienne Tourigny	<etourigny.dev at gmail.com>
+Larry Shaffer	<larrys at dakotacarto.com>
diff --git a/doc/CONTRIBUTORS b/doc/CONTRIBUTORS
@@ -29,7 +29,7 @@ Giuseppe Sucameli
 Horst Duester
 Hyao (IRC nickname)
 Ivan Lucena
-Jean-Denis Giguere 
+Jean-Denis Giguere
 Jeremy Palmer
 Jerrit Collord
 Luiz Motta
@@ -53,5 +53,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