[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-core-devel
Subject: Re: Review Request 126413: FindPyKDE4: Make PYKDE4_INSTALL_PYTHON_FILES use PYTHON_INSTALL.
From: "Raphael Kubo da Costa" <rakuco () FreeBSD ! org>
Date: 2015-12-18 13:02:40
Message-ID: 20151218130240.5237.89585 () mimi ! kde ! org
[Download RAW message or body]
--===============4938863607071245844==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/126413/
-----------------------------------------------------------
(Updated Dec. 18, 2015, 1:02 p.m.)
Status
------
This change has been marked as submitted.
Review request for Build System, kdelibs, Alex Merry, and Luca Beltrame.
Changes
-------
Submitted with commit 016841aeb0b180981122085e9b1d49ae66951670 by Raphael Kubo da \
Costa to branch KDE/4.14.
Repository: kdelibs
Description
-------
Review Request 126345 ("PythonMacros: specify destination directory in byte-compiled \
files") broke Kajongg's build because it uses the `PYKDE4_INSTALL_PYTHON_FILES()` \
macro, whose use of `PythonCompile.py` had not been updated.
Instead of just passing `--destination-dir` in `FindPyKDE4.cmake`, rewrite the \
`PYKDE4_INSTALL_PYTHON_FILES()` macro to use PythonMacros's `PYTHON_INSTALL()`. Not \
only does this fix Kajongg's build, but it also removes a lot of code duplication and \
makes `PYKDE4_INSTALL_PYTHON_FILES()` work with Python 3.2+'s different .pyc \
location.
Diffs
-----
cmake/modules/FindPyKDE4.cmake 3b87963
Diff: https://git.reviewboard.kde.org/r/126413/diff/
Testing
-------
Kajongg builds again. According to LXR `FindPyKDE4.cmake` and `PythonMacros.py` are \
the only two places invoking `PythonCompile.py`, so all callers should work now.
Thanks,
Raphael Kubo da Costa
--===============4938863607071245844==
MIME-Version: 1.0
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 7bit
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="12" style="border: 1px #c9c399 \
solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;"> \
<tr> <td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/126413/">https://git.reviewboard.kde.org/r/126413/</a>
</td>
</tr>
</table>
<br />
<table bgcolor="#e0e0e0" width="100%" cellpadding="12" style="border: 1px gray solid; \
border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;"> <tr>
<td>
<h1 style="margin: 0; padding: 0; font-size: 10pt;">This change has been marked as \
submitted.</h1> </td>
</tr>
</table>
<br />
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="12" style="border: \
1px #888a85 solid; border-radius: 6px; -moz-border-radius: 6px; \
-webkit-border-radius: 6px;"> <tr>
<td>
<div>Review request for Build System, kdelibs, Alex Merry, and Luca Beltrame.</div>
<div>By Raphael Kubo da Costa.</div>
<p style="color: grey;"><i>Updated Dec. 18, 2015, 1:02 p.m.</i></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Changes</h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">Submitted with commit 016841aeb0b180981122085e9b1d49ae66951670 by \
Raphael Kubo da Costa to branch KDE/4.14.</pre> </td>
</tr>
</table>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
kdelibs
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" \
style="border: 1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">Review Request 126345 ("PythonMacros: specify \
destination directory in byte-compiled files") broke Kajongg's build because it uses \
the <code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: \
normal;margin: 0;line-height: inherit;">PYKDE4_INSTALL_PYTHON_FILES()</code> macro, \
whose use of <code style="text-rendering: inherit;color: #4444cc;padding: \
0;white-space: normal;margin: 0;line-height: inherit;">PythonCompile.py</code> had \
not been updated.</p> <p style="padding: 0;text-rendering: inherit;margin: \
0;line-height: inherit;white-space: inherit;">Instead of just passing <code \
style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: \
0;line-height: inherit;">--destination-dir</code> in <code style="text-rendering: \
inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: \
inherit;">FindPyKDE4.cmake</code>, rewrite the <code style="text-rendering: \
inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: \
inherit;">PYKDE4_INSTALL_PYTHON_FILES()</code> macro to use PythonMacros's <code \
style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: \
0;line-height: inherit;">PYTHON_INSTALL()</code>. Not only does this fix Kajongg's \
build, but it also removes a lot of code duplication and makes <code \
style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: \
0;line-height: inherit;">PYKDE4_INSTALL_PYTHON_FILES()</code> work wi th Python \
3.2+'s different .pyc location.</p></pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">Kajongg builds again. According to LXR <code \
style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: \
0;line-height: inherit;">FindPyKDE4.cmake</code> and <code style="text-rendering: \
inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: \
inherit;">PythonMacros.py</code> are the only two places invoking <code \
style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: \
0;line-height: inherit;">PythonCompile.py</code>, so all callers should work \
now.</p></pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>cmake/modules/FindPyKDE4.cmake <span style="color: grey">(3b87963)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/126413/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
--===============4938863607071245844==--
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic