SetUnixEnvironment() commit #4174

pull itoffshore wants to merge 1 commits into bitcoin:master from itoffshore:master changing 5 files +23 −0

itoffshore commented at 10:59 AM on May 11, 2014: contributor

This is to fix the locale bug
itoffshore commented at 10:38 PM on May 11, 2014: contributor

Combined commit

in src/qt/bitcoin.cpp:None in a1f998463d outdated

  59 | @@ -60,6 +60,8 @@ Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin);
  60 |  #include <QTextCodec>
  61 |  #endif
  62 |  
  63 | +void SetUnixEnvironment();

laanwj commented at 6:29 AM on May 12, 2014:

Please define this function in the appropriate header, in this case util.h.

laanwj commented at 6:33 AM on May 12, 2014: member

Suggestion: rename the function to SetupEnvironment, always call it, and make it a no-op for windows for now.

N.B. the reason for this, no need to do it in this pull request, but I think some stuff that we now do at the beginning of AppInit2 would also fit better in a SetupEnvironment function: https://github.com/bitcoin/bitcoin/blob/master/src/init.cpp#L395
itoffshore commented at 9:45 AM on May 12, 2014: contributor
This builds & works on my machine with libboost 1.55 - this error from Jenkins is related to the libboost version rather than the function itself ?
```
util.cpp: In function void SetupEnvironment():
util.cpp:1412: error: codecvt is not a member of boost::filesystem::path
```
sipa commented at 9:56 AM on May 12, 2014: member

I believe pulltester build environment has an older boost, with perhaps boost filesystem v2 instead of v3, which is only partially compatible.
laanwj commented at 10:28 AM on May 12, 2014: member
In that case, surround it with:
```
#if BOOST_FILESYSTEM_VERSION >= 3
```
in src/bitcoin-cli.cpp:None in 1bfe088219 outdated
```
  57 | @@ -58,6 +58,10 @@ static bool AppInitRPC(int argc, char* argv[])
  58 |  
  59 |  int main(int argc, char* argv[])
  60 |  {
  61 | +    #ifndef WIN32
```
laanwj commented at 5:39 AM on May 13, 2014:

Move the #ifndef WIN32 to inside the function. Then we can also use it for other OSes.

BTW: I suppose src/test/test_bitcoin.cpp and src/qt/test/test_main.cpp need this too?
leofidus commented at 9:41 AM on May 13, 2014: none

that commit seems to do a lot of not really related things. Are you sure you didn't accidentially include more changes than intended here?
itoffshore commented at 10:00 AM on May 13, 2014: contributor

Am trying to do a new clean commit now with just the changes for the function.

On 05/13/2014 10:42 AM, leofidus wrote:

that commit seems to do a lot of not really related things. Are you sure you didn't accidentially include more changes than intended here?

— Reply to this email directly or view it on GitHub #4174 (comment).
SetupEnvironment() - clean commit 5248ff4099
BitcoinPullTester commented at 11:18 AM on May 13, 2014: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/5248ff40997c64cc0fde7aaa67cf94dd38b14899 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 merged this on May 19, 2014
laanwj closed this on May 19, 2014
laanwj referenced this in commit c26acfc308 on May 19, 2014
DrahtBot locked this on Sep 8, 2021

Contributors