[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-frameworks-devel
Subject: Re: Review Request 126618: Make CMake macro kcoreaddons_desktop_to_json() work on windows.
From: Alex Richardson <arichardson.kde () gmail ! com>
Date: 2016-03-08 21:57:17
Message-ID: 20160308215717.6298.26648 () mimi ! kde ! org
[Download RAW message or body]
--===============4620780300202307264==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/126618/#review93315
-----------------------------------------------------------
+1
Another solution would be to have a config-desktopfileparser.h.cmake with `#define \
KDE_INSTALL_KSERVICETYPES5DIR @KDE_INSTALL_KSERVICETYPES5DIR@` and then check `if \
QFile::exists(KDE_INSTALL_KSERVICETYPES5DIR + path)` before checking \
applicationDirPath. But that can be done in a separate commit.
KF5CoreAddonsMacros.cmake (line 54)
<https://git.reviewboard.kde.org/r/126618/#comment63632>
Use KDE_INSTALL_FULL_KSERVICETYPES5DIR instead of prepending CMAKE_INSTALL_PREFIX \
to the relative path.
- Alex Richardson
On March 8, 2016, 8:35 p.m., Kåre Särs wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/126618/
> -----------------------------------------------------------
>
> (Updated March 8, 2016, 8:35 p.m.)
>
>
> Review request for KDE Frameworks.
>
>
> Repository: kcoreaddons
>
>
> Description
> -------
>
> Without this patch kcoreaddons_desktop_to_json() will not find the service type \
> destop file.
> On windows GenericDataLocation returns "C:/Users/<USER>/AppData/Local" or \
> "C:/ProgramData". That is not a path that contains any destop files ;)
> This patch adds KDE_INSTALL_KSERVICETYPES5DIR as fist item in the search paths and \
> if not found searches like before and adds ../share/ if the previous searches do \
> not return a match.
>
> Diffs
> -----
>
> KF5CoreAddonsMacros.cmake 5d8e3d4
> src/lib/plugin/desktopfileparser.cpp 319d29f
>
> Diff: https://git.reviewboard.kde.org/r/126618/diff/
>
>
> Testing
> -------
>
> KTextEditor compiles on windows
>
>
> Thanks,
>
> Kåre Särs
>
>
--===============4620780300202307264==
MIME-Version: 1.0
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 8bit
<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/126618/">https://git.reviewboard.kde.org/r/126618/</a>
</td>
</tr>
</table>
<br />
<pre style="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;">+1</p> <p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">Another solution would be to have a \
config-desktopfileparser.h.cmake with <code style="text-rendering: inherit;color: \
#4444cc;padding: 0;white-space: normal;margin: 0;line-height: inherit;">#define \
KDE_INSTALL_KSERVICETYPES5DIR @KDE_INSTALL_KSERVICETYPES5DIR@</code> and then check \
<code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: \
normal;margin: 0;line-height: inherit;">if \
QFile::exists(KDE_INSTALL_KSERVICETYPES5DIR + path)</code> before checking \
applicationDirPath. But that can be done in a separate commit.</p></pre> <br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="https://git.reviewboard.kde.org/r/126618/diff/3/?file=448502#file448502line54" \
style="color: black; font-weight: bold; text-decoration: \
underline;">KF5CoreAddonsMacros.cmake</a> <span style="font-weight: normal;">
(Diff revision 3)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">54</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="nb">if</span> <span class="p">(</span><span class="s">EXISTS</span> <span \
class="o">${</span><span class="nv">CMAKE_INSTALL_PREFIX</span><span \
class="o">}</span><span class="s">/</span><span class="o">${</span><span \
class="nv">KDE_INSTALL_KSERVICETYPES5DIR</span><span class="o">}</span><span \
class="s">/</span><span class="o">${</span><span class="nv">type</span><span \
class="o">}</span><span class="p">)</span></pre></td> </tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<pre style="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;">Use \
KDE_INSTALL_FULL_KSERVICETYPES5DIR instead of prepending CMAKE_INSTALL_PREFIX to the \
relative path.</p></pre> </div>
</div>
<br />
<p>- Alex Richardson</p>
<br />
<p>On March 8th, 2016, 8:35 p.m. GMT, Kåre Särs wrote:</p>
<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 KDE Frameworks.</div>
<div>By Kåre Särs.</div>
<p style="color: grey;"><i>Updated March 8, 2016, 8:35 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
kcoreaddons
</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;">Without this patch kcoreaddons_desktop_to_json() will not find the \
service type destop file.
On windows GenericDataLocation returns \
"C:/Users/<USER>/AppData/Local" or "C:/ProgramData". That \
is not a path that contains any destop files ;)
This patch adds KDE_INSTALL_KSERVICETYPES5DIR as fist item in the search paths and if \
not found searches like before and adds ../share/ if the previous searches do not \
return a match.</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;">KTextEditor compiles on windows</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>KF5CoreAddonsMacros.cmake <span style="color: grey">(5d8e3d4)</span></li>
<li>src/lib/plugin/desktopfileparser.cpp <span style="color: \
grey">(319d29f)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/126618/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
--===============4620780300202307264==--
[Attachment #3 (text/plain)]
_______________________________________________
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic