Skip to content
Permalink
Browse files

debian packaging update: add experimental build

  • Loading branch information
jef-n committed Sep 25, 2016
1 parent 7cf5592 commit 17090b90923a766f8baeb34d1c7fd2b11709cb81
Showing with 10 additions and 56 deletions.
  1. +2 −2 cmake_templates/Doxyfile.in
  2. +0 −38 debian/control
  3. +3 −2 debian/control.in
  4. +1 −2 debian/rules
  5. +4 −12 doc/CMakeLists.txt
@@ -939,13 +939,13 @@ GENERATE_QHP = @WITH_QHP@
# be used to specify the file name of the resulting .qch file.
# The path specified is relative to the HTML output folder.

QCH_FILE =../qch/qgis.qch
QCH_FILE = ../qch/qgis.qch

# The QHP_NAMESPACE tag specifies the namespace to use when generating
# Qt Help Project output. For more information please see
# http://doc.trolltech.com/qthelpproject.html#namespace

QHP_NAMESPACE = org.qgis.qgis2
QHP_NAMESPACE = org.qgis.qgis3

# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
# Qt Help Project output. For more information please see
@@ -29,7 +29,6 @@ Build-Depends:
python3-sip,
python3-sip-dev,
python3-pyqt5,
libosgearth-dev,
git,
txt2tags,
doxygen
@@ -49,7 +48,6 @@ Depends:
qgis-providers (= ${binary:Version}),
qgis-common (= ${source:Version})
Recommends:
qgis-plugin-globe,
qgis-plugin-grass,
python-qgis
Suggests: gpsbabel
@@ -286,32 +284,6 @@ Description: GRASS plugin for QGIS - architecture-independent data
This package contains architecture-independent supporting data files for use
with the QGIS GRASS plugin.

Package: qgis-plugin-globe
Architecture: any
Depends:
qgis (= ${binary:Version}),
qgis-plugin-globe-common (= ${source:Version}),
openscenegraph-plugin-osgearth,
${shlibs:Depends},
${misc:Depends}
Description: OSG globe plugin for QGIS
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This plugin enables 3D viewing using OSG globe in the QGIS.

Package: qgis-plugin-globe-common
Architecture: all
Depends:
osgearth-data,
${misc:Depends}
Description: OSG globe plugin for QGIS - architecture-independent data
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains architecture-independent supporting data files for use
with the QGIS GLOBE plugin.

Package: python-qgis
Architecture: any
Section: python
@@ -420,13 +392,3 @@ Description: QGIS API documentation
.
This package contains the QGIS API documentation.

#oracle#Package: qgis-oracle-provider
#oracle#Architecture: any
#oracle#Depends: ${shlibs:Depends}, ${misc:Depends}
#oracle#Section: contrib/database
#oracle#Description: QGIS oracle provider
#oracle# QGIS is a Geographic Information System (GIS) which manages, analyzes and
#oracle# display databases of geographic information.
#oracle# .
#oracle# This package contains the QGIS oracle provider.
#oracle#
@@ -31,7 +31,8 @@ Build-Depends:
python3-sip,
python3-sip-dev,
python3-pyqt5,
libosgearth-dev,
#sid# libosgearth-dev,
qttools5-dev-tools,
git,
txt2tags,
doxygen,
@@ -43,7 +44,7 @@ Build-Depends:
libqt5svg5-dev, libqt5xmlpatterns5-dev,
pyqt5.qsci-dev,
libqt5webkit5-dev, qttools5-dev, qtscript5-dev,
libqt5scintilla2-dev, pyqt5-dev-tools, python3-pyqt5.qtsql, qtpositioning5-dev, libqt5opengl5-dev,
libqt5scintilla2-dev, pyqt5-dev-tools, python3-pyqt5.qtsql, qtpositioning5-dev, libqt5opengl5-dev, libqt5sql5-sqlite,
python3-pyqt5.qsci,
pyqt5.qsci-dev, python3-nose2,
python3-gdal, python3-yaml, python3-mock, python3-psycopg2, python3-future, python3-termcolor,
@@ -19,6 +19,7 @@ DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)

DEB_TEST_TARGET ?= Experimental
QGIS_BUILDDIR ?= debian/build
export QT_SELECT=5

QGIS_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \([0-9]\+:\)\?\([^+-]\+\).*$$/\2/p')

@@ -81,8 +82,6 @@ CMAKE_OPTS := \
-DWITH_INTERNAL_YAML=FALSE \
-DWITH_INTERNAL_NOSE2=FALSE \
-DWITH_INTERNAL_SIX=FALSE \
-DQT_TAG_FILE=/usr/share/qt5/doc/html/qt.tags \
-DQT_DOC_URL=/usr/share/qt5/doc/qtdoc/ \
-DWITH_GLOBE=FALSE \
-DWITH_SERVER=FALSE \
-DWITH_SERVER_PLUGINS=FALSE \
@@ -34,24 +34,17 @@ INSTALL (FILES ${SPONSOR_IMAGES} DESTINATION ${QGIS_DATA_DIR}/doc/images/project
IF(WITH_APIDOC)
FIND_PACKAGE(Doxygen 1.8.2 REQUIRED)
IF(DOXYGEN_FOUND)
SET(QHP_FILES ${CMAKE_CURRENT_BINARY_DIR}/api/html/index.qhp)

# Whether to generate QHP file
SET (GENERATE_QHP FALSE CACHE BOOL "Determines whether to generate Qt QHP help from the QGIS API Docs")
IF (GENERATE_QHP)
SET(WITH_QHP YES)
SET(QHP_FILES ${QHP_FILES} ${CMAKE_CURRENT_BINARY_DIR}/api/qch/qgis.qch)
ELSE(GENERATE_QHP)
SET(WITH_QHP NO)
ENDIF(GENERATE_QHP)

FIND_FILE(QT_TAG_FILE
NAMES qt4.tags qt4.tag qt.tags qt.tag
PATHS "${QT_DOC_DIR}"
DOC "Path to Qt documentation tag file (eg qt.tags)"
)
IF(QT_TAG_FILE)
SET(DOXYGEN_TAGS ${QT_TAG_FILE}=${QT_DOC_URL})
ENDIF(QT_TAG_FILE)

SET(DOXYGEN_INPUT
${CMAKE_SOURCE_DIR}/doc
${CMAKE_SOURCE_DIR}/src/core
@@ -104,12 +97,11 @@ IF(WITH_APIDOC)
STRING(REPLACE ";" " " DOXYGEN_INPUT "${DOXYGEN_INPUT}")

CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake_templates/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
ADD_CUSTOM_TARGET(apidoc ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/doxygen.stamp)
ADD_CUSTOM_TARGET(apidoc ALL DEPENDS ${QHP_FILES})
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/doxygen.stamp
OUTPUT ${QHP_FILES}
DEPENDS ${DOXYGEN_FILES}
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/doxygen.stamp
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "Generating API documentation" VERBATIM)
INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/api/html/ DESTINATION ${QGIS_DATA_DIR}/doc/api)

0 comments on commit 17090b9

Please sign in to comment.