Re: Review Request 127911: Add a CMake option to build binary Qt resource out of icons dir.

2016-06-01 Thread Gleb Popov


> On May 15, 2016, 8:03 p.m., Kåre Särs wrote:
> > Looks good :) A couple of questions:
> > 
> > - If we create the .rcc do we also want to install the icons?
> > - I creates a similar solution for Kate on Windows (in a separate repo), 
> > but I needed to add a program to replace the symlinked files with aliases 
> > in the .qrc as symlinks do not work properly on windows. Are you interested 
> > in adding a similar program/script/... to do the same directly in 
> > breeze-icons.git? My application is in 
> > git://anongit.kde.org/scratch/sars/kate-windows.git (icon-rcc)
> 
> Gleb Popov wrote:
> > If we create the .rcc do we also want to install the icons?
> 
> No idea, to be honest.
> 
> > I creates a similar solution for Kate on Windows (in a separate repo), 
> but I needed to add a program to replace the symlinked files with aliases in 
> the .qrc as symlinks do not work properly on windows
> 
> Sorry, what symlinks? I saw some symlinks stuff in autotests, but didn't 
> get what it is all about.
> 
> Kåre Särs wrote:
> Quite a lot of icons in breeze-icons are just symbolic links to other 
> icons in the repository. On Linux/OSX/Android/... this is not a problem, but 
> on Windows, where you don't have proper symbolic links, git just creates a 
> text file with the path to the target file. With those text files you just 
> don't get an icon :( So my solution was to create an application to modify 
> the .qrc file add an alias to the target file in stead of using the symbolic 
> link file directly.
> 
> Don't let this comment be in the way of committing this RR :)

I've got an idea how to handle symlinked files. First, run

git ls-files -s

and get a list of symlinked files (mode 12), then read their contents, find 
out the real file, and overwrite symlink with it.
Finally, run

git update-index --assume-unchanged

for each updated symlink and here we go.

This can be implemented as CMake script, the only question is when to run it? 
As part of CMake configuration step, or let it be a part of a target?
What do you think about this?


- Gleb


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


On May 17, 2016, 11:28 a.m., Gleb Popov wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/127911/
> ---
> 
> (Updated May 17, 2016, 11:28 a.m.)
> 
> 
> Review request for KDE Frameworks.
> 
> 
> Repository: breeze-icons
> 
> 
> Description
> ---
> 
> I copied icons into the binary dir, because i haven't found a way to generate 
> rcc without polluting source dir.
> 
> Not sure if installation dir is right, too.
> 
> 
> Diffs
> -
> 
>   CMakeLists.txt 2147705 
>   icons-dark/CMakeLists.txt 36d37f1 
>   icons/CMakeLists.txt 5ded49c 
> 
> Diff: https://git.reviewboard.kde.org/r/127911/diff/
> 
> 
> Testing
> ---
> 
> 
> Thanks,
> 
> Gleb Popov
> 
>

___
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel


Re: Review Request 127911: Add a CMake option to build binary Qt resource out of icons dir.

2016-05-17 Thread Gleb Popov

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

(Updated May 17, 2016, 11:28 a.m.)


Status
--

This change has been marked as submitted.


Review request for KDE Frameworks.


Changes
---

Submitted with commit 9948305e18b00bd282aa16a7d8e29dcd9622c29d by Gleb Popov to 
branch master.


Repository: breeze-icons


Description
---

I copied icons into the binary dir, because i haven't found a way to generate 
rcc without polluting source dir.

Not sure if installation dir is right, too.


Diffs
-

  CMakeLists.txt 2147705 
  icons-dark/CMakeLists.txt 36d37f1 
  icons/CMakeLists.txt 5ded49c 

Diff: https://git.reviewboard.kde.org/r/127911/diff/


Testing
---


Thanks,

Gleb Popov

___
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel


Re: Review Request 127911: Add a CMake option to build binary Qt resource out of icons dir.

2016-05-17 Thread Kevin Funk

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


