[prev in list] [next in list] [prev in thread] [next in thread]
List: calligra-devel
Subject: Re: Review Request 124630: Use DATA_INSTALL_DIR instead of INSTALL_PREFIX/share
From: "Boudewijn Rempt" <boud () valdyas ! org>
Date: 2015-08-10 13:39:48
Message-ID: 20150810133948.13071.10585 () mimi ! kde ! org
[Download RAW message or body]
--===============2870681328921098235==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
> On Aug. 10, 2015, 12:28 p.m., Friedrich W. H. Kossebau wrote:
> > krita/data/profiles/CMakeLists.txt, line 8
> > <https://git.reviewboard.kde.org/r/124630/diff/1/?file=390416#file390416line8>
> >
> > This is not a proper substitution:
> > `${DATA_INSTALL_DIR}` points to `share/apps`, while here the files should be \
> > installed to `share/color` (so with `color` on the same level as `apps`, like \
> > `icons`, `sounds` etc.
> > Which results in all files now installed in wrong location `share/apps/color`, \
> > instead of `share/color`.
> > So breaks things completely.
> >
> > Not sure what you are trying to fix exactly:
> > How does using `${DATA_INSTALL_DIR}` vs. `${CMAKE_INSTALL_PREFIX}` fix the \
> > mentioned problem? IIRC (well, just looked up again) `FindKDE4Internal.cmake` \
> > derives `DATA_INSTALL_DIR` from `${CMAKE_INSTALL_PREFIX}`.
>
> Heiko Becker wrote:
> Perhaps I was carried away by usage of ${DATA_INSTALL_DIR} everywhere else. Sorry \
> for that.
> And to answer the second question, it works because ${DATA_INSTALL_DIR} derives \
> from ${SHARE_INSTALL_PREFIX}, which itself indeed derives from \
> ${CMAKE_INSTALL_PREFIX}, but one can set it to a different location.
> `DESTINATION ${SHARE_INSTALL_PREFIX}/color/icc/krita` also looks like a correct \
> fix.
> Using the variables defined by ecm's KDEInstallDirs would even be a better fix, in \
> my opinion. But seeing that KDEInstallDirs is already included, I guess this isn't \
> done to keep the delta during porting as small as possible?
For now I've reverted the commit: the default profiles were not showing up for our \
testers. I'm fine with any patch that fixes that, of course :-)
- Boudewijn
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/124630/#review83653
-----------------------------------------------------------
On Aug. 5, 2015, 6:36 p.m., Heiko Becker wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/124630/
> -----------------------------------------------------------
>
> (Updated Aug. 5, 2015, 6:36 p.m.)
>
>
> Review request for Calligra.
>
>
> Repository: calligra
>
>
> Description
> -------
>
> Allowing to configure the install location, which is helpful with a
> multiarch layout, where prefix might be something like /usr/<arch> but
> arch independent data should be installed to /usr/share/...
>
>
> Diffs
> -----
>
> active/CMakeLists.txt 8fa0c6f1c04220f9178d0be1ea27b5c1428cd4d2
> krita/data/profiles/CMakeLists.txt a2a997b30aa159a36369e3825a1c8962597f07c4
> krita/data/profiles/elles-icc-profiles/CMakeLists.txt \
> f252e164e506f40780523a4a0b1b545257b64801
> Diff: https://git.reviewboard.kde.org/r/124630/diff/
>
>
> Testing
> -------
>
> Checked that the affected files get installed into the desired location.
>
>
> Thanks,
>
> Heiko Becker
>
>
--===============2870681328921098235==
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/124630/">https://git.reviewboard.kde.org/r/124630/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;"> <p style="margin-top: 0;">On August 10th, 2015, 12:28 p.m. UTC, <b>Friedrich \
W. H. Kossebau</b> wrote:</p> <blockquote style="margin-left: 1em; border-left: 2px \
solid #d0d0d0; padding-left: 10px;">
<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/124630/diff/1/?file=390416#file390416line8" \
style="color: black; font-weight: bold; text-decoration: \
underline;">krita/data/profiles/CMakeLists.txt</a> <span style="font-weight: \
normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">8</font></th> <td bgcolor="#fdfebc" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="s">DESTINATION</span> <span class="o">${</span><span class="nv"><span \
class="hl">CMAKE</span>_INSTALL_<span class="hl">PREFIX</span></span><span \
class="o"><span class="hl">}</span></span><span class="s"><span \
class="hl">/share</span>/color/icc/krita</span><span class="p">)</span></pre></td> \
<th bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">8</font></th> <td bgcolor="#fdfebc" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="s">DESTINATION</span> <span class="o">${</span><span class="nv"><span \
class="hl">DATA</span>_INSTALL_<span class="hl">DIR</span></span><span \
class="o"><span class="hl">}</span></span><span \
class="s">/color/icc/krita</span><span class="p">)</span></pre></td> </tr>
</tbody>
</table>
<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;">This \
is not a proper substitution: <code style="text-rendering: inherit;color: \
#4444cc;padding: 0;white-space: normal;margin: 0;line-height: \
inherit;">${DATA_INSTALL_DIR}</code> points to <code style="text-rendering: \
inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: \
inherit;">share/apps</code>, while here the files should be installed to <code \
style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: \
0;line-height: inherit;">share/color</code> (so with <code style="text-rendering: \
inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: \
inherit;">color</code> on the same level as <code style="text-rendering: \
inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: \
inherit;">apps</code>, like <code style="text-rendering: inherit;color: \
#4444cc;padding: 0;white-space: normal;margin: 0;line-height: inherit;">icons</code>, \
<code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: \
normal;margin: 0;line-height: in herit;">sounds</code> etc.</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">Which results in all files now installed in wrong \
location <code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: \
normal;margin: 0;line-height: inherit;">share/apps/color</code>, instead of <code \
style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: \
0;line-height: inherit;">share/color</code>.</p> <p style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: inherit;">So breaks things \
completely.</p> <p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">Not sure what you are trying to fix exactly: How does \
using <code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: \
normal;margin: 0;line-height: inherit;">${DATA_INSTALL_DIR}</code> vs. <code \
style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: \
0;line-height: inherit;">${CMAKE_INSTALL_PREFIX}</code> fix the mentioned problem? \
IIRC (well, just looked up again) <code style="text-rendering: inherit;color: \
#4444cc;padding: 0;white-space: normal;margin: 0;line-height: \
inherit;">FindKDE4Internal.cmake</code> derives <code style="text-rendering: \
inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: \
inherit;">DATA_INSTALL_DIR</code> from <code style="text-rendering: inherit;color: \
#4444cc;padding: 0;white-space: normal;margin: 0;line-height: \
inherit;">${CMAKE_INSTALL_PREFIX}</code>.</p></pre> </blockquote>
<p>On August 10th, 2015, 1:37 p.m. UTC, <b>Heiko Becker</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;"> <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;">Perhaps I was carried away by usage of ${DATA_INSTALL_DIR} everywhere else. \
Sorry for that.</p> <p style="padding: 0;text-rendering: inherit;margin: \
0;line-height: inherit;white-space: inherit;">And to answer the second question, it \
works because ${DATA_INSTALL_DIR} derives from ${SHARE_INSTALL_PREFIX}, which itself \
indeed derives from ${CMAKE_INSTALL_PREFIX}, but one can set it to a different \
location.</p> <p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;"><code style="text-rendering: inherit;color: \
#4444cc;padding: 0;white-space: normal;margin: 0;line-height: inherit;">DESTINATION \
${SHARE_INSTALL_PREFIX}/color/icc/krita</code> also looks like a correct fix.</p> <p \
style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
inherit;">Using the variables defined by ecm's KDEInstallDirs would even be a better \
fix, in my opinion. But seeing that KDEInstallDirs is already included, I guess this \
isn't done to keep the delta during porting as small as possible?</p></pre> \
</blockquote>
</blockquote>
<pre style="margin-left: 1em; 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;">For now I've reverted the commit: the default profiles were not showing up \
for our testers. I'm fine with any patch that fixes that, of course :-)</p></pre> <br \
/>
<p>- Boudewijn</p>
<br />
<p>On August 5th, 2015, 6:36 p.m. UTC, Heiko Becker 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 Calligra.</div>
<div>By Heiko Becker.</div>
<p style="color: grey;"><i>Updated Aug. 5, 2015, 6:36 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
calligra
</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;">Allowing to configure the install location, which is helpful with a \
multiarch layout, where prefix might be something like /usr/<arch> but arch \
independent data should be installed to /usr/share/...</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;">Checked that the affected files get installed into the desired \
location.</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>active/CMakeLists.txt <span style="color: \
grey">(8fa0c6f1c04220f9178d0be1ea27b5c1428cd4d2)</span></li>
<li>krita/data/profiles/CMakeLists.txt <span style="color: \
grey">(a2a997b30aa159a36369e3825a1c8962597f07c4)</span></li>
<li>krita/data/profiles/elles-icc-profiles/CMakeLists.txt <span style="color: \
grey">(f252e164e506f40780523a4a0b1b545257b64801)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/124630/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
--===============2870681328921098235==--
[Attachment #3 (text/plain)]
_______________________________________________
calligra-devel mailing list
calligra-devel@kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic