Skip to content
Permalink
Browse files

Sibling of f4c597c

  • Loading branch information
DelazJ committed Mar 22, 2019
1 parent 3d8ee03 commit 47219403ba14e6c027efc0bda05df718200b81cb
Showing 1,423 changed files with 18,985 additions and 32,838 deletions.
@@ -18,8 +18,6 @@ qgis_openstreetmaptest
qgis_wcsprovidertest
PyQgsWFSProviderGUI
qgis_ziplayertest
qgis_fieldcalculatortest
qgis_attributetabletest

# Flaky, see https://dash.orfeo-toolbox.org/testDetails.php?test=63061783&build=297405
PyQgsSpatialiteProvider
@@ -143,10 +143,6 @@ RUN locale-gen

RUN echo "alias python=python3" >> ~/.bash_aliases

# OTB: download and install otb packages for QGIS tests
RUN curl -k https://orfeo-toolbox.org/qgis/OTB-Linux64.run -o /tmp/OTB-Linux64.run && sh /tmp/OTB-Linux64.run --target /opt/otb
ENV OTB_INSTALL_DIR=/opt/otb

ENV CC=/usr/lib/ccache/clang
ENV CXX=/usr/lib/ccache/clang++
ENV QT_SELECT=5
@@ -11,7 +11,7 @@ cache:
- ${HOME}/.ccache_docker_build_cosmic
- ${HOME}/.ccache_docker_build_bionic
timeout: 1000
if: NOT branch =~ /^(cherry-pick-)?backport-\d+-on-/ AND NOT branch =~ /-patch-\d+$/
if: NOT branch =~ /^(cherry-pick-)?backport-\d+-on-/

env:
global:
@@ -11,10 +11,10 @@ CMAKE_POLICY (SET CMP0053 NEW)
#############################################################
# Project and version
SET(CPACK_PACKAGE_VERSION_MAJOR "3")
SET(CPACK_PACKAGE_VERSION_MINOR "7")
SET(CPACK_PACKAGE_VERSION_MINOR "6")
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")
SET(RELEASE_NAME "Noosa")
PROJECT(qgis VERSION ${COMPLETE_VERSION})

IF (APPLE)
@@ -455,7 +455,7 @@ For the QGIS build you need to install following packages from cygwin:

and from OSGeo4W (select Advanced Installation):

- qgis-dev-deps
- qgis-rel-deps

This will also select packages the above packages depend on.

@@ -50,22 +50,23 @@ IF (PROJ_INCLUDE_DIR AND PROJ_LIBRARY)
SET(PROJ_FOUND TRUE)
ENDIF (PROJ_INCLUDE_DIR AND PROJ_LIBRARY)


IF (PROJ_FOUND)
IF (EXISTS ${PROJ_INCLUDE_DIR}/proj.h)
FILE(READ ${PROJ_INCLUDE_DIR}/proj.h proj_version)
STRING(REGEX REPLACE "^.*PROJ_VERSION_MAJOR +([0-9]+).*$" "\\1" PROJ_VERSION_MAJOR "${proj_version}")
STRING(REGEX REPLACE "^.*PROJ_VERSION_MINOR +([0-9]+).*$" "\\1" PROJ_VERSION_MINOR "${proj_version}")
STRING(REGEX REPLACE "^.*PROJ_VERSION_PATCH +([0-9]+).*$" "\\1" PROJ_VERSION_PATCH "${proj_version}")
STRING(CONCAT PROJ_VERSION_STR "(" ${PROJ_VERSION_MAJOR} "." ${PROJ_VERSION_MINOR} "." ${PROJ_VERSION_PATCH} ")")
ELSE(EXISTS ${PROJ_INCLUDE_DIR}/proj.h)
SET(PROJ_VERSION_MAJOR 4)
ENDIF(EXISTS ${PROJ_INCLUDE_DIR}/proj.h)
# This macro checks if the symbol exists
include(CheckLibraryExists)
check_library_exists("${PROJ_LIBRARY}" proj_info "" PROJ_HAS_INFO)

IF (NOT PROJ_FIND_QUIETLY)
MESSAGE(STATUS "Found Proj: ${PROJ_LIBRARY} version ${PROJ_VERSION_MAJOR} ${PROJ_VERSION_STR}")
IF (PROJ_HAS_INFO)
FILE(READ ${PROJ_INCLUDE_DIR}/proj.h proj_version)
STRING(REGEX REPLACE "^.*PROJ_VERSION_MAJOR +([0-9]+).*$" "\\1" PROJ_VERSION_MAJOR "${proj_version}")
STRING(REGEX REPLACE "^.*PROJ_VERSION_MINOR +([0-9]+).*$" "\\1" PROJ_VERSION_MINOR "${proj_version}")
STRING(REGEX REPLACE "^.*PROJ_VERSION_PATCH +([0-9]+).*$" "\\1" PROJ_VERSION_PATCH "${proj_version}")
STRING(CONCAT PROJ_VERSION_STR "(" ${PROJ_VERSION_MAJOR} "." ${PROJ_VERSION_MINOR} "." ${PROJ_VERSION_PATCH} ")")
ENDIF (PROJ_HAS_INFO)
MESSAGE(STATUS "Found Proj: ${PROJ_LIBRARY} ${PROJ_VERSION_STR}")
ENDIF (NOT PROJ_FIND_QUIETLY)

ADD_DEFINITIONS(-DPROJ_VERSION_MAJOR=${PROJ_VERSION_MAJOR})

ELSE (PROJ_FOUND)

IF (PROJ_FIND_REQUIRED)
@@ -26,12 +26,7 @@ MARK_AS_ADVANCED(PYTHON_EXECUTABLE)
MACRO(ADD_PYTHON_TEST TESTNAME FILENAME)
GET_SOURCE_FILE_PROPERTY(loc ${FILENAME} LOCATION)
GET_SOURCE_FILE_PROPERTY(pyenv ${FILENAME} PYTHONPATH)
#Avoid "NOTFOUND" string when setting LD_LIBRARY_PATH later
if(EXISTS "${pyenv}")
set(pyenv "${pyenv}:")
else()
set(pyenv "")
endif()

IF(WIN32)
STRING(REGEX REPLACE ":" " " wo_semicolon "${ARGN}")
IF(USING_NINJA OR USING_NMAKE)
@@ -53,7 +48,7 @@ MESSAGE(\"PATH:\$ENV{PATH}\")
STRING(REGEX REPLACE ";" " " wo_semicolon "${ARGN}")
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME}.cmake "
SET(ENV{QGIS_PREFIX_PATH} \"${QGIS_OUTPUT_DIRECTORY}\")
SET(ENV{LD_LIBRARY_PATH} \"${pyenv}${QGIS_OUTPUT_DIRECTORY}/lib:\$ENV{LD_LIBRARY_PATH}\")
SET(ENV{LD_LIBRARY_PATH} \"${pyenv}:${QGIS_OUTPUT_DIRECTORY}/lib:\$ENV{LD_LIBRARY_PATH}\")
SET(ENV{PYTHONPATH} \"${QGIS_OUTPUT_DIRECTORY}/python/:${QGIS_OUTPUT_DIRECTORY}/python/plugins:${CMAKE_SOURCE_DIR}/tests/src/python:\$ENV{PYTHONPATH}\")
MESSAGE(\"export LD_LIBRARY_PATH=\$ENV{LD_LIBRARY_PATH}\")
")
@@ -898,7 +898,7 @@ IMAGE_PATH =
# need to set EXTENSION_MAPPING for the extension otherwise the files are not
# properly processed by doxygen.

INPUT_FILTER = "sed -e 's/TRUE/\\c true/' -e 's/FALSE/\\c false/' -e 's/NULLPTR/\\c nullptr/'"
INPUT_FILTER =

# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
# basis. Doxygen will compare the file name with each pattern and apply the
@@ -1,14 +1,8 @@
qgis (3.7.0) UNRELEASED; urgency=medium

* New development version 3.7 after branch of 3.6

-- Jürgen E. Fischer <jef@norbit.de> Fri, 22 Feb 2019 13:48:26 +0100

qgis (3.6.0) unstable; urgency=medium
qgis (3.6.0) UNRELEASED; urgency=medium

* Release of 3.6.0

-- Jürgen E. Fischer <jef@norbit.de> Fri, 22 Feb 2019 13:48:26 +0100
-- Jürgen E. Fischer <jef@norbit.de> Fri, 22 Feb 2019 13:47:20 +0100

qgis (3.5.0) unstable; urgency=medium

@@ -319,11 +319,8 @@ override_dh_auto_install:

install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis/usr/bin/qgis

override_dh_missing:
dh_missing --fail-missing

override_dh_install:
dh_install --autodest
dh_install --autodest --list-missing

override_dh_installchangelogs:
dh_installchangelogs ChangeLog
@@ -42,7 +42,7 @@ Werner Macho <werner dot macho at gmail dot com>
Giuseppe Sucameli <brush dot tyler at gmail dot com>
Alessandro Furieri <a dot furieri at lqt dot it>
Alexander Bruy <alexander dot bruy@gmail dot com>
Marco Bernasocchi <marco at opengis dot ch>
Marco Bernasocchi <marco at bernawebdesign dot ch>
Nathan Woodrow <woodrow dot nathan at gmail dot com>
Sergey Yakushev <yakushevs at gmail dot com >
René-Luc D'Hont <rldhont at gmail dot com>
@@ -21,7 +21,6 @@ Carson J. Q. Farmer
Christian Ferreira
Cédric Möri
Daniel Vaz
Daniele Viganò
David Adler
David Nguyen
Denis Rouzaud
@@ -61,7 +60,6 @@ Mathias Walker
Mathieu Pellerin
Matt Amos
Matteo Ghetta
Matteo Nastasi
Matthias Kuhn
Maurizio Napolitano
Mayeul Kauffmann
@@ -5,7 +5,7 @@
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
<TITLE>QGIS</TITLE>

<!-- Included /home/fischer/src/qgis/doc/style.css -->
<!-- Included /home/fischer/src/qgis-3.6/doc/style.css -->
<STYLE TYPE="text/css">
body{ background: white;
color: black;
@@ -737,7 +737,7 @@ <H3>4.1.2. Other tools and dependencies</H3>
</P>

<UL>
<LI>qgis-dev-deps
<LI>qgis-rel-deps
</UL>

<P>
@@ -3113,5 +3113,5 @@ <H1>9. Authors and Acknowledgments</H1>

</DIV>
<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
<!-- cmdline: txt2tags -\-encoding=utf-8 -o/home/fischer/src/qgis/debian/build/doc/INSTALL.html -t html /home/fischer/src/qgis/doc/INSTALL.t2t -->
<!-- cmdline: txt2tags -\-encoding=utf-8 -o/home/fischer/src/qgis-3.6/debian/build/doc/INSTALL.html -t html /home/fischer/src/qgis-3.6/doc/INSTALL.t2t -->
</BODY></HTML>

0 comments on commit 4721940

Please sign in to comment.
You can’t perform that action at this time.