fix for build.h regeneration failure when compiling on Windows #1574

• as the "||" operator is not known to qmake use "|" instead, which ensures the code in brackets does never get executed on Windows

This is wrong. : means AND, not OR.

There is no OR afaik. Is there any use for the code, if the first check is false (means we are on Windows) but we set USE_BUILD_INFO=1? If not it still should be correct.

At least the current || is wrong either as it tries to run the code, when compiling on Windows ;).

It means "Not on windows OR USE_BUILD_INFO=1". We use USE_BUILD_INFO in the gitian build.

If you replace it with "Not on windows AND USE_BUILD_INFO=1" you change the meaning completely. For non-windows platforms you don't have to set USE_BUILD_INFO=1 but it's default.

There is also the | operator to act like a logical OR operator, joining together a number of conditions, and requiring only one of them to be true. http://doc.qt.nokia.com/4.7-snapshot/qmake-advanced-usage.html

What am I doing ... I read the exact same document ^^. Will update to use the | operator, which is THE fix how it should be :).

Edit: Updated!

@sipa Can you take a look at this and comment :)?

Have you tested all the cases? At least both windows ones, with and without USE_BUILD_INFO?

tested on Windows 7: !windows with USE_BUILD_INFO=1 set -> Regenerating src/build.h !windows with USE_BUILD_INFO=0 set -> (no message) windows with USE_BUILD_INFO=1 set -> Regenerating src/build.h windows with USE_BUILD_INFO=0 set -> Regenerating src/build.h

Seems the wrong way around, it should be:

!windows with USE_BUILD_INFO=1 set -> Regenerating src/build.h
!windows with USE_BUILD_INFO=0 set (or no USE_BUILD_INFO)  -> Regenerating src/build.h
windows with USE_BUILD_INFO=1 set -> Regenerating src/build.h
windows with USE_BUILD_INFO=0 set (or no USE_BUILD_INFO) -> (no message)

qmake is a strange beast.

Edit: btw, the newly added message is not correct. It is not regenerating src/build.h in qmake, just adding the necessary step to the makefile.

I'll remove the message, just helps debugging currently :). -> removed

!windows on Windows 7 == false, so:

<pre> false OR USE_BUILD_INFO=1 ->Regenerating src/build.h false OR USE_BUILD_INFO=0 (or no USE_BUILD_INFO) -> (no message) </pre>

windows on Windows 7 == true, so:

<pre> true OR USE_BUILD_INFO=1 ->Regenerating src/build.h true OR USE_BUILD_INFO=0 -> Regenerating src/build.h </pre>

Ok, seems like a misunderstanding then, the logic is right. I've tested on Linux and both with USE_BUILD_INFO=0 and USE_BUILD_INFO=1 the build.h instructions are added. As expected.

ACK