Skip to content

Commit d875c96

Browse files
committed
master merge
2 parents 5a5928e + 1eeb537 commit d875c96

File tree

391 files changed

+46244
-28164
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

391 files changed

+46244
-28164
lines changed

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,8 @@ ELSE ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_M
221221
SET (WITH_TOUCH FALSE)
222222
ENDIF ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 )
223223
IF (WITH_TOUCH)
224-
ADD_DEFINITIONS(-DHAVE_TOUCH)
224+
# following variable is used in qgsconfig.h
225+
SET (HAVE_TOUCH TRUE)
225226
MESSAGE (STATUS "Touch support enabled")
226227
ELSE (WITH_TOUCH)
227228
MESSAGE (STATUS "Touch support disabled")

cmake/MacBundleMacros.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
# BundleUtilities has functions to bundle and fixup libraries into an
44
# application package, but it's all-or-nothing and is missing some features:
5-
#
5+
#
66
# - @loader_path
77
# - helper functions can't get install_name, just dependencies
88

99
# the following cmakecache vars must be set, redefine them
1010
# with config-file substitutions in install-run scripts:
11-
#
11+
#
1212
# CPACK_PACKAGE_VERSION_MAJOR, CPACK_PACKAGE_VERSION_MINOR
1313
# CMAKE_INSTALL_PREFIX, CMAKE_VERBOSE_MAKEFILE, CMAKE_BUILD_TYPE
1414
# CMAKE_OSX_ARCHITECTURES, OSX_HAVE_LOADERPATH
@@ -118,8 +118,8 @@ FUNCTION (UPDATEQGISPATHS LIBFROM LIBTO)
118118
# libs
119119
IF (${OSX_HAVE_LOADERPATH})
120120
# bundled frameworks can use short relative path
121-
IF (ISLIB})
122-
SET (LIB_CHG_TO "${ATLOADER}/${QGIS_FW_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
121+
IF (ISLIB)
122+
SET (LIB_CHG_TO "${ATLOADER}/../../../${QGIS_FW_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
123123
ElSE ()
124124
SET (LIB_CHG_TO "${ATLOADER}/../../../${LIBPOST}")
125125
ENDIF ()

cmake/SIPMacros.cmake

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP)
4646
SET(EXTRA_LINK_LIBRARIES ${ARGN})
4747

4848
STRING(REPLACE "." "/" _x ${MODULE_NAME})
49-
GET_FILENAME_COMPONENT(_parent_module_path ${_x} PATH)
49+
GET_FILENAME_COMPONENT(_parent_module_path ${_x} PATH)
5050
GET_FILENAME_COMPONENT(_child_module_name ${_x} NAME)
5151

5252
GET_FILENAME_COMPONENT(_module_path ${MODULE_SIP} PATH)
@@ -127,6 +127,16 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP)
127127
SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES SUFFIX ".pyd")
128128
ENDIF (WIN32)
129129

130+
IF(WIN32)
131+
GET_TARGET_PROPERTY(_target_location ${_logical_name} LOCATION)
132+
GET_TARGET_PROPERTY(_runtime_output ${_logical_name} RUNTIME_OUTPUT_DIRECTORY)
133+
ADD_CUSTOM_COMMAND(TARGET ${_logical_name} POST_BUILD
134+
COMMAND ${CMAKE_COMMAND} -E echo "Copying extension ${_child_module_name}"
135+
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${_target_location}" "${_runtime_output}/${_child_module_name}.pyd"
136+
DEPENDS ${_logical_name}
137+
)
138+
ENDIF(WIN32)
139+
130140
INSTALL(TARGETS ${_logical_name} DESTINATION "${PYTHON_SITE_PACKAGES_DIR}/${_parent_module_path}")
131141

132142
ENDMACRO(ADD_SIP_PYTHON_MODULE)