Ship it!




Ship It!

- Kevin Funk


On May 17, 2016, 5:55 a.m., Gleb Popov wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/127911/
> ---
> 
> (Updated May 17, 2016, 5:55 a.m.)
> 
> 
> Review request for KDE Frameworks.
> 
> 
> Repository: breeze-icons
> 
> 
> Description
> ---
> 
> I copied icons into the binary dir, because i haven't found a way to generate 
> rcc without polluting source dir.
> 
> Not sure if installation dir is right, too.
> 
> 
> Diffs
> -
> 
>   CMakeLists.txt 2147705 
>   icons-dark/CMakeLists.txt 36d37f1 
>   icons/CMakeLists.txt 5ded49c 
> 
> Diff: https://git.reviewboard.kde.org/r/127911/diff/
> 
> 
> Testing
> ---
> 
> 
> Thanks,
> 
> Gleb Popov
> 
>

___
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel


Re: Review Request 127911: Add a CMake option to build binary Qt resource out of icons dir.

2016-05-16 Thread Gleb Popov

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

(Updated May 17, 2016, 8:55 a.m.)


Review request for KDE Frameworks.


Changes
---

Address comments.


Repository: breeze-icons


Description
---

I copied icons into the binary dir, because i haven't found a way to generate 
rcc without polluting source dir.

Not sure if installation dir is right, too.


Diffs (updated)
-

  CMakeLists.txt 2147705 
  icons-dark/CMakeLists.txt 36d37f1 
  icons/CMakeLists.txt 5ded49c 

Diff: https://git.reviewboard.kde.org/r/127911/diff/


Testing
---


Thanks,

Gleb Popov

___
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel


Re: Review Request 127911: Add a CMake option to build binary Qt resource out of icons dir.

2016-05-16 Thread Kevin Funk

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




CMakeLists.txt (line 24)


Rename: Use a verb -- rename to `add_binary_resource`, or 
`generate_binary_resource`

Params: `ret` -> `out`, or `outfile`



CMakeLists.txt (line 29)


This action should be deferred as well. See next comment.



CMakeLists.txt (line 32)


`cmake -E make_directory` first?


- Kevin Funk


On May 16, 2016, 6:21 a.m., Gleb Popov wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/127911/
> ---
> 
> (Updated May 16, 2016, 6:21 a.m.)
> 
> 
> Review request for KDE Frameworks.
> 
> 
> Repository: breeze-icons
> 
> 
> Description
> ---
> 
> I copied icons into the binary dir, because i haven't found a way to generate 
> rcc without polluting source dir.
> 
> Not sure if installation dir is right, too.
> 
> 
> Diffs
> -
> 
>   CMakeLists.txt 2147705 
>   icons-dark/CMakeLists.txt 36d37f1 
>   icons/CMakeLists.txt 5ded49c 
> 
> Diff: https://git.reviewboard.kde.org/r/127911/diff/
> 
> 
> Testing
> ---
> 
> 
> Thanks,
> 
> Gleb Popov
> 
>

___
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel


Re: Review Request 127911: Add a CMake option to build binary Qt resource out of icons dir.

2016-05-16 Thread Kåre Särs


> On May 15, 2016, 5:03 p.m., Kåre Särs wrote:
> > Looks good :) A couple of questions:
> > 
> > - If we create the .rcc do we also want to install the icons?
> > - I creates a similar solution for Kate on Windows (in a separate repo), 
> > but I needed to add a program to replace the symlinked files with aliases 
> > in the .qrc as symlinks do not work properly on windows. Are you interested 
> > in adding a similar program/script/... to do the same directly in 
> > breeze-icons.git? My application is in 
> > git://anongit.kde.org/scratch/sars/kate-windows.git (icon-rcc)
> 
> Gleb Popov wrote:
> > If we create the .rcc do we also want to install the icons?
> 
> No idea, to be honest.
> 
> > I creates a similar solution for Kate on Windows (in a separate repo), 
> but I needed to add a program to replace the symlinked files with aliases in 
> the .qrc as symlinks do not work properly on windows
> 
> Sorry, what symlinks? I saw some symlinks stuff in autotests, but didn't 
> get what it is all about.

