[Qt] update bitcoin-qt.pro and assets-attribution.md #3432

Diapolo commented at 9:46 PM on December 16, 2013: none

remove unused and unmentioned file notsynced.png (we use an animation for this)
add missing coincontroldialog.ui to bitcoin-qt.pro
also unify formating in assets-attribution.md

Diapolo commented at 10:38 PM on December 16, 2013: none

Dunno what causes this:

<pre> config.status: error: cannot find input file: `Makefile.in' /mnt/bitcoin/qa/pull-tester/pull-tester.sh: 15: ./qa/pull-tester/build-tests.sh: not found </pre>

theuni commented at 11:15 PM on December 16, 2013: member

src/qt/Makefile.am:134: blank line following trailing backslash src/qt/Makefile.am:239: blank line following trailing backslash autoreconf: automake failed with exit status: 1

theuni commented at 11:18 PM on December 16, 2013: member

qa/pull-tester/pull-tester.sh should get use

set -e

That would make this kind of failure much more obvious.

laanwj commented at 6:33 AM on December 17, 2013: member

I am very much in favor of putting each file on a separate line in makefiles, as this makes diffs easier to review.

However, this should probably go in after the other real makefile changes (such as Qt5 support) to prevent breaking them.

Diapolo commented at 6:53 AM on December 17, 2013: none

@theuni Thanks for catching that one... perhaps you can add the set -e in yout Qt5 pull? @laanwj This took me some minutes to check every file for existense and re-ordering the entries alphabetically, too. I don't want to rebase it once more, if we can avoid it :-D.

theuni commented at 6:59 AM on December 17, 2013: member

@Diapolo 'make distcheck' will tell you very quickly if you've forgotten something.

As for ordering, 'ls -1 *.foo' should do it. If your shell can't handle that, maybe you should look for an alternative ;)

laanwj commented at 7:07 AM on December 17, 2013: member

I always select the lines in vim and then do :!sort. Et voila. The only manual adjustment needed is to make sure there is a \ on every line except for the last.

Diapolo commented at 7:22 AM on December 17, 2013: none

2 words: Windows and GUI :-D.

laanwj commented at 8:45 AM on December 17, 2013: member

@Diapolo in that case it may be better to drop the Makefile.am changes in this pull and let us take care of them along with other changes.

Diapolo commented at 1:45 PM on December 17, 2013: none

@laanwj I'm not sure if I get it, perhaps it's easy for @theuni to just rebase his Qt5 pull on this, so why not just merge what is there. He intended to update his pull tomorrow anyway :).

Diapolo commented at 8:05 AM on December 20, 2013: none

@theuni If you want take this commit and merge it into your Qt5 pull?

Diapolo commented at 1:15 PM on January 6, 2014: none

Sad this is still unmerged, blocked...

theuni commented at 8:22 PM on January 6, 2014: member

I don't understand why the .pro is necessary anymore? There's a PR for qt5 compatibility. It's fully functional, just awaiting review/testing. I'm not sure what I can do to speed that up.

laanwj commented at 10:22 PM on January 6, 2014: member

@theuni The .pro is still used by @Diapolo and me to edit the resources and forms conveniently in Qt Designer. It is not used for building.

I didn't know the Qt5 autoconf stuff was ready yet for merging, thanks for letting me know.

laanwj commented at 5:19 PM on January 8, 2014: member

@diapolo if you remove the Makefile.am changes I'll merge it immediately

[Qt] update bitcoin-qt.pro and assets-attribution.md

- remove unused and unmentioned file notsynced.png (we use an animation
  for this)
- add missing coincontroldialog.ui to bitcoin-qt.pro
- also unify formating in assets-attribution.md

b960fcb86a

Diapolo commented at 6:39 AM on January 9, 2014: none

@laanwj Removed the Makefile.am changes.

BitcoinPullTester commented at 7:07 AM on January 9, 2014: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/b960fcb86a23b3a30d6a2f70aaf4bc17e00e6736 for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.

laanwj referenced this in commit c07dd453e4 on Jan 10, 2014

laanwj merged this on Jan 10, 2014

laanwj closed this on Jan 10, 2014

Diapolo deleted the branch on Jan 10, 2014

DrahtBot locked this on Sep 8, 2021