[sipify] fix do not print comment after SIP directive

qgis · May 1, 2017 · 634c7aa · 634c7aa
1 parent 1f8c311
commit 634c7aa
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -659,7 +659,11 @@ sub remove_constructor_or_body {
         $is_override = 0;
         next;
     }
-    elsif ( $line =~ m/\/\// || $line =~ m/\s*typedef / || $line =~ m/\s*struct / || $line =~ m/operator\[\]\(/ ){
+    elsif ( $line =~ m/\/\// ||
+            $line =~ m/\s*typedef / ||
+            $line =~ m/\s*struct / ||
+             $line =~ m/operator\[\]\(/ ||
+             $line =~ m/^\s*% \w+(.*)?$/ ){
         dbg_info('skipping comment');
         $comment = '';
         $return_type = '';

diff --git a/tests/scripts/sipifyheader.expected.sip b/tests/scripts/sipifyheader.expected.sip
@@ -9,6 +9,14 @@
 
 
 
+% ModuleHeaderCode
+#include <qgsnetworkspeedstrategy.h>
+#include <qgsnetworkdistancestrategy.h>
+%End
+
+
+
+
 
 
 

diff --git a/tests/scripts/sipifyheader.h b/tests/scripts/sipifyheader.h
@@ -16,9 +16,17 @@ email                : denis.rouzaud@gmail.com
 #ifndef SIPIFYHEADER_H
 #define SIPIFYHEADER_H
 
+
 #include "qgis_core.h"
 #include <QtClass>
 
+#ifdef SIP_RUN
+% ModuleHeaderCode
+#include <qgsnetworkspeedstrategy.h>
+#include <qgsnetworkdistancestrategy.h>
+% End
+#endif
+
 #include "sipifyheader.h"
 
 // one shall include qgis.h to use SIP annotations
@@ -27,6 +35,8 @@ email                : denis.rouzaud@gmail.com
 class QgsForwardDeclaration;
 
 
+
+
 /***************************************************************************
  * This is some random block comment that will not be displayed.
  * Block comments shall will placed upon class, method, enum without