D11642: Fix the rcc binary package generation

bcooksley added a comment. This change cannot handle spaces in the path, which causes all CI builds involving RCC generation which have received this updated code to fail. https://build.kde.org/job/Plasma%20plasma-pa%20kf5-qt5%20FreeBSDQt5.9/21/consoleText REPOSITORY R290 KPackage

D11642: Fix the rcc binary package generation

davidedmundson added a comment. Edit. Installation works, which is better. However it still doesn't work properly. make && install Add a file to applets/digital-clock/contents/ui/Foo.qml with some valid QML and then use it from main.qml make && install I get an

D11642: Fix the rcc binary package generation

bshah marked 2 inline comments as done. bshah added a comment. opened PR for KDE_INSTALL_DATADIR : https://phabricator.kde.org/D11675 REPOSITORY R290 KPackage REVISION DETAIL https://phabricator.kde.org/D11642 To: bshah, mart, davidedmundson, apol Cc: kossebau, #frameworks, michaelh,

D11642: Fix the rcc binary package generation

This revision was not accepted when it landed; it landed in state "Needs Review". This revision was automatically updated to reflect the committed changes. Closed by commit R290:b69866996e7e: Fix the rcc binary package generation (authored by bshah). REPOSITORY R290 KPackage CHANGES SINCE

D11642: Fix the rcc binary package generation

bshah added inline comments. INLINE COMMENTS > kossebau wrote in KF5PackageMacros.cmake:164 > Does a plain `${KDE_INSTALL_DATADIR}` not also work? The non-FULL variable > variants are the ones used usually with `install()`. Not exactly sure why > they are, but doing here as well would be

D11642: Fix the rcc binary package generation

kossebau added inline comments. INLINE COMMENTS > KF5PackageMacros.cmake:164 > + DEPENDS ${GENERATED_RCC_CONTENTS} > ${component}-${root}-metadata-json ${kpkgqrc}) > +install(FILES ${GENERATED_RCC_CONTENTS} DESTINATION >

D11642: Fix the rcc binary package generation

davidedmundson accepted this revision. davidedmundson added a comment. Seems to work \o/ Good stuff. Ship this, but lets not rush the workspace changes back in without some more people verifying that. REPOSITORY R290 KPackage REVISION DETAIL https://phabricator.kde.org/D11642 To:

D11642: Fix the rcc binary package generation

bshah marked 2 inline comments as done. REPOSITORY R290 KPackage REVISION DETAIL https://phabricator.kde.org/D11642 To: bshah, mart, davidedmundson, apol Cc: kossebau, #frameworks, michaelh, ngraham

D11642: Fix the rcc binary package generation

bshah updated this revision to Diff 30412. bshah added a comment. - regnerate rcc file on every build - add comment in add_custom_target for logging in build log - Fix the path in the qrc file which broke in previous attempt, plasma/plasmoids// v/s plasma/plasmoids// REPOSITORY R290

D11642: Fix the rcc binary package generation

bshah added a comment. In D11642#232866 , @apol wrote: > See older reviews. This won't work because cmake doesn't know when one of the contained files is modified so rcc files are never regenerated properly. I've solution for that in

D11642: Fix the rcc binary package generation

apol requested changes to this revision. apol added a comment. This revision now requires changes to proceed. See older reviews. This won't work because cmake doesn't know when one of the contained files is modified so rcc files are never regenerated properly. I suggest actually checking

D11642: Fix the rcc binary package generation

kossebau added inline comments. INLINE COMMENTS > kossebau wrote in KF5PackageMacros.cmake:158 > This "Generating xyz" might be still good to have. Please consider picking > this up with a > > COMMENT "Generating: ${xyz}" > > added to `add_custom_command`, where ${xyz} gets a proper

D11642: Fix the rcc binary package generation

kossebau added inline comments. INLINE COMMENTS > KF5PackageMacros.cmake:158 > -include(${kpackagedir}/qrc.cmake) > -message(STATUS \"Generating: > ${KDE_INSTALL_FULL_DATADIR}/${install_dir}/${root}/${component}/contents.rcc\") > -execute_process(COMMAND ${KPACKAGE_RCC}

D11642: Fix the rcc binary package generation

bshah added reviewers: mart, davidedmundson, apol. REPOSITORY R290 KPackage REVISION DETAIL https://phabricator.kde.org/D11642 To: bshah, mart, davidedmundson, apol Cc: #frameworks, michaelh, ngraham

D11642: Fix the rcc binary package generation

bshah updated this revision to Diff 30385. bshah edited the test plan for this revision. bshah added a comment. update commit message REPOSITORY R290 KPackage CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D11642?vs=30384=30385 BRANCH fix-bundled-packages REVISION DETAIL

D11642: Fix the rcc binary package generation

bshah created this revision. Restricted Application added a project: Frameworks. Restricted Application added a subscriber: Frameworks. bshah requested review of this revision. REVISION SUMMARY kpackage_install_bundled_package used install(CODE ..) for the generation and installation of the