cmake/UsePythonTest.cmake

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
# Add a python test from a python file # One cannot simply do:
2+
# SET(ENV{PYTHONPATH} ${LIBRARY_OUTPUT_PATH})
3+
# SET(my_test "from test_mymodule import *\;test_mymodule()")
4+
# ADD_TEST(PYTHON-TEST-MYMODULE python -c ${my_test})
5+
# Since cmake is only transmitting the ADD_TEST line to ctest thus you are loosing
6+
# the env var. The only way to store the env var is to physically write in the cmake script
7+
# whatever PYTHONPATH you want and then add the test as 'cmake -P python_test.cmake'
8+
#
9+
# Usage:
10+
# SET_SOURCE_FILES_PROPERTIES(test.py PROPERTIES PYTHONPATH
11+
# "${LIBRARY_OUTPUT_PATH}:${VTK_DIR}")
12+
# ADD_PYTHON_TEST(PYTHON-TEST test.py)
13+
#
14+
# Copyright (c) 2006-2010 Mathieu Malaterre <mathieu.malaterre@gmail.com>
15+
#
16+
# Redistribution and use is allowed according to the terms of the New
17+
# BSD license.
18+
# For details see the accompanying COPYING-CMAKE-SCRIPTS
19+
#
20+
21+
# Need python interpreter:
22+
FIND_PACKAGE(PythonInterp REQUIRED)
23+
MARK_AS_ADVANCED(PYTHON_EXECUTABLE)
24+
25+
MACRO(ADD_PYTHON_TEST TESTNAME FILENAME)
26+
GET_SOURCE_FILE_PROPERTY(loc ${FILENAME} LOCATION)
27+
GET_SOURCE_FILE_PROPERTY(pyenv ${FILENAME} PYTHONPATH)
28+
29+
IF(WIN32)
30+
STRING(REGEX REPLACE ":" " " wo_semicolon "${ARGN}")
31+
ELSE(WIN32)
32+
STRING(REGEX REPLACE ";" " " wo_semicolon "${ARGN}")
33+
ENDIF(WIN32)
34+
35+
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME}.cmake
36+
"
37+
IF(WIN32)
38+
SET(ENV{QGIS_PREFIX_PATH} \"${QGIS_OUTPUT_DIRECTORY}/bin/${CMAKE_BUILD_TYPE}\")
39+
SET(ENV{PATH} \"${QGIS_OUTPUT_DIRECTORY}/bin/${CMAKE_BUILD_TYPE};\$ENV{PATH}\")
40+
SET(ENV{PYTHONPATH} \"${QGIS_OUTPUT_DIRECTORY}/python/;\$ENV{PYTHONPATH}\")
41+
MESSAGE(\"PATH:\$ENV{PATH}\")
42+
ELSE(WIN32)
43+
SET(ENV{QGIS_PREFIX_PATH} \"${QGIS_OUTPUT_DIRECTORY}\")
44+
SET(ENV{LD_LIBRARY_PATH} \"${pyenv}:${QGIS_OUTPUT_DIRECTORY}/lib:\$ENV{LD_LIBRARY_PATH}\")
45+
SET(ENV{PYTHONPATH} \"${QGIS_OUTPUT_DIRECTORY}/python/:\$ENV{PYTHONPATH}\")
46+
MESSAGE(\"LD_LIBRARY_PATH:\$ENV{LD_LIBRARY_PATH}\")
47+
ENDIF(WIN32)
48+
MESSAGE(\"PYTHONPATH:\$ENV{PYTHONPATH}\")
49+
MESSAGE(STATUS \"Running ${PYTHON_EXECUTABLE} ${loc} ${wo_semicolon}\")
50+
EXECUTE_PROCESS(
51+
COMMAND ${PYTHON_EXECUTABLE} ${loc} ${wo_semicolumn}
52+
#WORKING_DIRECTORY @LIBRARY_OUTPUT_PATH@
53+
RESULT_VARIABLE import_res
54+
OUTPUT_VARIABLE import_output
55+
ERROR_VARIABLE import_output
56+
)
57+
# Pass the output back to ctest
58+
IF(import_output)
59+
MESSAGE("\${import_output}")
60+
ENDIF(import_output)
61+
IF(import_res)
62+
MESSAGE(SEND_ERROR "\${import_res}")
63+
ENDIF(import_res)
64+
"
65+
)
66+
ADD_TEST(${TESTNAME} ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME}.cmake)
67+
ENDMACRO(ADD_PYTHON_TEST)
68+
69+
# Byte compile recursively a directory (DIRNAME)
70+
MACRO(ADD_PYTHON_COMPILEALL_TEST DIRNAME)
71+
# First get the path:
72+
GET_FILENAME_COMPONENT(temp_path "${PYTHON_LIBRARIES}" PATH)
73+
# Find the python script:
74+
GET_FILENAME_COMPONENT(PYTHON_COMPILE_ALL_PY "${temp_path}/../compileall.py" ABSOLUTE)
75+
# add test, use DIRNAME to create uniq name for the test:
76+
ADD_TEST(COMPILE_ALL-${DIRNAME} ${PYTHON_EXECUTABLE} "${PYTHON_COMPILE_ALL_PY}" -q ${DIRNAME})
77+
ENDMACRO(ADD_PYTHON_COMPILEALL_TEST)

cmake_templates/qgsconfig.h.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
//reinstate this more generic approach below at some point though
1818
//#define VERSION_INT ${CPACK_PACKAGE_VERSION_MAJOR}${CPACK_PACKAGE_VERSION_MINOR}${CPACK_PACKAGE_VERSION_PATCH}
1919
#define VERSION_INT ${QGIS_VERSION_INT}
20+
#define ABISYM(x) x ## ${QGIS_VERSION_INT}
2021
//used in main.cpp and anywhere else where the release name is needed
2122
#define RELEASE_NAME "${RELEASE_NAME}"
2223

@@ -35,5 +36,7 @@
3536

3637
#cmakedefine HAVE_PYTHON
3738

39+
#cmakedefine HAVE_TOUCH
40+
3841
#endif
3942

debian/changelog

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
qgis (1.9.0) UNRELEASED; urgency=low
22

33
* new development version 1.9 after branch of 1.8
4+
* include ows provider
45

5-
-- Jürgen E. Fischer <jef@norbit.de> Thu, 14 Jun 2012 10:56:27 +0200
6+
-- Jürgen E. Fischer <jef@norbit.de> Thu, 26 Jul 2012 13:54:05 +0200
67

78
qgis (1.8.0) UNRELEASED; urgency=low
89

debian/qgis-providers.install

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ usr/lib/qgis/plugins/libmemoryprovider.so
66
usr/lib/qgis/plugins/libmssqlprovider.so
77
usr/lib/qgis/plugins/libogrprovider.so
88
usr/lib/qgis/plugins/libosmprovider.so
9+
usr/lib/qgis/plugins/libowsprovider.so
910
usr/lib/qgis/plugins/libpostgresprovider.so
1011
usr/lib/qgis/plugins/libspatialiteprovider.so
1112
usr/lib/qgis/plugins/libwfsprovider.so

doc/AUTHORS

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# The following have contributed to QGis:
22
# --------------------------------------------------------
3-
# Please note that this file is parsed by the about box
4-
# for the contributors list, so names should be strictly
3+
# Please note that this file is parsed by the about box
4+
# for the contributors list, so names should be strictly
55
# in the format:
66
# name [tab] <email>
77
#
@@ -44,4 +44,7 @@ Alessandro Furieri <a.furieri at lqt.it>
4444
Alexander Bruy <alexander.bruy@gmail.com>
4545
Marco Bernasocchi <marco at bernawebdesign dot ch>
4646
Nathan Woodrow <woodrow.nathan at gmail.com>
47-
Etienne Tourigny <etourigny.dev at gmail.com>
47+
Sergey Yakushev <yakushevs at gmail.com >
48+
René-Luc D'Hont <rldhont at gmail.com>
49+
Etienne Tourigny <etourigny.dev at gmail.com>
50+
Larry Shaffer <larrys at dakotacarto.com>

doc/CONTRIBUTORS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Giuseppe Sucameli
2929
Horst Duester
3030
Hyao (IRC nickname)
3131
Ivan Lucena
32-
Jean-Denis Giguere
32+
Jean-Denis Giguere
3333
Jeremy Palmer
3434
Jerrit Collord
3535
Luiz Motta
@@ -53,5 +53,5 @@ Tamas Szekeres
5353
Tom Russo
5454
Tyler Mitchell
5555
Vita Cizek
56-
Yann Chemin
56+
Yann Chemin
5757
Includes Map icons CC-0 from SJJB Management

doc/INSTALL.t2t

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,4 +112,8 @@ source directory.
112112

113113
%!include: osx.t2t
114114

115+
%!include: wcs-test-server.t2t
116+
%!include: jenkins.t2t
117+
118+
115119
%!include: iauthors.t2t

0 commit comments

Comments
 (0)