[Python-modules-commits] [qscintilla2] 02/17: Import qscintilla2_2.9.2+dfsg.orig.tar.gz
Scott Kitterman
kitterman at moszumanska.debian.org
Mon May 2 02:43:40 UTC 2016
This is an automated email from the git hooks/post-receive script.
kitterman pushed a commit to branch master
in repository qscintilla2.
commit cf62ac11c1527ece2054cf1b15c2692922a996a5
Author: Scott Kitterman <scott at kitterman.com>
Date: Fri Apr 29 22:48:52 2016 -0400
Import qscintilla2_2.9.2+dfsg.orig.tar.gz
---
ChangeLog | 103 +++++++++++++++-
NEWS | 3 +
Python/configure-old.py | 13 +-
Python/configure.py | 132 +++++++++++++--------
Python/sip/qsciscintillabase.sip | 10 +-
Qt4Qt5/Qsci/qsciglobal.h | 22 ++--
Qt4Qt5/features/qscintilla2.prf | 2 +
.../qscintilla2.prf | 0
Qt4Qt5/qscintilla.pro | 8 +-
doc/html-Qt4Qt5/annotated.html | 4 +-
doc/html-Qt4Qt5/classQsciAPIs-members.html | 4 +-
doc/html-Qt4Qt5/classQsciAPIs.html | 4 +-
doc/html-Qt4Qt5/classQsciAbstractAPIs-members.html | 4 +-
doc/html-Qt4Qt5/classQsciAbstractAPIs.html | 4 +-
doc/html-Qt4Qt5/classQsciCommand-members.html | 4 +-
doc/html-Qt4Qt5/classQsciCommand.html | 4 +-
doc/html-Qt4Qt5/classQsciCommandSet-members.html | 4 +-
doc/html-Qt4Qt5/classQsciCommandSet.html | 4 +-
doc/html-Qt4Qt5/classQsciDocument-members.html | 4 +-
doc/html-Qt4Qt5/classQsciDocument.html | 4 +-
doc/html-Qt4Qt5/classQsciLexer-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexer.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerAVS-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerAVS.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerBash-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerBash.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerBatch-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerBatch.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCMake-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCMake.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCPP-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCPP.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCSS-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCSS.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCSharp-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCSharp.html | 4 +-
.../classQsciLexerCoffeeScript-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCoffeeScript.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCustom-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCustom.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerD-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerD.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerDiff-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerDiff.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerFortran-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerFortran.html | 4 +-
.../classQsciLexerFortran77-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerFortran77.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerHTML-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerHTML.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerIDL-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerIDL.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerJava-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerJava.html | 4 +-
.../classQsciLexerJavaScript-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerJavaScript.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerLua-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerLua.html | 4 +-
.../classQsciLexerMakefile-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerMakefile.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerMatlab-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerMatlab.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerOctave-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerOctave.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPO-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPO.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPOV-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPOV.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPascal-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPascal.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPerl-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPerl.html | 4 +-
.../classQsciLexerPostScript-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPostScript.html | 4 +-
.../classQsciLexerProperties-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerProperties.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPython-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPython.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerRuby-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerRuby.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerSQL-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerSQL.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerSpice-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerSpice.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerTCL-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerTCL.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerTeX-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerTeX.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerVHDL-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerVHDL.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerVerilog-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerVerilog.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerXML-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerXML.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerYAML-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerYAML.html | 4 +-
doc/html-Qt4Qt5/classQsciMacro-members.html | 4 +-
doc/html-Qt4Qt5/classQsciMacro.html | 4 +-
doc/html-Qt4Qt5/classQsciPrinter-members.html | 4 +-
doc/html-Qt4Qt5/classQsciPrinter.html | 4 +-
doc/html-Qt4Qt5/classQsciScintilla-members.html | 4 +-
doc/html-Qt4Qt5/classQsciScintilla.html | 4 +-
.../classQsciScintillaBase-members.html | 4 +-
doc/html-Qt4Qt5/classQsciScintillaBase.html | 4 +-
doc/html-Qt4Qt5/classQsciStyle-members.html | 4 +-
doc/html-Qt4Qt5/classQsciStyle.html | 4 +-
doc/html-Qt4Qt5/classQsciStyledText-members.html | 4 +-
doc/html-Qt4Qt5/classQsciStyledText.html | 4 +-
doc/html-Qt4Qt5/classes.html | 4 +-
.../dir_7748dc2bc19d24806c9f0ac63a9f96c8.html | 4 +-
.../dir_a8871a339b4996dff2a2bca902b97660.html | 4 +-
doc/html-Qt4Qt5/dynsections.js | 97 +++++++++++++++
doc/html-Qt4Qt5/functions.html | 4 +-
doc/html-Qt4Qt5/functions_b.html | 4 +-
doc/html-Qt4Qt5/functions_c.html | 4 +-
doc/html-Qt4Qt5/functions_d.html | 4 +-
doc/html-Qt4Qt5/functions_e.html | 4 +-
doc/html-Qt4Qt5/functions_enum.html | 4 +-
doc/html-Qt4Qt5/functions_eval.html | 4 +-
doc/html-Qt4Qt5/functions_eval_b.html | 4 +-
doc/html-Qt4Qt5/functions_eval_c.html | 4 +-
doc/html-Qt4Qt5/functions_eval_d.html | 4 +-
doc/html-Qt4Qt5/functions_eval_e.html | 4 +-
doc/html-Qt4Qt5/functions_eval_f.html | 4 +-
doc/html-Qt4Qt5/functions_eval_g.html | 4 +-
doc/html-Qt4Qt5/functions_eval_h.html | 4 +-
doc/html-Qt4Qt5/functions_eval_i.html | 4 +-
doc/html-Qt4Qt5/functions_eval_j.html | 4 +-
doc/html-Qt4Qt5/functions_eval_k.html | 4 +-
doc/html-Qt4Qt5/functions_eval_l.html | 4 +-
doc/html-Qt4Qt5/functions_eval_m.html | 4 +-
doc/html-Qt4Qt5/functions_eval_n.html | 4 +-
doc/html-Qt4Qt5/functions_eval_o.html | 4 +-
doc/html-Qt4Qt5/functions_eval_p.html | 4 +-
doc/html-Qt4Qt5/functions_eval_q.html | 4 +-
doc/html-Qt4Qt5/functions_eval_r.html | 4 +-
doc/html-Qt4Qt5/functions_eval_s.html | 4 +-
doc/html-Qt4Qt5/functions_eval_t.html | 4 +-
doc/html-Qt4Qt5/functions_eval_u.html | 4 +-
doc/html-Qt4Qt5/functions_eval_v.html | 4 +-
doc/html-Qt4Qt5/functions_eval_w.html | 4 +-
doc/html-Qt4Qt5/functions_eval_x.html | 4 +-
doc/html-Qt4Qt5/functions_eval_z.html | 4 +-
doc/html-Qt4Qt5/functions_f.html | 4 +-
doc/html-Qt4Qt5/functions_func.html | 4 +-
doc/html-Qt4Qt5/functions_func_b.html | 4 +-
doc/html-Qt4Qt5/functions_func_c.html | 4 +-
doc/html-Qt4Qt5/functions_func_d.html | 4 +-
doc/html-Qt4Qt5/functions_func_e.html | 4 +-
doc/html-Qt4Qt5/functions_func_f.html | 4 +-
doc/html-Qt4Qt5/functions_func_g.html | 4 +-
doc/html-Qt4Qt5/functions_func_h.html | 4 +-
doc/html-Qt4Qt5/functions_func_i.html | 4 +-
doc/html-Qt4Qt5/functions_func_k.html | 4 +-
doc/html-Qt4Qt5/functions_func_l.html | 4 +-
doc/html-Qt4Qt5/functions_func_m.html | 4 +-
doc/html-Qt4Qt5/functions_func_o.html | 4 +-
doc/html-Qt4Qt5/functions_func_p.html | 4 +-
doc/html-Qt4Qt5/functions_func_q.html | 4 +-
doc/html-Qt4Qt5/functions_func_r.html | 4 +-
doc/html-Qt4Qt5/functions_func_s.html | 4 +-
doc/html-Qt4Qt5/functions_func_t.html | 4 +-
doc/html-Qt4Qt5/functions_func_u.html | 4 +-
doc/html-Qt4Qt5/functions_func_v.html | 4 +-
doc/html-Qt4Qt5/functions_func_w.html | 4 +-
doc/html-Qt4Qt5/functions_func_z.html | 4 +-
doc/html-Qt4Qt5/functions_func_~.html | 4 +-
doc/html-Qt4Qt5/functions_g.html | 4 +-
doc/html-Qt4Qt5/functions_h.html | 4 +-
doc/html-Qt4Qt5/functions_i.html | 4 +-
doc/html-Qt4Qt5/functions_j.html | 4 +-
doc/html-Qt4Qt5/functions_k.html | 4 +-
doc/html-Qt4Qt5/functions_l.html | 4 +-
doc/html-Qt4Qt5/functions_m.html | 4 +-
doc/html-Qt4Qt5/functions_n.html | 4 +-
doc/html-Qt4Qt5/functions_o.html | 4 +-
doc/html-Qt4Qt5/functions_p.html | 4 +-
doc/html-Qt4Qt5/functions_q.html | 4 +-
doc/html-Qt4Qt5/functions_r.html | 4 +-
doc/html-Qt4Qt5/functions_s.html | 4 +-
doc/html-Qt4Qt5/functions_t.html | 4 +-
doc/html-Qt4Qt5/functions_u.html | 4 +-
doc/html-Qt4Qt5/functions_v.html | 4 +-
doc/html-Qt4Qt5/functions_w.html | 4 +-
doc/html-Qt4Qt5/functions_x.html | 4 +-
doc/html-Qt4Qt5/functions_z.html | 4 +-
doc/html-Qt4Qt5/functions_~.html | 4 +-
doc/html-Qt4Qt5/hierarchy.html | 4 +-
doc/html-Qt4Qt5/index.html | 4 +-
doc/qscintilla-Qt4Qt5.dxy | 2 +-
190 files changed, 671 insertions(+), 437 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0a28053..b448bd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,109 @@
+2016-04-18 Phil Thompson <phil at riverbankcomputing.com>
+
+ * .hgtags:
+ Added tag 2.9.2 for changeset 15888f3e91ce
+ [5cd132938309] [tip] <2.9-maint>
+
+ * NEWS:
+ Released as v2.9.2.
+ [15888f3e91ce] [2.9.2] <2.9-maint>
+
+ * Python/sip/qsciscintillabase.sip:
+ Remove all deprecated /DocType/ annotations.
+ [b9d570ab642a] <2.9-maint>
+
+2016-04-17 Phil Thompson <phil at riverbankcomputing.com>
+
+ * rbproduct.py:
+ Locate the static library on Windows.
+ [dd8c14dace83] <2.9-maint>
+
+ * rbproduct.py:
+ Fixed a typo.
+ [baf5c942f528] <2.9-maint>
+
+ * rbproduct.py:
+ Add any pre-installed .api files to the wheel.
+ [cf7b6302ae83] <2.9-maint>
+
+ * rbproduct.py:
+ Exploit verbose mode in the product plugin.
+ [da743c037880] <2.9-maint>
+
+ * rbproduct.py:
+ Fixed permissions of the product plugin.
+ [6fac075e0b88] <2.9-maint>
+
+2016-04-16 Phil Thompson <phil at riverbankcomputing.com>
+
+ * Makefile:
+ Updated the clean target.
+ [692b14f48ade] <2.9-maint>
+
+ * rbproduct.py:
+ The wheel now includes translations and API files.
+ [bf911094e537] <2.9-maint>
+
+ * METADATA.in, Makefile, Python/configure.py, build.py, rbproduct.py:
+ Added the initial support for creating wheels.
+ [da0a5d22e864] <2.9-maint>
+
+ * Makefile, build.py:
+ Added the --omit-license-tag option to build.py. Added the dist-
+ wheel-gpl target to the master Makefile.
+ [a63c245de735] <2.9-maint>
+
+2016-04-15 Phil Thompson <phil at riverbankcomputing.com>
+
+ * Python/configure-old.py, Python/configure.py, build.py,
+ qt/features/qscintilla2.prf, qt/features_staticlib/qscintilla2.prf,
+ qt/qsciglobal.h, qt/qscintilla.pro:
+ Symbols are now hidden if possible on all platforms. Improved the
+ handling of QSCINTILLA_DLL so it should be completely automatic.
+ Removed the --no-dll option to configure.py.
+ [e35caca29dd6] <2.9-maint>
+
+2016-03-25 Phil Thompson <phil at riverbankcomputing.com>
+
+ * Python/configure-old.py, build.py:
+ Use the new naming standards for development versions.
+ [21d2f882320a] <2.9-maint>
+
+2016-03-14 Phil Thompson <phil at riverbankcomputing.com>
+
+ * Python/configure.py, build.py:
+ The configure.py boilerplate code is applied automatically.
+ [848f3fca41c0] <2.9-maint>
+
+2016-03-13 Phil Thompson <phil at riverbankcomputing.com>
+
+ * Python/configure.py:
+ Updated the configure.py boilerplate.
+ [b3fd404a1134] <2.9-maint>
+
+2016-03-07 Phil Thompson <phil at riverbankcomputing.com>
+
+ * Python/configure.py:
+ Added support for PEP 484 stub files to configure.py.
+ [9316fed27503] <2.9-maint>
+
+2015-12-15 Phil Thompson <phil at riverbankcomputing.com>
+
+ * Makefile:
+ Switched the internal build system to Python v3.5.
+ [5215e7f3116e] <2.9-maint>
+
+2015-10-28 Phil Thompson <phil at riverbankcomputing.com>
+
+ * Python/configure.py:
+ Handle PATH components that are enclosed in quotes.
+ [d0f19b69ce26] <2.9-maint>
+
2015-10-24 Phil Thompson <phil at riverbankcomputing.com>
* .hgtags:
Added tag 2.9.1 for changeset 9bd39be91ef8
- [c71bd22d6ccf] [tip] <2.9-maint>
+ [c71bd22d6ccf] <2.9-maint>
* NEWS:
Released as v2.9.1.
diff --git a/NEWS b/NEWS
index 5c6c2e6..80273fe 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+v2.9.2 18th April 2016
+ - Added support for a PEP 484 stub file for the Python extension module.
+
v2.9.1 24th October 2015
- Added the .api file for Python v3.5.
- Bug fixes.
diff --git a/Python/configure-old.py b/Python/configure-old.py
index 7cf4f6d..765b37a 100644
--- a/Python/configure-old.py
+++ b/Python/configure-old.py
@@ -61,10 +61,7 @@ QSCI_API_MAJOR = 12
# Initialise the globals.
sip_min_version = 0x040c00
-if sys.platform == "win32":
- qsci_define = "QSCINTILLA_DLL"
-else:
- qsci_define = ""
+qsci_define = "QSCINTILLA_DLL"
def create_optparser():
@@ -80,7 +77,7 @@ def create_optparser():
setattr(parser.values, option.dest, os.path.abspath(value))
p = optparse.OptionParser(usage="python %prog [options]",
- version="2.9.1")
+ version="2.9.2")
p.add_option("-a", "--apidir", action="callback", default=None,
type="string", metavar="DIR", dest="qscidir",
@@ -180,8 +177,8 @@ def check_qscintilla():
# Because we include the Python bindings with the C++ code we can
# reasonably force the same version to be used and not bother about
# versioning.
- if sciversstr != "2.9.1":
- sipconfig.error("QScintilla %s is being used but the Python bindings 2.9.1 are being built. Please use matching versions." % sciversstr)
+ if sciversstr != "2.9.2":
+ sipconfig.error("QScintilla %s is being used but the Python bindings 2.9.2 are being built. Please use matching versions." % sciversstr)
sipconfig.inform("QScintilla %s is being used." % sciversstr)
else:
@@ -333,7 +330,7 @@ def main(argv):
global pyqt
# Check SIP is new enough.
- if "preview" not in pyqt.sip_version_str and "snapshot" not in pyqt.sip_version_str:
+ if ".dev" not in pyqt.sip_version_str and "snapshot" not in pyqt.sip_version_str:
if pyqt.sip_version < sip_min_version:
sipconfig.error("This version of QScintilla requires SIP v%s or later" % sipconfig.version_to_string(sip_min_version))
diff --git a/Python/configure.py b/Python/configure.py
index d58d629..8442498 100644
--- a/Python/configure.py
+++ b/Python/configure.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2015, Riverbank Computing Limited
+# Copyright (c) 2016, Riverbank Computing Limited
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-# This is v1.4 of this boilerplate.
+# This is v1.7 of this boilerplate.
from distutils import sysconfig
@@ -60,7 +60,7 @@ class ModuleConfiguration(object):
# The version of the module as a string. Set it to None if you don't
# provide version information.
- version = '2.9.1'
+ version = '2.9.2'
# Set if a configuration script is provided that handles versions of PyQt4
# prior to v4.10 (i.e. versions where the pyqtconfig.py module is
@@ -71,11 +71,16 @@ class ModuleConfiguration(object):
# The minimum version of SIP that is required. This should be a
# dot-separated string of two or three integers (e.g. '1.0', '4.10.3'). If
# it is None or an empty string then the version is not checked.
- minimum_sip_version = '4.16'
+ minimum_sip_version = '4.18'
# Set if support for C++ exceptions can be disabled.
no_exceptions = True
+ # The name (without the .pyi extension) of the name of the PEP 484 stub
+ # file to be generated. If it is None or an empty string then a stub file
+ # is not generated.
+ pep484_stub_file = 'Qsci'
+
# Set if the module supports redefining 'protected' as 'public'.
protected_is_public_is_supported = True
@@ -117,9 +122,9 @@ class ModuleConfiguration(object):
"""
target_configuration.qsci_version = None
+ target_configuration.qsci_features_dir = None
target_configuration.qsci_inc_dir = None
target_configuration.qsci_lib_dir = None
- target_configuration.qsci_is_dll = (target_configuration.py_platform == 'win32')
target_configuration.qsci_sip_dir = None
def init_optparser(self, optparser, target_configuration):
@@ -135,16 +140,19 @@ class ModuleConfiguration(object):
help="the directory containing the QScintilla Qsci header "
"file directory is DIR [default: QT_INSTALL_HEADERS]")
+ optparser.add_option('--qsci-featuresdir', dest='qsci_features_dir',
+ type='string', default=None, action='callback',
+ callback=optparser_store_abspath_dir, metavar="DIR",
+ help="the directory containing the qscintilla2.prf features "
+ "file is DIR [default: "
+ "QT_INSTALL_PREFIX/mkspecs/features]")
+
optparser.add_option('--qsci-libdir', '-o', dest='qsci_lib_dir',
type='string', default=None, action='callback',
callback=optparser_store_abspath_dir, metavar="DIR",
help="the directory containing the QScintilla library is DIR "
"[default: QT_INSTALL_LIBS]")
- optparser.add_option('--no-dll', '-s', dest='qsci_is_dll',
- default=None, action='store_false',
- help="QScintilla is a static library and not a Windows DLL")
-
optparser.add_option('--qsci-sipdir', '-v', dest='qsci_sip_dir',
type='string', default=None, action='callback',
callback=optparser_store_abspath_dir, metavar="DIR",
@@ -162,15 +170,15 @@ class ModuleConfiguration(object):
options are the parsed options.
"""
+ if options.qsci_features_dir is not None:
+ target_configuration.qsci_features_dir = options.qsci_features_dir
+
if options.qsci_inc_dir is not None:
target_configuration.qsci_inc_dir = options.qsci_inc_dir
if options.qsci_lib_dir is not None:
target_configuration.qsci_lib_dir = options.qsci_lib_dir
- if options.qsci_is_dll is not None:
- target_configuration.qsci_is_dll = options.qsci_is_dll
-
if options.qsci_sip_dir is not None:
target_configuration.qsci_sip_dir = options.qsci_sip_dir
else:
@@ -293,8 +301,8 @@ class ModuleConfiguration(object):
if target_configuration.qsci_lib_dir is not None:
qmake['LIBS'] = '-L%s' % quote(target_configuration.qsci_lib_dir)
- if target_configuration.qsci_is_dll:
- qmake['DEFINES'] = 'QSCINTILLA_DLL'
+ if target_configuration.qsci_features_dir is not None:
+ os.environ['QMAKEFEATURES'] = target_configuration.qsci_features_dir
return qmake
@@ -702,6 +710,7 @@ class _TargetConfiguration:
self.sip = self._find_exe('sip5', 'sip')
self.sip_version = None
self.sysroot = ''
+ self.stubs_dir = ''
self.prot_is_public = (self.py_platform.startswith('linux') or self.py_platform == 'darwin')
@@ -909,27 +918,6 @@ class _TargetConfiguration:
are the command line options.
"""
- try:
- qmake = opts.qmake
- except AttributeError:
- # Windows.
- qmake = None
-
- if qmake is not None:
- self.qmake = qmake
- elif self.qmake is None:
- # Under Windows qmake and the Qt DLLs must be on the system PATH
- # otherwise the dynamic linker won't be able to resolve the
- # symbols. On other systems we assume we can just run qmake by
- # using its full pathname.
- if sys.platform == 'win32':
- error("Make sure you have a working Qt qmake on your PATH.")
- else:
- error(
- "Make sure you have a working Qt qmake on your PATH "
- "or use the --qmake argument to explicitly specify a "
- "working Qt qmake.")
-
# Query qmake.
qt_config = _TargetQtConfiguration(self.qmake)
@@ -965,6 +953,18 @@ class _TargetConfiguration:
if opts.sysroot is not None:
self.sysroot = opts.sysroot
+ # Determine how to run qmake.
+ if opts.qmake is not None:
+ self.qmake = opts.qmake
+
+ if self.qmake is None:
+ error(
+ "Use the --qmake argument to explicitly specify a working "
+ "Qt qmake.")
+
+ if opts.qmakespec is not None:
+ self.qmake_spec = opts.qmakespec
+
if self.pyqt_package is not None:
try:
self.pyqt_package = opts.pyqt_package
@@ -992,6 +992,15 @@ class _TargetConfiguration:
self.pyqt_sip_dir = os.path.join(self.py_sip_dir,
self.pyqt_package)
+ if module_config.pep484_stub_file:
+ if opts.stubsdir is not None:
+ self.stubs_dir = opts.stubsdir
+
+ if opts.no_stubs:
+ self.stubs_dir = ''
+ elif self.stubs_dir == '':
+ self.stubs_dir = self.module_dir
+
if module_config.qscintilla_api_file:
if opts.apidir is not None:
self.api_dir = opts.apidir
@@ -1002,9 +1011,6 @@ class _TargetConfiguration:
if opts.destdir is not None:
self.module_dir = opts.destdir
- if opts.qmakespec is not None:
- self.qmake_spec = opts.qmakespec
-
if module_config.protected_is_public_is_supported:
if opts.prot_is_public is not None:
self.prot_is_public = opts.prot_is_public
@@ -1026,6 +1032,10 @@ class _TargetConfiguration:
path_dirs = os.environ.get('PATH', '').split(os.pathsep)
for exe in exes:
+ # Strip any surrounding quotes.
+ if exe.startswith('"') and exe.endswith('"'):
+ exe = exe[1:-1]
+
if sys.platform == 'win32':
exe = exe + '.exe'
@@ -1053,6 +1063,17 @@ def _create_optparser(target_config, module_config):
metavar="SPEC",
help="pass -spec SPEC to qmake [default: %s]" % "don't pass -spec" if target_config.qmake_spec == '' else target_config.qmake_spec)
+ if module_config.pep484_stub_file:
+ p.add_option('--stubsdir', dest='stubsdir', type='string',
+ default=None, action='callback',
+ callback=optparser_store_abspath, metavar="DIR",
+ help="the PEP 484 stub file will be installed in DIR "
+ "[default: with the module]")
+ p.add_option('--no-stubs', dest='no_stubs', default=False,
+ action='store_true',
+ help="disable the installation of the PEP 484 stub file "
+ "[default: enabled]")
+
if module_config.qscintilla_api_file:
p.add_option('--apidir', '-a', dest='apidir', type='string',
default=None, action='callback',
@@ -1099,12 +1120,11 @@ def _create_optparser(target_config, module_config):
default=None, action='store', metavar="FLAGS",
help="the sip flags used to build PyQt [default: query PyQt]")
- if sys.platform != 'win32':
- p.add_option('--qmake', '-q', dest='qmake', type='string',
- default=None, action='callback',
- callback=optparser_store_abspath_exe, metavar="FILE",
- help="the pathname of qmake is FILE [default: "
- "%s]" % (target_config.qmake or "None"))
+ p.add_option('--qmake', '-q', dest='qmake', type='string', default=None,
+ action='callback', callback=optparser_store_abspath_exe,
+ metavar="FILE",
+ help="the pathname of qmake is FILE [default: %s]" % (
+ target_config.qmake or "search PATH"))
p.add_option('--sip', dest='sip', type='string', default=None,
action='callback', callback=optparser_store_abspath_exe,
@@ -1191,6 +1211,10 @@ def _inform_user(target_config, module_config):
"The %s module is being built with 'protected' redefined as "
"'public'." % module_name)
+ if target_config.stubs_dir != '':
+ inform("The PEP 484 stub file will be installed in %s." %
+ target_config.stubs_dir)
+
if module_config.qscintilla_api_file and target_config.api_dir != '':
inform("The QScintilla API file will be installed in %s." %
os.path.join(target_config.api_dir, 'api', 'python'))
@@ -1223,12 +1247,17 @@ def _generate_code(target_config, opts, module_config):
# Add PyQt's .sip files to the search path.
argv.append('-I')
- argv.append(target_config.pyqt_sip_dir)
+ argv.append(quote(target_config.pyqt_sip_dir))
+
+ if target_config.stubs_dir != '':
+ # Generate the stub file.
+ argv.append('-y')
+ argv.append(quote(module_config.pep484_stub_file + '.pyi'))
if module_config.qscintilla_api_file and target_config.api_dir != '':
# Generate the API file.
argv.append('-a')
- argv.append(module_config.qscintilla_api_file + '.api')
+ argv.append(quote(module_config.qscintilla_api_file + '.api'))
if target_config.prot_is_public:
argv.append('-P');
@@ -1360,6 +1389,13 @@ target.path = %s
INSTALLS += target
''' % quote(target_config.module_dir))
+ if target_config.stubs_dir != '':
+ pro.write('''
+pep484_stubs.path = %s
+pep484_stubs.files = %s.pyi
+INSTALLS += pep484_stubs
+''' % (target_config.stubs_dir, module_config.pep484_stub_file))
+
if module_config.qscintilla_api_file and target_config.api_dir != '':
pro.write('''
api.path = %s/api/python
@@ -1572,7 +1608,7 @@ def _check_sip(target_config, module_config):
"Make sure you have a working sip on your PATH or use the "
"--sip argument to explicitly specify a working sip.")
- pipe = os.popen(' '.join([target_config.sip, '-V']))
+ pipe = os.popen(' '.join([quote(target_config.sip), '-V']))
for l in pipe:
version_str = l.strip()
@@ -1582,7 +1618,7 @@ def _check_sip(target_config, module_config):
pipe.close()
- if 'snapshot' not in version_str and 'preview' not in version_str:
+ if '.dev' not in version_str and 'snapshot' not in version_str:
version = version_from_string(version_str)
if version is None:
error(
diff --git a/Python/sip/qsciscintillabase.sip b/Python/sip/qsciscintillabase.sip
index 88b1c0a..6994ab6 100644
--- a/Python/sip/qsciscintillabase.sip
+++ b/Python/sip/qsciscintillabase.sip
@@ -1362,16 +1362,16 @@ while (i >= 0);
long SendScintilla(unsigned int msg, unsigned long wParam,
void *lParam) const;
long SendScintilla(unsigned int msg, unsigned long wParam,
- const char *lParam /DocType="Py_v3:bytes;str", Encoding="None"/) const;
+ const char *lParam /TypeHint="Py_v3:bytes;str", Encoding="None"/) const;
long SendScintilla(unsigned int msg,
- const char *lParam /DocType="Py_v3:bytes;str", Encoding="None"/); const
+ const char *lParam /TypeHint="Py_v3:bytes;str", Encoding="None"/); const
long SendScintilla(unsigned int msg,
- const char *wParam /DocType="Py_v3:bytes;str", Encoding="None"/,
- const char *lParam /DocType="Py_v3:bytes;str", Encoding="None"/) const;
+ const char *wParam /TypeHint="Py_v3:bytes;str", Encoding="None"/,
+ const char *lParam /TypeHint="Py_v3:bytes;str", Encoding="None"/) const;
long SendScintilla(unsigned int msg, long wParam) const;
//long SendScintilla(unsigned int msg, int wParam) const;
long SendScintilla(unsigned int msg, long cpMin, long cpMax,
- char *lpstrText /DocType="Py_v3:bytes;str", Encoding="None"/) const;
+ char *lpstrText /TypeHint="Py_v3:bytes;str", Encoding="None"/) const;
long SendScintilla(unsigned int msg, unsigned long wParam,
const QColor &col) const;
long SendScintilla(unsigned int msg, const QColor &col) const;
diff --git a/Qt4Qt5/Qsci/qsciglobal.h b/Qt4Qt5/Qsci/qsciglobal.h
index a94606f..dfa0f23 100644
--- a/Qt4Qt5/Qsci/qsciglobal.h
+++ b/Qt4Qt5/Qsci/qsciglobal.h
@@ -28,24 +28,18 @@ extern "C++" {
#include <qglobal.h>
-#define QSCINTILLA_VERSION 0x020901
-#define QSCINTILLA_VERSION_STR "2.9.1"
+#define QSCINTILLA_VERSION 0x020902
+#define QSCINTILLA_VERSION_STR "2.9.2"
-// Under Windows, define QSCINTILLA_MAKE_DLL to create a Scintilla DLL, or
-// define QSCINTILLA_DLL to link against a Scintilla DLL, or define neither
-// to either build or link against a static Scintilla library.
-#if defined(Q_OS_WIN)
-
+// Define QSCINTILLA_MAKE_DLL to create a QScintilla shared library, or
+// define QSCINTILLA_DLL to link against a QScintilla shared library, or define
+// neither to either build or link against a static QScintilla library.
#if defined(QSCINTILLA_DLL)
-#define QSCINTILLA_EXPORT __declspec(dllimport)
+#define QSCINTILLA_EXPORT Q_DECL_IMPORT
#elif defined(QSCINTILLA_MAKE_DLL)
-#define QSCINTILLA_EXPORT __declspec(dllexport)
-#endif
-
-#endif
-
-#if !defined(QSCINTILLA_EXPORT)
+#define QSCINTILLA_EXPORT Q_DECL_EXPORT
+#else
#define QSCINTILLA_EXPORT
#endif
diff --git a/Qt4Qt5/features/qscintilla2.prf b/Qt4Qt5/features/qscintilla2.prf
index e91e3be..1b12cdf 100644
--- a/Qt4Qt5/features/qscintilla2.prf
+++ b/Qt4Qt5/features/qscintilla2.prf
@@ -6,6 +6,8 @@ greaterThan(QT_MAJOR_VERSION, 4) {
}
}
+DEFINES += QSCINTILLA_DLL
+
INCLUDEPATH += $$[QT_INSTALL_HEADERS]
LIBS += -L$$[QT_INSTALL_LIBS]
diff --git a/Qt4Qt5/features/qscintilla2.prf b/Qt4Qt5/features_staticlib/qscintilla2.prf
similarity index 100%
copy from Qt4Qt5/features/qscintilla2.prf
copy to Qt4Qt5/features_staticlib/qscintilla2.prf
diff --git a/Qt4Qt5/qscintilla.pro b/Qt4Qt5/qscintilla.pro
index 66fea9b..775a1d5 100644
--- a/Qt4Qt5/qscintilla.pro
+++ b/Qt4Qt5/qscintilla.pro
@@ -24,7 +24,7 @@
TEMPLATE = lib
TARGET = qscintilla2
-CONFIG += qt warn_off release thread exceptions
+CONFIG += qt warn_off release thread exceptions hide_symbols
INCLUDEPATH += . ../include ../lexlib ../src
!CONFIG(staticlib) {
@@ -67,7 +67,11 @@ greaterThan(QT_MAJOR_VERSION, 4) {
} else {
features.path = $$[QT_INSTALL_DATA]/mkspecs/features
}
-features.files = $$PWD/features/qscintilla2.prf
+CONFIG(staticlib) {
+ features.files = $$PWD/features_staticlib/qscintilla2.prf
+} else {
+ features.files = $$PWD/features/qscintilla2.prf
+}
INSTALLS += features
HEADERS = \
diff --git a/doc/html-Qt4Qt5/annotated.html b/doc/html-Qt4Qt5/annotated.html
index 1af7912..033f9de 100644
--- a/doc/html-Qt4Qt5/annotated.html
+++ b/doc/html-Qt4Qt5/annotated.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9.1</span>
+ <span id="projectnumber">2.9.2</span>
</div>
</td>
</tr>
@@ -102,7 +102,7 @@
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Sat Oct 24 2015 14:00:39 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Mon Apr 18 2016 10:08:49 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciAPIs-members.html b/doc/html-Qt4Qt5/classQsciAPIs-members.html
index d54c1ff..4fc75f2 100644
--- a/doc/html-Qt4Qt5/classQsciAPIs-members.html
+++ b/doc/html-Qt4Qt5/classQsciAPIs-members.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9.1</span>
+ <span id="projectnumber">2.9.2</span>
</div>
</td>
</tr>
@@ -75,7 +75,7 @@
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Sat Oct 24 2015 14:00:38 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Mon Apr 18 2016 10:08:49 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciAPIs.html b/doc/html-Qt4Qt5/classQsciAPIs.html
index ce85689..b6d11f5 100644
--- a/doc/html-Qt4Qt5/classQsciAPIs.html
+++ b/doc/html-Qt4Qt5/classQsciAPIs.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9.1</span>
+ <span id="projectnumber">2.9.2</span>
</div>
</td>
</tr>
@@ -407,7 +407,7 @@ virtual </td><td class="memItemRight" valign="bottom"><a class="el" href="c
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Sat Oct 24 2015 14:00:38 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Mon Apr 18 2016 10:08:49 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciAbstractAPIs-members.html b/doc/html-Qt4Qt5/classQsciAbstractAPIs-members.html
index 0be5a4f..ae3eaff 100644
--- a/doc/html-Qt4Qt5/classQsciAbstractAPIs-members.html
+++ b/doc/html-Qt4Qt5/classQsciAbstractAPIs-members.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9.1</span>
+ <span id="projectnumber">2.9.2</span>
</div>
</td>
</tr>
@@ -58,7 +58,7 @@
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Sat Oct 24 2015 14:00:38 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Mon Apr 18 2016 10:08:49 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciAbstractAPIs.html b/doc/html-Qt4Qt5/classQsciAbstractAPIs.html
index 1b14512..f800ec1 100644
--- a/doc/html-Qt4Qt5/classQsciAbstractAPIs.html
+++ b/doc/html-Qt4Qt5/classQsciAbstractAPIs.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9.1</span>
+ <span id="projectnumber">2.9.2</span>
</div>
</td>
</tr>
@@ -212,7 +212,7 @@ virtual </td><td class="memItemRight" valign="bottom"><a class="el" href="c
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Sat Oct 24 2015 14:00:38 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Mon Apr 18 2016 10:08:49 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciCommand-members.html b/doc/html-Qt4Qt5/classQsciCommand-members.html
index b6dfd81..cec5768 100644
--- a/doc/html-Qt4Qt5/classQsciCommand-members.html
+++ b/doc/html-Qt4Qt5/classQsciCommand-members.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9.1</span>
+ <span id="projectnumber">2.9.2</span>
</div>
</td>
</tr>
@@ -159,7 +159,7 @@
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Sat Oct 24 2015 14:00:38 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Mon Apr 18 2016 10:08:49 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciCommand.html b/doc/html-Qt4Qt5/classQsciCommand.html
index 24c1130..25ab632 100644
--- a/doc/html-Qt4Qt5/classQsciCommand.html
+++ b/doc/html-Qt4Qt5/classQsciCommand.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9.1</span>
+ <span id="projectnumber">2.9.2</span>
</div>
</td>
</tr>
@@ -621,7 +621,7 @@ static bool </td><td class="memItemRight" valign="bottom"><a class="el" hre
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Sat Oct 24 2015 14:00:38 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Mon Apr 18 2016 10:08:49 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciCommandSet-members.html b/doc/html-Qt4Qt5/classQsciCommandSet-members.html
index 5b60832..4e250ee 100644
--- a/doc/html-Qt4Qt5/classQsciCommandSet-members.html
+++ b/doc/html-Qt4Qt5/classQsciCommandSet-members.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9.1</span>
+ <span id="projectnumber">2.9.2</span>
</div>
</td>
</tr>
@@ -59,7 +59,7 @@
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Sat Oct 24 2015 14:00:38 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Mon Apr 18 2016 10:08:49 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciCommandSet.html b/doc/html-Qt4Qt5/classQsciCommandSet.html
index ac97450..a1a9637 100644
--- a/doc/html-Qt4Qt5/classQsciCommandSet.html
+++ b/doc/html-Qt4Qt5/classQsciCommandSet.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9.1</span>
+ <span id="projectnumber">2.9.2</span>
</div>
</td>
</tr>
@@ -137,7 +137,7 @@ void </td><td class="memItemRight" valign="bottom"><a class="el" href="clas
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Sat Oct 24 2015 14:00:38 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Mon Apr 18 2016 10:08:49 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciDocument-members.html b/doc/html-Qt4Qt5/classQsciDocument-members.html
index 369f6a8..8b1e26c 100644
--- a/doc/html-Qt4Qt5/classQsciDocument-members.html
+++ b/doc/html-Qt4Qt5/classQsciDocument-members.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9.1</span>
+ <span id="projectnumber">2.9.2</span>
</div>
</td>
</tr>
@@ -56,7 +56,7 @@
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Sat Oct 24 2015 14:00:38 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Mon Apr 18 2016 10:08:49 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciDocument.html b/doc/html-Qt4Qt5/classQsciDocument.html
index a870a7c..76db134 100644
--- a/doc/html-Qt4Qt5/classQsciDocument.html
... 3831 lines suppressed ...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/qscintilla2.git
More information about the Python-modules-commits
mailing list