Skip to content

Commit

Permalink
Merge branch 'master' of github.com:qgis/Quantum-GIS
Browse files Browse the repository at this point in the history
  • Loading branch information
etiennesky committed Sep 14, 2012
2 parents 1080d97 + 799795a commit 4fa28d8
Show file tree
Hide file tree
Showing 90 changed files with 7,790 additions and 846 deletions.
4 changes: 3 additions & 1 deletion doc/CONTRIBUTORS
Expand Up @@ -18,8 +18,8 @@ Cédric Möri
Christian Ferreira
Diego Moreira
Duarte Carreira
Faunalia (http://www.faunalia.it)
Etienne Tourigny
Faunalia (http://www.faunalia.it)
Fernando Pacheco
Florian El Ahdab
Florian Hof
Expand Down Expand Up @@ -49,11 +49,13 @@ Paul Ramsey
Richard Duivenvoorde
Richard Kostecky
Robert Szczepanek
Salvatore Larosa
Stefanie Tellex
Steven Mizuno
Tamas Szekeres
Tom Russo
Tyler Mitchell
Vita Cizek
Yann Chemin

Includes Map icons CC-0 from SJJB Management
2 changes: 1 addition & 1 deletion mac/cmake/1qt.cmake.in
Expand Up @@ -121,7 +121,7 @@ FOREACH (PU pylupdate4;pyrcc4)
ENDIF ()
ENDFOREACH (PU)
IF (NOT EXISTS "${QBINDIR}/pyuic4")
EXECUTE_PROCESS (COMMAND sed -E "s, /.*/PyQt4/uic/pyuic.py, ${QDATADIR}/python/PyQt4/uic/pyuic.py," "@PYQT4_BIN_DIR@/pyuic4"
EXECUTE_PROCESS (COMMAND sed -E "s, /.*/PyQt4/uic/pyuic.py, \"\$(/usr/bin/dirname \"\$0\")/../../Resources/python/PyQt4/uic/pyuic.py\"," "@PYQT4_BIN_DIR@/pyuic4"
OUTPUT_VARIABLE PYUIC_CONTENTS)
FILE (WRITE "${QBINDIR}/pyuic4" "${PYUIC_CONTENTS}")
EXECUTE_PROCESS (COMMAND chmod +x "${QBINDIR}/pyuic4")
Expand Down
9 changes: 8 additions & 1 deletion python/CMakeLists.txt
@@ -1,4 +1,5 @@
ADD_SUBDIRECTORY(plugins)
ADD_SUBDIRECTORY(api)

SET (PYTHON_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/python)
SET (QGIS_PYTHON_OUTPUT_DIRECTORY ${PYTHON_OUTPUT_DIRECTORY}/qgis)
Expand Down Expand Up @@ -97,13 +98,16 @@ SET (QGIS_PYTHON_DIR ${PYTHON_SITE_PACKAGES_DIR}/qgis)

ADD_CUSTOM_TARGET(compile_python_files ALL)

ADD_SUBDIRECTORY(iconConsole)
ADD_SUBDIRECTORY(helpConsole)

ADD_CUSTOM_COMMAND(TARGET compile_python_files
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory ${QGIS_PYTHON_OUTPUT_DIRECTORY}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)

FOREACH(file __init__.py utils.py console.py)
FOREACH(file __init__.py utils.py console.py console_sci.py help.py)
ADD_CUSTOM_COMMAND(TARGET compile_python_files
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${file} ${QGIS_PYTHON_OUTPUT_DIRECTORY}
Expand All @@ -115,3 +119,6 @@ ENDFOREACH(file)
PYTHON_INSTALL(__init__.py ${QGIS_PYTHON_DIR})
PYTHON_INSTALL(utils.py ${QGIS_PYTHON_DIR})
PYTHON_INSTALL(console.py ${QGIS_PYTHON_DIR})
PYTHON_INSTALL(console_sci.py ${QGIS_PYTHON_DIR})
PYTHON_INSTALL(help.py ${QGIS_PYTHON_DIR})

3 changes: 3 additions & 0 deletions python/api/CMakeLists.txt
@@ -0,0 +1,3 @@
SET (QGIS_PYTHON_OUTPUT_DIR ${PYTHON_SITE_PACKAGES_DIR}/qgis/api)
FILE(GLOB API_FILES *.pap)
INSTALL(FILES ${API_FILES} DESTINATION ${QGIS_PYTHON_OUTPUT_DIR})
4,158 changes: 4,158 additions & 0 deletions python/api/PyQGIS_1.8.api

Large diffs are not rendered by default.

0 comments on commit 4fa28d8

Please sign in to comment.