[Kde-bindings] Review Request 119453: Support PyQt installations without pyqtconfig.py.

[Luca Beltrame]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/119453/#review63255
-----------------------------------------------------------

Ship it!


Ship It!

- Luca Beltrame


On Lug. 24, 2014, 11:38 a.m., Raphael Kubo da Costa wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/119453/
> -----------------------------------------------------------
> 
> (Updated Lug. 24, 2014, 11:38 a.m.)
> 
> 
> Review request for KDE Bindings, Scott Kitterman, Luca Beltrame, Andrea Scarpino, and Simon Edwards.
> 
> 
> Bugs: 327633
>     http://bugs.kde.org/show_bug.cgi?id=327633
> 
> 
> Repository: pykde4
> 
> 
> Description
> -------
> 
> PyQt's pyqtconfig was deprecated in version 4.10, and is not installed
> if PyQt's new build system is used.
> 
> PyKDE itself provides a pykdeconfig module that inherits from pyqtconfig
> and allows users of the SIP build system to obtain information about how
> PyKDE was configured and generate Makefiles from it. It is also used by
> kdelibs's FindPyKDE4.cmake for the same purposes.
> 
> Even though the information provided by PyKDE exists regardless of
> pyqtconfig, insisting on pykdeconfig goes against the design of PyQt's
> new build system.
> 
> Instead, we now do something similar to PyQt itself: while it provides a
> PYQT_CONFIGURATION dict with (at the moment) a single key with the SIP
> flags used to build PyQt, we provide PyKDE4.kdecore.PYKDE_CONFIGURATION,
> a dict containing the SIP flags used to build PyKDE and, in addition to
> that, the directory where PyKDE's SIP files have been installed. This
> new dict exists regardless of how PyQt was built.
> 
> Finally, this commit does not remove pykdeconfig.py, but rather makes
> its installation depend on whether pyqtconfig.py has been found at
> configuration time.
> 
> 
> Diffs
> -----
> 
>   CMakeLists.txt 5233da8d94b4bbbbb72a2594c692db9022628f23 
>   PyKDEConfigurationInformation.cmake PRE-CREATION 
>   sip/kdecore/kdecoremod.sip 05b5baceb8e98a49af4a1e84c59698f84a4daf48 
>   sip/kdecore/pykde_config.sip.in PRE-CREATION 
> 
> Diff: https://git.reviewboard.kde.org/r/119453/diff/
> 
> 
> Testing
> -------
> 
> PyKDE built fine without pyqtconfig, and with my fix to FindPyKDE4.cmake (#119454) Kate's Pate plugin works fine without neither pyqtconfig nor pykdeconfig present.
> 
> 
> Thanks,
> 
> Raphael Kubo da Costa
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-bindings/attachments/20140727/cad6372b/attachment.html>