Review Request 109082: Separate files for the app into own subdir "app/" for Stage and Words

[Boudewijn Rempt]

> On Feb. 22, 2013, 8:44 a.m., Inge Wallin wrote:
> > While I love this split in principle I can't help but wonder about what will happen with the branches that we have active now.  Will there be massive conflicts and merge problems in the annotations branch?  Or will the merge be smooth and effortless.  Maybe the change itself could wait until we have reached a milestone with the annotations and then we can do this change and start a new branch. I'm not sure here.

I doubt that it will make a lot of difference -- this is about code that hardly any branch touches. The other patch, with the change into build capabilities will be a problem  when merging krita sketch back, but I am sure that will be doable, too. There are many conflicts with master anyway for that branch.


- Boudewijn


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/109082/#review27883
-----------------------------------------------------------


On Feb. 21, 2013, 7:49 p.m., Friedrich W. H. Kossebau wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/109082/
> -----------------------------------------------------------
> 
> (Updated Feb. 21, 2013, 7:49 p.m.)
> 
> 
> Review request for Calligra, C. Boemann and Thorsten Zachmann.
> 
> 
> Description
> -------
> 
> Splitting out the app-related files from the part/ directory makes the sources easier to grasp (should also help beginners with Calligra code). And it also results in having the complete sources for the product "Stage executable" and "Words executable" in a separate dir structure, so decision about building it or not is not some if-defed longer span in a CMakeLists.txt file (of part/), but instead can be done in simply-to-overlook lines in the dir level above, like
> --- 8< ---
> if (SHOULD_BUILD_WORDS_APP)
>     add_subdirectory( app )
> endif (SHOULD_BUILD_WORDS_APP)
> --- 8< ---
> 
> In preparation for https://git.reviewboard.kde.org/r/109071/ which currently also includes this changes.
> 
> Possibly should be done for all programs which have such a part/ dir and still include the app-related files there. But for now only Sheets, Stage and Words are to be separated in two products each, the core/part (also used by CalligraActive) and the executable (not needed with CalligraActive).
> 
> 
> Diffs
> -----
> 
>   words/app/main.cpp PRE-CREATION 
>   words/app/words.desktop PRE-CREATION 
>   words/part/CMakeLists.txt 56b8c6f 
>   words/part/Info.plist.template 97e1728 
>   words/part/main.cpp 875eb5d 
>   words/part/words.desktop 35bc4c3 
>   stage/app/stage.desktop PRE-CREATION 
>   stage/part/CMakeLists.txt de57a0f 
>   stage/part/Info.plist.template 857a8d7 
>   stage/part/main.cpp 5ef9509 
>   stage/part/stage.desktop 447858f 
>   words/CMakeLists.txt e6336a2 
>   words/Messages.sh 3f2c3d2 
>   words/app/CMakeLists.txt PRE-CREATION 
>   words/app/Info.plist.template PRE-CREATION 
>   stage/CMakeLists.txt 94dd31c 
>   stage/app/CMakeLists.txt PRE-CREATION 
>   stage/app/Info.plist.template PRE-CREATION 
>   stage/app/main.cpp PRE-CREATION 
> 
> Diff: http://git.reviewboard.kde.org/r/109082/diff/
> 
> 
> Testing
> -------
> 
> 
> Thanks,
> 
> Friedrich W. H. Kossebau
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/calligra-devel/attachments/20130222/be47a4f2/attachment.htm>