fix variable used for configuration

qgis · Jan 17, 2018 · 0644f59 · 0644f59
1 parent 4a0eedd
commit 0644f59
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 29 deletions.
diff --git a/cmake/SIPMacros.cmake b/cmake/SIPMacros.cmake
@@ -61,8 +61,6 @@ MACRO(GENERATE_SIP_PYTHON_MODULE_CODE MODULE_NAME MODULE_SIP SIP_FILES CPP_FILES
     FILE(RELATIVE_PATH _sip_file_relpath ${CMAKE_CURRENT_SOURCE_DIR} "${_sip_file_path}/${_sip_file_name_we}")
     SET(_out_sip_file "${CMAKE_CURRENT_BINARY_DIR}/${_sip_file_relpath}.sip")
     CONFIGURE_FILE(${_sip_file} ${_out_sip_file})
-    MESSAGE(${_sip_file})
-    MESSAGE(${_out_sip_file})
   ENDFOREACH (_sip_file)
 
 

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -175,10 +175,10 @@ ENDIF(NOT QT_MOBILITY_LOCATION_FOUND)
 # * prepend auto-generated Python signature to existing Docstrings
 # * document template based classes
 SET(DOCSTRINGSTEMPLATE "//")
-IF(${SIP_VERSION_STR} VERSION_GREATER 4.19.7)
+IF(${SIP_VERSION_STR} VERSION_GREATER 4.19.6)
   SET(DEFAULTDOCSTRINGSIGNATURE "%DefaultDocstringSignature \"prepended\"")
   SET(DOCSTRINGSTEMPLATE "")
-ENDIF(${SIP_VERSION_STR} VERSION_GREATER 4.19.7)
+ENDIF(${SIP_VERSION_STR} VERSION_GREATER 4.19.6)
 
 # core module
 FILE(GLOB_RECURSE sip_files_core core/*.sip core/*.sip.in)

diff --git a/python/core/qgsrange.sip.in b/python/core/qgsrange.sip.in
@@ -247,32 +247,32 @@ Returns true if this range overlaps another range.
 
 
 typedef QgsTemporalRange< QDate > QgsDateRange;
-@TEMPLATE_DOCSTRING@%Docstring
-@TEMPLATE_DOCSTRING@QgsRange which stores a range of dates.
-@TEMPLATE_DOCSTRING@
-@TEMPLATE_DOCSTRING@Invalid QDates as the beginning or end are permitted. In this case,
-@TEMPLATE_DOCSTRING@the bound is considered to be infinite. E.g. QgsDateRange(QDate(),QDate(2017,1,1))
-@TEMPLATE_DOCSTRING@is treated as a range containing all dates before 2017-1-1.
-@TEMPLATE_DOCSTRING@QgsDateRange(QDate(2017,1,1),QDate()) is treated as a range containing all dates after 2017-1-1.
-@TEMPLATE_DOCSTRING@
-@TEMPLATE_DOCSTRING@.. versionadded:: 3.0
-@TEMPLATE_DOCSTRING@
-@TEMPLATE_DOCSTRING@.. seealso:: :py:class:`QgsDateTimeRange`
-@TEMPLATE_DOCSTRING@%End
+@DOCSTRINGSTEMPLATE@%Docstring
+@DOCSTRINGSTEMPLATE@QgsRange which stores a range of dates.
+@DOCSTRINGSTEMPLATE@
+@DOCSTRINGSTEMPLATE@Invalid QDates as the beginning or end are permitted. In this case,
+@DOCSTRINGSTEMPLATE@the bound is considered to be infinite. E.g. QgsDateRange(QDate(),QDate(2017,1,1))
+@DOCSTRINGSTEMPLATE@is treated as a range containing all dates before 2017-1-1.
+@DOCSTRINGSTEMPLATE@QgsDateRange(QDate(2017,1,1),QDate()) is treated as a range containing all dates after 2017-1-1.
+@DOCSTRINGSTEMPLATE@
+@DOCSTRINGSTEMPLATE@.. versionadded:: 3.0
+@DOCSTRINGSTEMPLATE@
+@DOCSTRINGSTEMPLATE@.. seealso:: :py:class:`QgsDateTimeRange`
+@DOCSTRINGSTEMPLATE@%End
 
 typedef QgsTemporalRange< QDateTime > QgsDateTimeRange;
-@TEMPLATE_DOCSTRING@%Docstring
-@TEMPLATE_DOCSTRING@QgsRange which stores a range of date times.
-@TEMPLATE_DOCSTRING@
-@TEMPLATE_DOCSTRING@Invalid QDateTimes as the beginning or end are permitted. In this case,
-@TEMPLATE_DOCSTRING@the bound is considered to be infinite. E.g. QgsDateTimeRange(QDateTime(),QDateTime(2017,1,1))
-@TEMPLATE_DOCSTRING@is treated as a range containing all dates before 2017-1-1.
-@TEMPLATE_DOCSTRING@QgsDateTimeRange(QDateTime(2017,1,1),QDateTime()) is treated as a range containing all dates after 2017-1-1.
-@TEMPLATE_DOCSTRING@
-@TEMPLATE_DOCSTRING@.. versionadded:: 3.0
-@TEMPLATE_DOCSTRING@
-@TEMPLATE_DOCSTRING@.. seealso:: :py:class:`QgsDateRange`
-@TEMPLATE_DOCSTRING@%End
+@DOCSTRINGSTEMPLATE@%Docstring
+@DOCSTRINGSTEMPLATE@QgsRange which stores a range of date times.
+@DOCSTRINGSTEMPLATE@
+@DOCSTRINGSTEMPLATE@Invalid QDateTimes as the beginning or end are permitted. In this case,
+@DOCSTRINGSTEMPLATE@the bound is considered to be infinite. E.g. QgsDateTimeRange(QDateTime(),QDateTime(2017,1,1))
+@DOCSTRINGSTEMPLATE@is treated as a range containing all dates before 2017-1-1.
+@DOCSTRINGSTEMPLATE@QgsDateTimeRange(QDateTime(2017,1,1),QDateTime()) is treated as a range containing all dates after 2017-1-1.
+@DOCSTRINGSTEMPLATE@
+@DOCSTRINGSTEMPLATE@.. versionadded:: 3.0
+@DOCSTRINGSTEMPLATE@
+@DOCSTRINGSTEMPLATE@.. seealso:: :py:class:`QgsDateRange`
+@DOCSTRINGSTEMPLATE@%End
 
 /************************************************************************
  * This file has been generated automatically from                      *

diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -1053,7 +1053,7 @@ sub detect_non_method_member{
             dbg_info('writing comment');
             if ( $COMMENT !~ m/^\s*$/ ){
                 my $doc_prepend = "";
-                $doc_prepend = "\@TEMPLATE_DOCSTRING\@" if $COMMENT_TEMPLATE_DOCSTRING == 1;
+                $doc_prepend = "\@DOCSTRINGSTEMPLATE\@" if $COMMENT_TEMPLATE_DOCSTRING == 1;
                 write_output("CM1", "$doc_prepend%Docstring\n");
                 my @comment_lines = split /\n/, $COMMENT;
                 foreach my $comment_line (@comment_lines) {