Quite a lot of icons in breeze-icons are just symbolic links to other icons in 
the repository. On Linux/OSX/Android/... this is not a problem, but on Windows, 
where you don't have proper symbolic links, git just creates a text file with 
the path to the target file. With those text files you just don't get an icon 
:( So my solution was to create an application to modify the .qrc file add an 
alias to the target file in stead of using the symbolic link file directly.

Don't let this comment be in the way of committing this RR :)


- Kåre


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


On May 16, 2016, 6:21 a.m., Gleb Popov wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/127911/
> ---
> 
> (Updated May 16, 2016, 6:21 a.m.)
> 
> 
> Review request for KDE Frameworks.
> 
> 
> Repository: breeze-icons
> 
> 
> Description
> ---
> 
> I copied icons into the binary dir, because i haven't found a way to generate 
> rcc without polluting source dir.
> 
> Not sure if installation dir is right, too.
> 
> 
> Diffs
> -
> 
>   CMakeLists.txt 2147705 
>   icons-dark/CMakeLists.txt 36d37f1 
>   icons/CMakeLists.txt 5ded49c 
> 
> Diff: https://git.reviewboard.kde.org/r/127911/diff/
> 
> 
> Testing
> ---
> 
> 
> Thanks,
> 
> Gleb Popov
> 
>

___
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel


Re: Review Request 127911: Add a CMake option to build binary Qt resource out of icons dir.

2016-05-15 Thread Gleb Popov

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

(Updated May 16, 2016, 9:21 a.m.)


Review request for KDE Frameworks.


Changes
---

Change the option default to `OFF`.


Repository: breeze-icons


Description
---

I copied icons into the binary dir, because i haven't found a way to generate 
rcc without polluting source dir.

Not sure if installation dir is right, too.


Diffs (updated)
-

  CMakeLists.txt 2147705 
  icons-dark/CMakeLists.txt 36d37f1 
  icons/CMakeLists.txt 5ded49c 

Diff: https://git.reviewboard.kde.org/r/127911/diff/


Testing
---


Thanks,

Gleb Popov

___
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel


Re: Review Request 127911: Add a CMake option to build binary Qt resource out of icons dir.

2016-05-15 Thread Gleb Popov


> On May 15, 2016, 8:03 p.m., Kåre Särs wrote:
> > Looks good :) A couple of questions:
> > 
> > - If we create the .rcc do we also want to install the icons?
> > - I creates a similar solution for Kate on Windows (in a separate repo), 
> > but I needed to add a program to replace the symlinked files with aliases 
> > in the .qrc as symlinks do not work properly on windows. Are you interested 
> > in adding a similar program/script/... to do the same directly in 
> > breeze-icons.git? My application is in 
> > git://anongit.kde.org/scratch/sars/kate-windows.git (icon-rcc)

> If we create the .rcc do we also want to install the icons?

No idea, to be honest.

> I creates a similar solution for Kate on Windows (in a separate repo), but I 
> needed to add a program to replace the symlinked files with aliases in the 
> .qrc as symlinks do not work properly on windows

Sorry, what symlinks? I saw some symlinks stuff in autotests, but didn't get 
what it is all about.


- Gleb


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


On May 16, 2016, 9:21 a.m., Gleb Popov wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/127911/
> ---
> 
> (Updated May 16, 2016, 9:21 a.m.)
> 
> 
> Review request for KDE Frameworks.
> 
> 
> Repository: breeze-icons
> 
> 
> Description
> ---
> 
> I copied icons into the binary dir, because i haven't found a way to generate 
> rcc without polluting source dir.
> 
> Not sure if installation dir is right, too.
> 
> 
> Diffs
> -
> 
>   CMakeLists.txt 2147705 
>   icons-dark/CMakeLists.txt 36d37f1 
>   icons/CMakeLists.txt 5ded49c 
> 
> Diff: https://git.reviewboard.kde.org/r/127911/diff/
> 
> 
> Testing
> ---
> 
> 
> Thanks,
> 
> Gleb Popov
> 
>

