Skip to content
Permalink
Browse files
make sip bindings to qscintilla derived classes optional (replaces 7e…
  • Loading branch information
jef-n committed Jul 23, 2014
1 parent e47f111 commit 3988ad0f638a66a0a2eff8e611f5df3bd91315cc
Showing with 19 additions and 7,161 deletions.
  1. +5 −0 cmake/FindQsci.cmake
  2. +0 −1 cmake/FindQsci.py
  3. +1 −2 debian/rules
  4. +6 −3 python/CMakeLists.txt
  5. +0 −59 python/ext-libs/python-qscintilla2/Qsci/qsciabstractapis.sip
  6. +0 −75 python/ext-libs/python-qscintilla2/Qsci/qsciapis.sip
  7. +0 −147 python/ext-libs/python-qscintilla2/Qsci/qscicommand.sip
  8. +0 −54 python/ext-libs/python-qscintilla2/Qsci/qscicommandset.sip
  9. +0 −37 python/ext-libs/python-qscintilla2/Qsci/qscidocument.sip
  10. +0 −91 python/ext-libs/python-qscintilla2/Qsci/qscilexer.sip
  11. +0 −82 python/ext-libs/python-qscintilla2/Qsci/qscilexeravs.sip
  12. +0 −83 python/ext-libs/python-qscintilla2/Qsci/qscilexerbash.sip
  13. +0 −65 python/ext-libs/python-qscintilla2/Qsci/qscilexerbatch.sip
  14. +0 −80 python/ext-libs/python-qscintilla2/Qsci/qscilexercmake.sip
  15. +0 −95 python/ext-libs/python-qscintilla2/Qsci/qscilexercoffeescript.sip
  16. +0 −131 python/ext-libs/python-qscintilla2/Qsci/qscilexercpp.sip
  17. +0 −52 python/ext-libs/python-qscintilla2/Qsci/qscilexercsharp.sip
  18. +0 −97 python/ext-libs/python-qscintilla2/Qsci/qscilexercss.sip
  19. +0 −53 python/ext-libs/python-qscintilla2/Qsci/qscilexercustom.sip
  20. +0 −92 python/ext-libs/python-qscintilla2/Qsci/qscilexerd.sip
  21. +0 −61 python/ext-libs/python-qscintilla2/Qsci/qscilexerdiff.sip
  22. +0 −46 python/ext-libs/python-qscintilla2/Qsci/qscilexerfortran.sip
  23. +0 −80 python/ext-libs/python-qscintilla2/Qsci/qscilexerfortran77.sip
  24. +0 −189 python/ext-libs/python-qscintilla2/Qsci/qscilexerhtml.sip
  25. +0 −49 python/ext-libs/python-qscintilla2/Qsci/qscilexeridl.sip
  26. +0 −47 python/ext-libs/python-qscintilla2/Qsci/qscilexerjava.sip
  27. +0 −53 python/ext-libs/python-qscintilla2/Qsci/qscilexerjavascript.sip
  28. +0 −86 python/ext-libs/python-qscintilla2/Qsci/qscilexerlua.sip
  29. +0 −63 python/ext-libs/python-qscintilla2/Qsci/qscilexermakefile.sip
  30. +0 −63 python/ext-libs/python-qscintilla2/Qsci/qscilexermatlab.sip
  31. +0 −48 python/ext-libs/python-qscintilla2/Qsci/qscilexeroctave.sip
  32. +0 −86 python/ext-libs/python-qscintilla2/Qsci/qscilexerpascal.sip
  33. +0 −117 python/ext-libs/python-qscintilla2/Qsci/qscilexerperl.sip
  34. +0 −80 python/ext-libs/python-qscintilla2/Qsci/qscilexerpo.sip
  35. +0 −87 python/ext-libs/python-qscintilla2/Qsci/qscilexerpostscript.sip
  36. +0 −88 python/ext-libs/python-qscintilla2/Qsci/qscilexerpov.sip
  37. +0 −75 python/ext-libs/python-qscintilla2/Qsci/qscilexerproperties.sip
  38. +0 −106 python/ext-libs/python-qscintilla2/Qsci/qscilexerpython.sip
  39. +0 −97 python/ext-libs/python-qscintilla2/Qsci/qscilexerruby.sip
  40. +0 −63 python/ext-libs/python-qscintilla2/Qsci/qscilexerspice.sip
  41. +0 −101 python/ext-libs/python-qscintilla2/Qsci/qscilexersql.sip
  42. +0 −86 python/ext-libs/python-qscintilla2/Qsci/qscilexertcl.sip
  43. +0 −74 python/ext-libs/python-qscintilla2/Qsci/qscilexertex.sip
  44. +0 −90 python/ext-libs/python-qscintilla2/Qsci/qscilexerverilog.sip
  45. +0 −89 python/ext-libs/python-qscintilla2/Qsci/qscilexervhdl.sip
  46. +0 −60 python/ext-libs/python-qscintilla2/Qsci/qscilexerxml.sip
  47. +0 −76 python/ext-libs/python-qscintilla2/Qsci/qscilexeryaml.sip
  48. +0 −56 python/ext-libs/python-qscintilla2/Qsci/qscimacro.sip
  49. +0 −31 python/ext-libs/python-qscintilla2/Qsci/qscimod3.sip
  50. +0 −31 python/ext-libs/python-qscintilla2/Qsci/qscimod4.sip
  51. +0 −36 python/ext-libs/python-qscintilla2/Qsci/qscimod5.sip
  52. +0 −106 python/ext-libs/python-qscintilla2/Qsci/qscimodcommon.sip
  53. +0 −50 python/ext-libs/python-qscintilla2/Qsci/qsciprinter.sip
  54. +0 −556 python/ext-libs/python-qscintilla2/Qsci/qsciscintilla.sip
  55. +0 −1,362 python/ext-libs/python-qscintilla2/Qsci/qsciscintillabase3.sip
  56. +0 −1,363 python/ext-libs/python-qscintilla2/Qsci/qsciscintillabase4.sip
  57. +0 −73 python/ext-libs/python-qscintilla2/Qsci/qscistyle.sip
  58. +0 −38 python/ext-libs/python-qscintilla2/Qsci/qscistyledtext.sip
  59. +7 −0 python/gui/gui.sip
@@ -31,6 +31,11 @@ ELSE(EXISTS QSCI_MOD_VERSION_STR)
ENDIF(qsci_ver)

IF(QSCI_FOUND)
FIND_PATH(QSCI_SIP_DIR
NAMES Qsci/qscimod4.sip
PATHS ${PYQT4_SIP_DIR}
)

IF(NOT QSCI_FIND_QUIETLY)
MESSAGE(STATUS "Found QScintilla2 PyQt4 module: ${QSCI_MOD_VERSION_STR}")
ENDIF(NOT QSCI_FIND_QUIETLY)
@@ -41,5 +41,4 @@
except ImportError:
VER = ""


print("qsci_version_str:%s" % VER)
@@ -62,8 +62,7 @@ CMAKE_OPTS := \
-DWITH_INTERNAL_PYGMENTS=FALSE \
-DWITH_INTERNAL_DATEUTIL=FALSE \
-DWITH_INTERNAL_PYTZ=FALSE \
-DWITH_INTERNAL_SIX=FALSE \
-DWITH_INTERNAL_QSCINTILLA2_SIPS=TRUE
-DWITH_INTERNAL_SIX=FALSE

ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -144,9 +144,12 @@ INCLUDE_DIRECTORIES(
FILE(GLOB_RECURSE sip_files_gui gui/*.sip)
SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_gui})
SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.gui.api)
IF(WITH_INTERNAL_QSCINTILLA2_SIPS)
SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -I ${CMAKE_CURRENT_SOURCE_DIR}/ext-libs/python-qscintilla2)
ENDIF(WITH_INTERNAL_QSCINTILLA2_SIPS)
IF(QSCI_SIP_DIR)
SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -I ${QSCI_SIP_DIR})
ELSE(QSCI_SIP_DIR)
MESSAGE(STATUS "Qsci sip file not found - disabling bindings for derived classes")
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} HAVE_QSCI_SIP)
ENDIF(QSCI_SIP_DIR)

IF(UNIX AND NOT SIP_VERSION_NUM LESS 265984)
SET(SIP_EXTRA_OPTIONS -P ${SIP_EXTRA_OPTIONS})

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 3988ad0

Please sign in to comment.