Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' of https://github.com/qgis/Quantum-GIS
  • Loading branch information
luipir committed Sep 7, 2013
2 parents 6b2fa67 + f66f9aa commit feb79a8
Show file tree
Hide file tree
Showing 397 changed files with 53,863 additions and 38,539 deletions.
9 changes: 6 additions & 3 deletions CMakeLists.txt
@@ -1,5 +1,5 @@
SET(CPACK_PACKAGE_VERSION_MAJOR "1")
SET(CPACK_PACKAGE_VERSION_MINOR "9")
SET(CPACK_PACKAGE_VERSION_MAJOR "2")
SET(CPACK_PACKAGE_VERSION_MINOR "1")
SET(CPACK_PACKAGE_VERSION_PATCH "0")
SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
SET(RELEASE_NAME "Master")
Expand Down Expand Up @@ -86,7 +86,9 @@ IF (WITH_BINDINGS)
SET (WITH_STAGED_PLUGINS TRUE CACHE BOOL "Stage-install core Python plugins to run from build directory? (utilities and console are always staged)")
SET (WITH_PY_COMPILE FALSE CACHE BOOL "Determines whether Python modules in staged or installed locations are byte-compiled")
# concatenate QScintilla2 API files
SET (WITH_QSCIAPI TRUE CACHE BOOL "Determines whether the QScintilla2 API files will be updated and concatenated")
SET (WITH_QSCIAPI TRUE CACHE BOOL "Whether to generate PyQGIS QScintilla2 API file. (For devs) run 'make qsci-pap-src' in between QGIS build and install to regenerate .pap file in source tree for console auto-completion.")
# keep casual users from updating their source tree via WITH_QSCIAPI
MARK_AS_ADVANCED (WITH_QSCIAPI)
# path to custom Python framework on Mac
IF (APPLE)
SET (PYTHON_CUSTOM_FRAMEWORK "" CACHE PATH "Path to custom Python.framework on Mac. (should not have to specify other Python options)")
Expand Down Expand Up @@ -492,6 +494,7 @@ ADD_DEFINITIONS("-DCORE_EXPORT=${DLLIMPORT}")
ADD_DEFINITIONS("-DGUI_EXPORT=${DLLIMPORT}")
ADD_DEFINITIONS("-DPYTHON_EXPORT=${DLLIMPORT}")
ADD_DEFINITIONS("-DANALYSIS_EXPORT=${DLLIMPORT}")
ADD_DEFINITIONS("-DAPP_EXPORT=${DLLIMPORT}")

#############################################################
# user-changeable settings which can be used to customize
Expand Down
6 changes: 6 additions & 0 deletions cmake/QsciAPI.cmake
Expand Up @@ -7,6 +7,9 @@

SET(QGIS_PYTHON_API_FILE "${CMAKE_BINARY_DIR}/python/qsci_apis/PyQGIS.api")

# create empty destination api file
FILE(WRITE "${QGIS_PYTHON_API_FILE}" "")

IF(EXISTS "${CMAKE_BINARY_DIR}/python/qgis.gui.api")
FILE(READ "${CMAKE_BINARY_DIR}/python/qgis.gui.api" FILE_CONTENT)
STRING(REGEX MATCHALL "gui\\.QgisInterface([^\n]+)" MATCHED_CONTENT "${FILE_CONTENT}")
Expand All @@ -16,6 +19,9 @@ IF(EXISTS "${CMAKE_BINARY_DIR}/python/qgis.gui.api")
ENDFOREACH(matchedLine)
ENDIF(EXISTS "${CMAKE_BINARY_DIR}/python/qgis.gui.api")

# add qgis.core.NULL attribute defined in <src>/python/__init__.py for QPyNullVariant
FILE(APPEND "${QGIS_PYTHON_API_FILE}" "qgis.core.NULL?7\n")

FOREACH(apiFile qgis.core.api qgis.gui.api qgis.analysis.api qgis.networkanalysis.api)
SET(api "${CMAKE_BINARY_DIR}/python/${apiFile}")
IF(EXISTS "${api}")
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
@@ -1,3 +1,9 @@
qgis (2.1.0) UNRELEASED; urgency=low

* new development version 2.1 after branch of 2.0

-- Jürgen E. Fischer <jef@norbit.de> Sat, 27 Jul 2013 16:45:43 +0200

qgis (1.9.0) UNRELEASED; urgency=low

* new development version 1.9 after branch of 1.8
Expand Down
108 changes: 54 additions & 54 deletions doc/TRANSLATORS

Large diffs are not rendered by default.

769 changes: 426 additions & 343 deletions i18n/qgis_af.ts

Large diffs are not rendered by default.

769 changes: 426 additions & 343 deletions i18n/qgis_ar.ts

Large diffs are not rendered by default.

769 changes: 426 additions & 343 deletions i18n/qgis_bg.ts

Large diffs are not rendered by default.

769 changes: 426 additions & 343 deletions i18n/qgis_bn.ts

Large diffs are not rendered by default.

773 changes: 430 additions & 343 deletions i18n/qgis_bs_BA.ts

Large diffs are not rendered by default.

769 changes: 426 additions & 343 deletions i18n/qgis_ca_ES.ts

Large diffs are not rendered by default.

773 changes: 430 additions & 343 deletions i18n/qgis_cs_CZ.ts

Large diffs are not rendered by default.

1,207 changes: 810 additions & 397 deletions i18n/qgis_da_DK.ts

Large diffs are not rendered by default.

0 comments on commit feb79a8

Please sign in to comment.