merge from trunk r11400:11450

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11888 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 2, 2009 · 7d3257e · 7d3257e
1 parent 2425621
commit 7d3257e
Show file tree

Hide file tree

Showing 133 changed files with 5,709 additions and 19,762 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -187,7 +187,7 @@ FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
 # enable warnings
 
 IF (PEDANTIC)
-  MESSAGE ("-- Pedantic compiler settings enabled")
+  MESSAGE (STATUS "Pedantic compiler settings enabled")
   IF(MSVC)
     ADD_DEFINITIONS( /W4 )
 
@@ -204,10 +204,10 @@ IF (PEDANTIC)
   ENDIF (MSVC)
 ENDIF (PEDANTIC)
 
-IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_CONFIGURATION_TYPE MATCHES RelWithDebInfo)
-  MESSAGE ("-- Debug output enabled")
+IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
+  MESSAGE (STATUS "Debug output enabled")
   ADD_DEFINITIONS(-DQGISDEBUG=1)
-ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_CONFIGURATION_TYPE MATCHES RelWithDebInfo)
+ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
 
 #############################################################
 # platform specific stuff
@@ -233,10 +233,10 @@ IF (WIN32)
     ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
     ADD_DEFINITIONS(-D_CRT_NONSTDC_NO_WARNINGS)
 
-    IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_CONFIGURATION_TYPE MATCHES RelWithDebInfo)
-      MESSAGE ("-- Generating browse files")
+    IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
+      MESSAGE (STATUS "Generating browse files")
       ADD_DEFINITIONS( /FR )
-    ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_CONFIGURATION_TYPE MATCHES RelWithDebInfo)
+    ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
 
     IF (INSTALL_DEPS)
       INSTALL(DIRECTORY ${INSTALL_DEPS} DESTINATION .)
@@ -365,7 +365,7 @@ SUBDIRS(src doc images resources i18n)
 IF (HAVE_PYTHON AND WITH_BINDINGS)
   SUBDIRS (python)
 ELSE (HAVE_PYTHON AND WITH_BINDINGS)
-  MESSAGE ("Python not being built")
+  MESSAGE (STATUS "Python not being built")
 ENDIF (HAVE_PYTHON AND WITH_BINDINGS)
 
 IF (ENABLE_TESTS)

diff --git a/DONORS b/DONORS
@@ -32,7 +32,7 @@ Ivan Marchesini|http://www.gfosservices.it/
 James Crone
 Jaroslaw Kowalczyk
 Jason Jorgenson
-John C. Tull
+John C. Tull|http://www.wildnevada.org
 John Dean
 Kanton Solothurn SOGIS
 Kevin Shook

diff --git a/cmake/Bison.cmake b/cmake/Bison.cmake
@@ -4,7 +4,10 @@
 MACRO(FIND_BISON)
   IF(NOT BISON_EXECUTABLE)
     IF (MSVC)
-      FIND_PROGRAM(BISON_EXECUTABLE "$ENV{LIB_DIR}/bin/bison.exe")
+      FIND_PROGRAM(BISON_EXECUTABLE PATHS
+      		   NAMES bison.exe
+	           PATHS $ENV{LIB_DIR}/bin $ENV{PROGRAMFILES}/GnuWin32/bin
+	)
     ELSE (MSVC)
       FIND_PROGRAM(BISON_EXECUTABLE bison)
     ENDIF (MSVC)

diff --git a/cmake/Flex.cmake b/cmake/Flex.cmake
@@ -4,9 +4,10 @@
 MACRO(FIND_FLEX)
     IF(NOT FLEX_EXECUTABLE)
       IF (MSVC)
-        FIND_PROGRAM(FLEX_EXECUTABLE 
-            "$ENV{LIB_DIR}/bin/flex.exe"
-	    )
+        FIND_PROGRAM(FLEX_EXECUTABLE
+                     NAMES flex.exe
+                     PATHS $ENV{LIB_DIR}/bin $ENV{PROGRAMFILES}/GnuWin32/bin
+                    )
       ELSE(MSVC)
         FIND_PROGRAM(FLEX_EXECUTABLE flex)
       ENDIF (MSVC)

diff --git a/cmake/Python.cmake b/cmake/Python.cmake
@@ -7,6 +7,77 @@
 FIND_PACKAGE(PythonLibs) # MapServer export tool
 FIND_PACKAGE(PythonInterp) # test for sip and PyQt4
 