___
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel


Re: Review Request 127911: Add a CMake option to build binary Qt resource out of icons dir.

2016-05-15 Thread Gleb Popov

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

(Updated May 16, 2016, 9:16 a.m.)


Review request for KDE Frameworks.


Changes
---

Make a function out of the code and use it on both icons/ and icons-dark/


Repository: breeze-icons


Description
---

I copied icons into the binary dir, because i haven't found a way to generate 
rcc without polluting source dir.

Not sure if installation dir is right, too.


Diffs (updated)
-

  icons/CMakeLists.txt 5ded49c 

Diff: https://git.reviewboard.kde.org/r/127911/diff/


Testing
---


Thanks,

Gleb Popov

___
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel


Re: Review Request 127911: Add a CMake option to build binary Qt resource out of icons dir.

2016-05-15 Thread Kåre Särs

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



Looks good :) A couple of questions:

- If we create the .rcc do we also want to install the icons?
- I creates a similar solution for Kate on Windows (in a separate repo), but I 
needed to add a program to replace the symlinked files with aliases in the .qrc 
as symlinks do not work properly on windows. Are you interested in adding a 
similar program/script/... to do the same directly in breeze-icons.git? My 
application is in git://anongit.kde.org/scratch/sars/kate-windows.git (icon-rcc)

- Kåre Särs


On May 14, 2016, 8:27 a.m., Gleb Popov wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/127911/
> ---
> 
> (Updated May 14, 2016, 8:27 a.m.)
> 
> 
> Review request for KDE Frameworks.
> 
> 
> Repository: breeze-icons
> 
> 
> Description
> ---
> 
> I copied icons into the binary dir, because i haven't found a way to generate 
> rcc without polluting source dir.
> 
> Not sure if installation dir is right, too.
> 
> 
> Diffs
> -
> 
>   icons/CMakeLists.txt 5ded49c 
> 
> Diff: https://git.reviewboard.kde.org/r/127911/diff/
> 
> 
> Testing
> ---
> 
> 
> Thanks,
> 
> Gleb Popov
> 
>

___
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel


Re: Review Request 127911: Add a CMake option to build binary Qt resource out of icons dir.

2016-05-15 Thread Aleix Pol Gonzalez

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



Looks good to me. +1


icons/CMakeLists.txt (line 27)


Trailing spaces!


- Aleix Pol Gonzalez


On May 14, 2016, 10:27 a.m., Gleb Popov wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/127911/
> ---
> 
> (Updated May 14, 2016, 10:27 a.m.)
> 
> 
> Review request for KDE Frameworks.
> 
> 
> Repository: breeze-icons
> 
> 
> Description
> ---
> 
> I copied icons into the binary dir, because i haven't found a way to generate 
> rcc without polluting source dir.
> 
> Not sure if installation dir is right, too.
> 
> 
> Diffs
> -
> 
>   icons/CMakeLists.txt 5ded49c 
> 
> Diff: https://git.reviewboard.kde.org/r/127911/diff/
> 
> 
> Testing
> ---
> 
> 
> Thanks,
> 
> Gleb Popov
> 
>

___
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel


Review Request 127911: Add a CMake option to build binary Qt resource out of icons dir.

2016-05-14 Thread Gleb Popov

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

Review request for KDE Frameworks.


Repository: breeze-icons


Description
---

I copied icons into the binary dir, because i haven't found a way to generate 
rcc without polluting source dir.

Not sure if installation dir is right, too.


Diffs
-

  icons/CMakeLists.txt 5ded49c 

Diff: https://git.reviewboard.kde.org/r/127911/diff/


Testing
---


Thanks,

Gleb Popov

___
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel