Wladimir J. van der Laan
b76a767906
Merge pull request #5031
...
e2efdf3
amount.h: update license, add header end comment + rem from util.h (Philip Kaufmann)
2014-10-02 11:48:38 +02:00
Philip Kaufmann
4bd1185280
Qt: allow "emergency" shutdown during startup
...
- allows closing our splash screen to abort startup
2014-10-02 11:26:36 +02:00
Philip Kaufmann
e2efdf3937
amount.h: update license, add header end comment + rem from util.h
2014-10-02 11:25:21 +02:00
Philip Kaufmann
938bccebf1
CAutoFile: make file private
2014-10-02 10:59:28 +02:00
Philip Kaufmann
0c35486dc9
CBufferedFile: add explicit close function
...
- also use identical close function for CAutoFile (avoids setting file to
NULL under wrong conditions)
2014-10-02 10:56:10 +02:00
Philip Kaufmann
c9fb27da0a
CBufferedFile: convert into a non-refcounted RAII wrapper
...
- it now takes over the passed file descriptor and closes it in the
destructor
- this fixes a leak in LoadExternalBlockFile(), where an exception could
cause the file to not getting closed
- disallow copies (like recently added for CAutoFile)
- make nType and nVersion private
2014-10-02 10:46:31 +02:00
Wladimir J. van der Laan
8d132431b4
Revert merge of pull #4845
...
It breaks the new mingw tests!
See
- https://travis-ci.org/bitcoin/bitcoin/jobs/36845581
- https://travis-ci.org/bitcoin/bitcoin/jobs/36845582
This reverts commit 4705902777
, 5e2e7fcb99
, a25fd6be13
.
2014-10-02 10:39:55 +02:00
Wladimir J. van der Laan
ad51e14583
Merge pull request #4845
...
4705902
Avoid introducing a virtual into CChainParams (Wladimir J. van der Laan)
5e2e7fc
Suggested corrections on comments, variable names. Also new test case testing the PoW skip in UNITTEST. (SergioDemianLerner)
a25fd6b
Switch testing framework from MAIN to new UNITTEST network (SergioDemianLerner)
2014-10-02 09:47:54 +02:00
Wladimir J. van der Laan
3b390723c1
Merge pull request #5025
...
5ad450a
travis: If the comparison-tool fails, dump the tail of the debug log (Cory Fields)
2014-10-02 09:08:33 +02:00
Wladimir J. van der Laan
00eef5d6e9
Merge pull request #5017
...
f74fc9b
Print input index when signature validation fails, to aid debugging. (Mark Friedenbach)
217a5c9
When transaction outputs exceed inputs, show the offending amounts so as to aid debugging. (Mark Friedenbach)
2014-10-02 08:44:08 +02:00
Wladimir J. van der Laan
90aa73e900
Merge pull request #5027
...
0f78a0a
Upgrade comparison tool further (Pieter Wuille)
2014-10-02 08:29:23 +02:00
Pieter Wuille
76c171033c
Merge pull request #4926
...
584a358
Do merkle root and txid duplicates check simultaneously (Pieter Wuille)
2014-10-02 06:10:19 +02:00
Pieter Wuille
471d38b015
Merge pull request #4980
...
20a11ff
minor variable init changes in init.cpp (Philip Kaufmann)
2014-10-02 04:29:01 +02:00
Pieter Wuille
0f78a0a2eb
Upgrade comparison tool further
2014-10-02 03:55:33 +02:00
Cory Fields
dd367ff8c9
build: macdeploy: filter out irrelevant qt5 frameworks and dylibs
2014-10-01 19:26:29 -04:00
Cory Fields
9fedafba4b
build: Fix OSX build when using Homebrew and qt5
...
Qt5 is bottled, so configure won't find it without some help. Use
brew to find out its prefix.
Also, qt5 added the host_bins variable to pkg-config, use it.
2014-10-01 19:26:29 -04:00
Gavin Andresen
35eaa6b457
Merge pull request #5024 from gavinandresen/osx_sign_fix
...
Keep symlinks when copying into .app bundle
2014-10-01 18:15:18 -04:00
Cory Fields
5ad450a65a
travis: If the comparison-tool fails, dump the tail of the debug log
...
The entire debug log would be huge, and could cause issues for automated tools
like travis. Printing 200 lines is an initial guess at a reasonable number,
more may be required.
2014-10-01 16:47:33 -04:00
Mark Friedenbach
f74fc9b22d
Print input index when signature validation fails, to aid debugging.
2014-10-01 19:14:38 +02:00
Mark Friedenbach
217a5c9238
When transaction outputs exceed inputs, show the offending amounts so as to aid debugging.
2014-10-01 19:14:38 +02:00
Gavin Andresen
965c306d6d
Keep symlinks when copying into .app bundle
...
Code signing failed for me on OSX 10.9.5 because the
Versions/Current symbolic links were being replaced
with a duplicate copy of the frameworks' code.
Releases were bigger than they needed to be, for the
same reason.
2014-10-01 09:58:00 -04:00
Wladimir J. van der Laan
1fbccda8d0
Merge pull request #4940
...
62e5f8f
CMessageHeader sanity changes (Wladimir J. van der Laan)
2014-10-01 13:28:16 +02:00
Wladimir J. van der Laan
a41943df58
Merge pull request #5023
...
e9f3fa7
travis: enable windows tests (Cory Fields)
2014-10-01 13:21:32 +02:00
Cory Fields
e9f3fa7c0b
travis: enable windows tests
2014-10-01 06:59:59 -04:00
Wladimir J. van der Laan
a419f82670
Merge pull request #5022
...
c375b5c
remove dead/unused code in walletdb.cpp (Philip Kaufmann)
2014-10-01 12:56:11 +02:00
Whit J
f60dc15c50
doc: add make install to build-osx.md and build-unix.md
2014-10-01 12:52:32 +02:00
Wladimir J. van der Laan
3fd192f8b4
Merge pull request #4234
...
c122f55
qt: Register CAmount metatype (Wladimir J. van der Laan)
a372168
Use a typedef for monetary values (Mark Friedenbach)
2014-10-01 11:28:55 +02:00
Wladimir J. van der Laan
c122f5528c
qt: Register CAmount metatype
...
This allows sending the type over queued connections.
Also normalize signal/slot names.
2014-10-01 11:06:41 +02:00
Philip Kaufmann
c375b5c102
remove dead/unused code in walletdb.cpp
...
- closes #5021
2014-10-01 11:00:29 +02:00
Philip Kaufmann
b5ec5fe0cb
update getnetworkinfo help with subversion
...
- add missing subversion field to getnetworkinfo help
- fix style and format errors in help string
- remove unneeded int casts
2014-10-01 10:23:00 +02:00
Wladimir J. van der Laan
b25551101c
Merge pull request #5008
...
41020eb
Fix formatting in init.md (Whit J)
2014-10-01 09:07:42 +02:00
Wladimir J. van der Laan
437634a79e
Merge pull request #5005
...
af0bd5e
osx: fix signing to make Gatekeeper happy (again) (Cory Fields)
2014-10-01 09:00:45 +02:00
Wladimir J. van der Laan
211d2939fd
Merge pull request #5018
...
347a3a3
Update build-unix.md (JL2035)
2014-10-01 08:56:53 +02:00
Wladimir J. van der Laan
a6f3e9d843
Merge pull request #5014
...
41d67c7
tests: fix python test-runner for windows (Cory Fields)
2014-10-01 08:55:34 +02:00
Philip Kaufmann
d0c4197ef6
change exit(1) to an assert in CWallet::EncryptWallet
2014-10-01 08:50:24 +02:00
Philip Kaufmann
870da77da6
fix possible memory leaks in CWallet::EncryptWallet
...
- add missing deletes for pwalletdbEncryption
- add an assert before trying to reserve memory for pwalletdbEncryption
- add a destructor to CWallet, which ensures deletion of
pwalletdbEncryption on object destruction
2014-10-01 08:48:23 +02:00
Philip Kaufmann
f606bb9baf
fix a possible memory leak in CWalletDB::Recover
...
- convert pdbCopy into a boost::scoped_ptr to ensure memory gets freed
in all cases (e.g. after "ret > 0")
2014-10-01 08:48:22 +02:00
Gavin Andresen
e5836eb692
Merge pull request #5015 from theuni/win64test
...
tests: fix false-positive under win64
2014-09-30 19:54:08 -04:00
JL2035
347a3a3eaa
Update build-unix.md
...
Debian also need libboost-all-dev installed.
2014-10-01 01:53:46 +02:00
Gavin Andresen
7def85e1b5
Merge pull request #5006 from TheBlueMatt/travis-new-comparisontool
...
depends: update the comparison tool to a more recent version
2014-09-30 19:53:35 -04:00
Cory Fields
63c17613ab
tests: fix false-positive under win64
...
BN_ULONG isn't necessarily an unsigned long, as is the case on win64.
2014-09-30 18:16:14 -04:00
Cory Fields
41d67c78bf
tests: fix python test-runner for windows
...
Windows needed a few fixups to get the tests running:
1. bitcoin-tx needs a file extension in Windows. Take this opportunity to
add an env file, which pulls variables out of our build config. This can
be extended as needed, for now it's very simple.
2. After #1 , split the args out of the exec key in the test data.
3. Correct the line-endings from windows stdout
2014-09-30 16:26:22 -04:00
Matt Corallo
e166c177bc
Revert "travis: retry tests before giving up"
...
This reverts commit 7e3821c097
.
2014-09-30 12:14:22 -07:00
Cory Fields
6d7a0fa4e5
depends: update the comparison tool to a more recent version
2014-09-30 12:14:22 -07:00
Whit J
41020ebe86
Fix formatting in init.md
2014-09-30 10:41:31 -07:00
Cory Fields
af0bd5ee7f
osx: fix signing to make Gatekeeper happy (again)
...
The approach from 65f3fa8d1
worked for signing on 10.9.4, but not newer
versions. 10.9.5 (and up) want each framework to stand alone.
Now in addition to copying the plist's from Qt for each framework, we put them
in per-version dirs and only symlink to the latest, rather than using symlinks
for any contents.
2014-09-29 22:03:24 -04:00
Pieter Wuille
a329097f92
Merge pull request #4990
...
7bec6dd
cleanup license and header end comment in chain.cpp/.h (Philip Kaufmann)
0db65d8
update license of compat and crypto (Philip Kaufmann)
2014-09-30 01:35:11 +02:00
Pieter Wuille
838e2e193b
Merge pull request #5003
...
68af7d0
Fix vector out of bounds in script tests (Pieter Wuille)
2014-09-29 19:40:40 +02:00
Pieter Wuille
68af7d02cf
Fix vector out of bounds in script tests
2014-09-29 19:26:23 +02:00
Pieter Wuille
2884b9a4ae
Merge pull request #4960
...
8138cbe
Add automatic script test generation, and actual checksig tests (Pieter Wuille)
2014-09-29 18:36:04 +02:00