Skip to content

Commit b206196

Browse files
wonder-skwonder-sk
committedMay 13, 2011
Merge branch 'master' into dbl
Conflicts: images/splash/splash.png src/CMakeLists.txt src/app/main.cpp src/app/qgsvectorlayerproperties.cpp src/core/qgsvectorlayer.cpp src/providers/wms/qgswmssourceselect.cpp
·
ltr-3_40Before-merge-new_vector_api
2 parents 153ad16 + 3ec8059 commit b206196

File tree

329 files changed

+10168
-10712
lines changed

Some content is hidden

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

329 files changed

+10168
-10712
lines changed
 

‎.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,11 @@ ms-windows/osgeo4w/nsis/
2222
ms-windows/osgeo4w/untgz/
2323
scripts/astyle
2424
qtcreator-build/
25+
ms-windows/nsis/
26+
ms-windows/osgeo4w/addons/
27+
ms-windows/packages/
28+
ms-windows/progs/
29+
ms-windows/untgz/
30+
scripts/astyle.exe
31+
# vim temporary files
32+
.*.swp

‎CMakeLists.txt

Lines changed: 24 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
SET(CPACK_PACKAGE_VERSION_MAJOR "1")
2-
SET(CPACK_PACKAGE_VERSION_MINOR "7")
2+
SET(CPACK_PACKAGE_VERSION_MINOR "8")
33
SET(CPACK_PACKAGE_VERSION_PATCH "0")
44
SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
5-
SET(RELEASE_NAME "Wroclaw")
5+
SET(RELEASE_NAME "Trunk")
66
SET(PROJECT_VERSION ${COMPLETE_VERSION})
77
PROJECT(qgis${PROJECT_VERSION})
88
IF (APPLE)
@@ -60,6 +60,9 @@ SET (WITH_MAPSERVER FALSE CACHE BOOL "Determines whether QGIS mapserver should b
6060
# include doxygen documentation
6161
SET (WITH_APIDOC FALSE CACHE BOOL "Determines whether the QGIS API doxygen documentation should be built")
6262

63+
# build our version of astyle
64+
SET (WITH_ASTYLE FALSE CACHE BOOL "If you plan to contribute you should reindent with scripts/prepare-commit.sh (using 'our' astyle)")
65+
6366
# try to configure and build POSTGRESQL support
6467
SET (WITH_POSTGRESQL TRUE CACHE BOOL "Determines whether POSTGRESQL support should be built")
6568
IF (WITH_POSTGRESQL)
@@ -439,55 +442,37 @@ INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
439442
LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/src/core ${CMAKE_BINARY_DIR}/src/gui)
440443

441444
#############################################################
442-
# create qgssvnversion.h
445+
# create qgsversion.h
443446

444-
FIND_FILE(SVN_MARKER entries PATHS ${CMAKE_SOURCE_DIR}/.svn)
445447
FIND_FILE(GIT_MARKER index PATHS ${CMAKE_SOURCE_DIR}/.git)
446448

447-
IF (SVN_MARKER)
448-
# See if we have svn installed
449-
FIND_PROGRAM(SVNVERSION svnversion PATHS c:/cygwin/bin)
450-
451-
IF(SVNVERSION)
449+
IF (GIT_MARKER)
450+
FIND_PROGRAM(GIT git PATHS c:/cygwin/bin)
451+
IF(GIT)
452452
IF(MSVC)
453453
ADD_CUSTOM_COMMAND(
454-
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
455-
COMMAND for /f usebackq %%a in "(`\"${SVNVERSION}\"`)" do echo \#define QGSSVNVERSION \"%%a\" >${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
456-
MAIN_DEPENDENCY ${SVN_MARKER}
454+
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h
455+
COMMAND for /f \"usebackq tokens=1\" %%a in "(`\"${GIT}\" log -n1 --oneline`)" do echo \#define QGSVERSION \"%%a\" >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h
456+
MAIN_DEPENDENCY ${GIT_MARKER}
457457
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
458458
)
459459
ELSE(MSVC)
460460
ADD_CUSTOM_COMMAND(
461-
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
462-
COMMAND echo \\\#define QGSSVNVERSION \\\"`${SVNVERSION}`\\\" >${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
463-
MAIN_DEPENDENCY ${SVN_MARKER}
464-
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
465-
)
466-
ENDIF(MSVC)
467-
ELSE(SVNVERSION)
468-
MESSAGE(STATUS "svnversion not found - version will be unknown")
469-
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h "#define QGSSVNVERSION \"unknown\"")
470-
ENDIF (SVNVERSION)
471-
ELSE (SVN_MARKER)
472-
IF (GIT_MARKER)
473-
FIND_PROGRAM(GIT git PATHS c:/cygwin/bin)
474-
IF(GIT)
475-
ADD_CUSTOM_COMMAND(
476-
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
477-
COMMAND echo \\\#define QGSSVNVERSION \\\"$$\( ${GIT} log -n1 --grep='git-svn-id' | sed -ne 's/^ *git-svn-id:.*@\\\([0-9]*\\\).*$$/\\1/p' \)$$\( ${GIT} log --oneline $$\( ${GIT} log -n1 --grep='git-svn-id' --pretty=%H \).. | wc -l | sed -e 's/^/+/' -e 's/+0$$//' \)\\\" >${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
461+
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h
462+
COMMAND echo \\\#define QGSVERSION \\\"$$\( ${GIT} log -n1 --pretty=%h \)\\\" >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h
478463
MAIN_DEPENDENCY ${GIT_MARKER}
479464
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
480465
)
481-
ELSE(GIT)
482-
MESSAGE(STATUS "git marker, but no git found - version will be unknown")
483-
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h "#define QGSSVNVERSION \"unknown\"")
484-
ENDIF(GIT)
485-
ELSE (GIT_MARKER)
486-
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h "#define QGSSVNVERSION \"exported\"")
487-
ENDIF (GIT_MARKER)
488-
ENDIF (SVN_MARKER)
489-
490-
ADD_CUSTOM_TARGET(svnversion ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h)
466+
ENDIF(MSVC)
467+
ELSE(GIT)
468+
MESSAGE(STATUS "git marker, but no git found - version will be unknown")
469+
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h "#define QGSVERSION \"unknown\"")
470+
ENDIF(GIT)
471+
ELSE (GIT_MARKER)
472+
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h "#define QGSVERSION \"exported\"")
473+
ENDIF (GIT_MARKER)
474+
475+
ADD_CUSTOM_TARGET(version ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h)
491476

492477
#############################################################
493478
# process subdirs

0 commit comments

Comments
 (0)