Remove improper qt/moc_* cleaning glob from the general Makefile #13254

pull Empact wants to merge 1 commits into bitcoin:master from Empact:make-clean-qt-moc changing 1 files +2 −1

Empact commented at 3:13 AM on May 17, 2018: member

As noted by theuni and Sjors in #12870, qt moc cleaning is handled by CLEAN_QT via QT_MOC_CPP in Makefile.qt.include.

In my testing I configured, built and cleaned with qt4 and qt5 both, absent the associated wildcard, and no MOC files were left after clean. Propose we revert the change and reconsider if a specific file is identified, and in that case add that file to QT_MOC_CPP.

This reverts commit 1d540046fe47eb7b6062c55ebebd801ece96231c, reversing changes made to ad960f5771dc251c8e1198dd8a82e18df4562171.

Revert "Merge #12870: make clean removes src/qt/moc_ files"

As noted by theuni and Sjors in #12870, qt moc cleaning is handled
by CLEAN_QT via QT_MOC_CPP in Makefile.qt.include.

In my testing I configured, built and cleaned with qt4 and qt5 both,
absent the associated wildcard, and no MOC files were left after clean.
Propose we revert the change and reconsider if a specific file
is identified, then add that file to QT_MOC_CPP.

This reverts commit 1d540046fe47eb7b6062c55ebebd801ece96231c, reversing
changes made to ad960f5771dc251c8e1198dd8a82e18df4562171.

4138f42d24

Empact force-pushed on May 17, 2018
fanquake added the label Build system on May 17, 2018
fanquake requested review from theuni on May 17, 2018
Empact renamed this:
~~Revert "Merge #12870: make clean removes src/qt/moc_ files"~~
Remove improper qt/moc_* cleaning glob from the general Makefile
on May 17, 2018
laanwj commented at 4:50 PM on May 19, 2018: member

Ping @Sjors
MarcoFalke commented at 6:27 PM on May 19, 2018: member

utACK 4138f42d24ae98da5816a7cce887a54c4550b6da (seems low risk to revert to the previous state)
Sjors commented at 8:37 AM on May 20, 2018: member

@Empact given that you can't reproduce, what I suspect happened in my case is that I was developing on a different branch which added new files and then switched back to master.

I'm fine with reverting regardless.
theuni approved
MarcoFalke merged this on May 21, 2018
MarcoFalke closed this on May 21, 2018
MarcoFalke referenced this in commit 092b366881 on May 21, 2018
Empact deleted the branch on Jul 2, 2018
UdjinM6 referenced this in commit c244676136 on May 21, 2021
UdjinM6 referenced this in commit ae4b1e0916 on May 25, 2021
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels

Linked (view graph)

#12870 make clean removes src/qt/moc_ files