+IF(NOT PYUIC4_PROGRAM)
+  IF (MSVC)
+    FIND_PROGRAM(PYUIC4_PROGRAM
+      NAMES pyuic4.bat
+      PATHS $ENV{LIB_DIR}/bin
+    )
+  ELSE(MSVC)
+    FIND_PROGRAM(PYUIC4_PROGRAM pyuic4)
+  ENDIF (MSVC)
+
+  IF (NOT PYUIC4_PROGRAM)
+    MESSAGE(FATAL_ERROR "pyuic4 not found - aborting")
+  ENDIF (NOT PYUIC4_PROGRAM)
+ENDIF(NOT PYUIC4_PROGRAM)
+
+# Adapted from QT4_WRAP_UI
+MACRO(PYQT4_WRAP_UI outfiles )
+  FOREACH(it ${ARGN})
+    GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
+    GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
+    SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.py)
+    ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+      COMMAND ${PYUIC4_PROGRAM} ${infile} -o ${outfile}
+      MAIN_DEPENDENCY ${infile}                       
+    )
+    SET(${outfiles} ${${outfiles}} ${outfile})
+  ENDFOREACH(it)
+ENDMACRO(PYQT4_WRAP_UI)
+
+IF(NOT PYRCC4_PROGRAM)
+  IF (MSVC)
+    FIND_PROGRAM(PYRCC4_PROGRAM
+      NAMES pyrcc4.exe
+      PATHS $ENV{LIB_DIR}/bin
+    )
+  ELSE(MSVC)
+    FIND_PROGRAM(PYRCC4_PROGRAM pyrcc4)
+  ENDIF (MSVC)
+
+  IF (NOT PYRCC4_PROGRAM)
+    MESSAGE(FATAL_ERROR "pyrcc4 not found - aborting")
+  ENDIF (NOT PYRCC4_PROGRAM)
+ENDIF(NOT PYRCC4_PROGRAM)
+
+# Adapted from QT4_ADD_RESOURCES
+MACRO (PYQT4_ADD_RESOURCES outfiles )
+  FOREACH (it ${ARGN})
+    GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
+    GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
+    GET_FILENAME_COMPONENT(rc_path ${infile} PATH)
+    SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/${outfile}_rc.py)
+    #  parse file for dependencies 
+    #  all files are absolute paths or relative to the location of the qrc file
+    FILE(READ "${infile}" _RC_FILE_CONTENTS)
+    STRING(REGEX MATCHALL "<file[^<]+" _RC_FILES "${_RC_FILE_CONTENTS}")
+    SET(_RC_DEPENDS)
+    FOREACH(_RC_FILE ${_RC_FILES})
+      STRING(REGEX REPLACE "^<file[^>]*>" "" _RC_FILE "${_RC_FILE}")
+      STRING(REGEX MATCH "^/|([A-Za-z]:/)" _ABS_PATH_INDICATOR "${_RC_FILE}")
+      IF(NOT _ABS_PATH_INDICATOR)
+        SET(_RC_FILE "${rc_path}/${_RC_FILE}")
+      ENDIF(NOT _ABS_PATH_INDICATOR)
+      SET(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}")
+    ENDFOREACH(_RC_FILE)
+    ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+      COMMAND ${PYRCC4_PROGRAM} -name ${outfile} -o ${outfile} ${infile}
+      MAIN_DEPENDENCY ${infile}
+      DEPENDS ${_RC_DEPENDS})
+    SET(${outfiles} ${${outfiles}} ${outfile})
+  ENDFOREACH (it)
+ENDMACRO (PYQT4_ADD_RESOURCES)
 
 MACRO (TRY_RUN_PYTHON RESULT CMD)
   IF (PYTHONINTERP_FOUND)
@@ -32,6 +103,19 @@ MACRO (TRY_RUN_PYTHON RESULT CMD)
   ENDIF (PYTHONINTERP_FOUND)
 ENDMACRO (TRY_RUN_PYTHON)
 
+IF(MSVC)
+  FIND_PROGRAM(SIP_MAKE_PROGRAM
+                NAMES nmake.exe
+                PATHS "$ENV{VCINSTALLDIR}/bin" "$ENV{PROGRAMFILES}/Microsoft Visual 9.0/VC/bin"
+        )
+  IF(NOT SIP_MAKE_PROGRAM)
+    MESSAGE(FATAL_ERROR "nmake not found")
+  ENDIF(NOT SIP_MAKE_PROGRAM)
+ELSE (MSVC)
+  SET(SIP_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM})
+ENDIF (MSVC)
+
+
 # enable/disable python support (mapserver export tool and bindings)
 IF (PYTHON_LIBRARIES AND PYTHON_INCLUDE_PATH)
   SET (PYTHON_FOUND TRUE)

diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,12 @@
 qgis (1.2.0) UNRELEASED; urgency=low
 
   * new development version after 1.1 branch
+  * add new build dependency to pyqt4-dev-tools
+  * update SONAMEs to 1.2.0
+  * add python dependency to qgis-plugin-grass-common
+  * include osm provider and evis plugin
 
- -- Juergen E. Fischer <jef@norbit.de>  Sun, 03 May 2009 22:52:09 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Tue, 18 Aug 2009 08:20:18 +0200
 
 qgis (1.1.0-5) UNRELEASED; urgency=low
 

diff --git a/debian/control b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
  sharutils, sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
  libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
  python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
- libsm-dev
+ libsm-dev, pyqt4-dev-tools
 Build-Conflicts: libqgis1.2.0-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current