Finalize the transition to the new plugin loading system.
ClosedPublic

Authored by kmorwinski on Feb 24 2018, 7:26 PM.

Details

Summary

Finally remove all backends desktopfiles

This is the last step for porting cirkuit's plaugins to the kf5
framework. The included json metadata files have been converted with the
tool desktop_to_json.

Improvements:

  1. desktopfiles are not converted to json format each time the project

is build.

  1. circuit_backend.desktop does not need to be installed anymore.
  2. kcoreaddons_desktop_to_json() does not complain about missing

circuit_backend.desktop, if you try to build cirkuit without an old
version being already installed in the system.

Diff Detail

Repository
R657 Cirkuit
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
kmorwinski requested review of this revision.Feb 24 2018, 7:26 PM
kmorwinski created this revision.
asturmlechner requested changes to this revision.Feb 25 2018, 12:52 PM

Thanks for your contribution! I've tested this against frameworks branch and it builds fine for me. However, your review is targeting master, which is not yet frameworks based. Merging frameworks should only happen when the branch is deemed ready, and in coordination with translations.

Please change to frameworks branch and update this revision.

This revision now requires changes to proceed.Feb 25 2018, 12:52 PM

Thanks for your contribution! I've tested this against frameworks branch and it builds fine for me. However, your review is targeting master, which is not yet frameworks based. Merging frameworks should only happen when the branch is deemed ready, and in coordination with translations.

Please change to frameworks branch and update this revision.

No worries! I got a new job lately, so it took a while until I found some time and look into this again. Hopefully I will commit some more diffs in the near future probably next weeks.

I am a bit confused what you mean by "targeting master"?! The git commit is based on the frameworks branch and in the Diff Details above it says
Repository: R657 Cirkuit
Branch: frameworks
Do I miss something?

I am a bit confused what you mean by "targeting master"?! The git commit is based on the frameworks branch and in the Diff Details above it says
Repository: R657 Cirkuit
Branch: frameworks
Do I miss something?

That's right, but something seems to be off with your local clone when compared to upstream/frameworks:

$ arc patch D10806
INFO Base commit is not in local repository; trying to fetch.
Created and checked out branch arcpatch-D10806.

This diff is against commit 013937f13fef73a5d1f143963de35816e1b8413b, but
the commit is nowhere in the working copy. Try to apply it against the
current working copy state? (d9ff4c17d052c8d1bb648402e88d70d77897f847

013937f13fef73a5d1f143963de35816e1b8413b does not exist here, and I've made sure to git pull --rebase before trying to apply your patch. Could it be that you merged from upstream/master rather than rebased? One can see those commits also in this differential history.

asturmlechner accepted this revision.Feb 25 2018, 11:22 PM
This revision is now accepted and ready to land.Feb 25 2018, 11:22 PM
This revision was automatically updated to reflect the committed changes.

Thanks, I was able to land your change using --onto frameworks, arcanist was for some reason defaulting to master otherwise.

That's right, but something seems to be off with your local clone when compared to upstream/frameworks:

$ arc patch D10806
INFO Base commit is not in local repository; trying to fetch.
Created and checked out branch arcpatch-D10806.

Ok now I know what happened. I had another commit in my local frameworks branch, which I did not want to be part of this review.
I did not know how to handle arc correctly here. I thought I was only providing a patch or patchset here, not a commit with history and parents.... didn't think this would be so much trouble for you! Sorry!!!

Next time I will rebase my patches on top of upstream before posting them with arc.
Thanks for accepting my diif.