Commit Graph

147 Commits

Author SHA1 Message Date
jl777
753997b6de Test 2018-03-25 19:34:35 +03:00
jl777
9000990c30 Merge remote-tracking branch 'zcash/master' into rebase2
# Conflicts:
#	.travis.yml
#	Makefile.am
#	README.md
#	configure.ac
#	depends/Makefile
#	depends/builders/darwin.mk
#	depends/funcs.mk
#	depends/hosts/darwin.mk
#	depends/packages/googlemock.mk
#	depends/packages/googletest.mk
#	depends/packages/libsnark.mk
#	depends/packages/libsodium.mk
#	depends/packages/packages.mk
#	depends/packages/rust.mk
#	src/Makefile.am
#	src/Makefile.gtest.include
#	src/chainparams.cpp
#	src/chainparams.h
#	src/checkpoints.h
#	src/clientversion.h
#	src/coins.cpp
#	src/consensus/consensus.h
#	src/gtest/test_mempool.cpp
#	src/httprpc.cpp
#	src/init.cpp
#	src/komodo-tx.cpp
#	src/main.cpp
#	src/miner.cpp
#	src/policy/fees.cpp
#	src/policy/fees.h
#	src/rpcmining.cpp
#	src/rpcrawtransaction.cpp
#	src/rpcserver.cpp
#	src/test/policyestimator_tests.cpp
#	src/test/rpc_wallet_tests.cpp
#	src/test/transaction_tests.cpp
#	src/txdb.cpp
#	src/txmempool.cpp
#	src/wallet/asyncrpcoperation_sendmany.cpp
#	src/wallet/rpcwallet.cpp
#	src/wallet/wallet.cpp
#	src/wallet/wallet.h
#	src/zcash/CreateJoinSplit.cpp
#	zcutil/build.sh
2018-03-25 18:44:38 +03:00
jl777
47ca6eb3c2 Remove -Werror to allow compile on more OS variants 2018-03-05 10:23:01 +02:00
Jack Grigg
326fc65e66 Add environment variable for setting ./configure flags in zcutil/build.sh
Closes #2066.
2018-03-01 16:04:12 +00:00
Jack Grigg
5d8ab776f0 Exclude beta and RC release notes from author tallies
(except for pre-1.0.0, per previous commit)
2017-12-21 00:29:41 +00:00
Jack Grigg
d436db662c release-notes.py: Remove unnecessary parameter 2017-12-21 00:29:41 +00:00
Jack Grigg
2b38d11eda Create release notes starting from the previous non-beta non-RC release 2017-12-21 00:29:33 +00:00
Homu
83af270002 Auto merge of #2786 - str4d:2074-build, r=str4d
Build system improvements

Includes commits cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6978
  - Only the first commit (second is for QT)
- bitcoin/bitcoin#7059
- bitcoin/bitcoin#7603
  - Only the first commit (without the `BITCOIN_QT_BIN` variable; the rest are for QT)
- bitcoin/bitcoin#7954
- bitcoin/bitcoin#8314
  - Only the second commit (first is for QT)
- bitcoin/bitcoin#8504
  - Only the first commit (second was undoing something we didn't have)
- bitcoin/bitcoin#8520
- bitcoin/bitcoin#8563
- bitcoin/bitcoin#8249
- bitcoin/bitcoin#9156
- bitcoin/bitcoin#9831
- bitcoin/bitcoin#9789
- bitcoin/bitcoin#10766

Part of #2074.
2017-12-15 05:04:44 -08:00
Homu
89aaa67e9e Auto merge of #2769 - syd0:rename-bitcoin-bash-completion, r=str4d
Rename bitcoin bash completion files so that they refer to zcash and not bitcoin.

This closes #2167
2017-12-04 04:58:19 -08:00
Jack Grigg
704337b2b8 Move Zcash flags into configure.ac 2017-12-01 14:10:18 +00:00
Jack Grigg
c1fcdd01dd Change --enable-werror to apply to all warnings, use it in build.sh 2017-12-01 14:10:18 +00:00
Jack Grigg
e4cd341260 Replace hard-coded defaults for HOST and BUILD with config.guess 2017-11-29 15:25:14 +00:00
Jack Grigg
7fa05b29b6 Use g-prefixed coreutils commands if they are available
If they are present on the system, it means that the non-prefixed ones are not
necessarily the versions we want, while the prefixed ones are highly likely to
be the ones from GNU Coreutils.
2017-11-29 15:24:21 +00:00
syd
e619c21944 Rename bash completion files so that they refer to zcash and not bitcoin.
This closes #2167
2017-11-28 15:24:15 -05:00
ca333
b5bde7e591 333 2017-10-23 00:33:56 +02:00
ca333
bc3ae3e073 win 333 2017-10-09 12:45:54 +02:00
Homu
0eebdefb8a Auto merge of #2597 - kpcyrd:fetch-ipfs, r=str4d
Fetch params from ipfs if possible

This patch allows fetch-params to download the params from [ipfs], if it's installed. This reduces the need for a central server and ensures the params are available if the official server ceases to exist.

For now, the default is still wget. If wget exits with an error, the script automatically tries ipfs. To use ipfs instead of wget:

    ZC_DISABLE_WGET=1 ./zcutil/fetch-params.sh

[ipfs]: https://github.com/ipfs/go-ipfs
2017-09-21 09:26:29 -07:00
kpcyrd
076e177dd9 Prefer wget over ipfs 2017-09-21 03:28:14 +02:00
kpcyrd
3ccbbe31a4 Fetch params from ipfs if possible
Disable ipfs with ZC_DISABLE_IPFS=
2017-09-21 03:28:04 +02:00
Homu
e797c7bdb1 Auto merge of #2586 - str4d:release-script-build-progress, r=str4d
Add build progress to the release script if progressbar module is available

Install progressbar2 in your Python path to see the build progress.
2017-09-19 14:43:11 -07:00
Homu
151932d478 Auto merge of #2600 - str4d:2497-hotfix-release, r=str4d
Implement process for hotfix releases

Closes #2497.
2017-09-18 16:02:26 -07:00
Jack Grigg
fd5724eca7 make-release.py: Send stderr to stdout 2017-09-18 10:45:03 +01:00
Jack Grigg
24bfc7c6c6 Enforce sequential hotfix versioning 2017-08-31 02:05:07 +01:00
Jack Grigg
869c9f91c4 Add hotfix support to release script 2017-08-30 13:02:50 +01:00
Jack Grigg
d9d33a4b78 Add build progress to the release script if progressbar module is available
Install progressbar2 in your Python path to see the build progress.
2017-08-15 13:45:06 +01:00
Bjorn Hjortsberg
4272a1e2b1 Do not warn on built in declaration mismatch 2017-07-20 13:27:37 +02:00
Jack Grigg
caafbbb483 Pull in temporary release notes during the release process 2017-06-29 15:42:40 -07:00
Homu
35bf9e73ff Auto merge of #2420 - kozyilmaz:disable-libs, r=str4d
option to disable building libraries (zcutil/build.sh)

option to disable building libraries (zcutil/build.sh)
2017-06-15 07:31:46 -07:00
kozyilmaz
c63417bbe7 option to disable building libraries (zcutil/build.sh) 2017-06-04 19:46:35 +03:00
kozyilmaz
cf4f400ca8 [macOS] system linker does not support “--version” option but only “-v” 2017-05-31 10:38:02 +03:00
Nathan Wilcox
88bf7eb050 Add a few more version strings to positive parser test. 2017-05-22 21:23:11 -07:00
Nathan Wilcox
187e64c7ab Consider both beta and rc versions to be IS_RELEASE == false. 2017-05-22 20:42:00 -07:00
Nathan Wilcox
92333721e5 Examine all future versions which are assumed to follow the same Version parser schema. 2017-05-22 20:38:22 -07:00
Nathan Wilcox
73a3f7dc02 Include release version in commit comments. 2017-05-22 20:38:06 -07:00
Nathan Wilcox
0df82709b4 First full-release-branch version of script; rewrite large swatch of release-process.md. [Manually tested.] 2017-05-22 12:34:00 -07:00
Nathan Wilcox
c66c5ab21f Tidy up / systematize logging output a bit more. 2017-05-19 18:20:00 -07:00
Nathan Wilcox
08d66a9c01 Polish logging a bit more. 2017-05-19 18:09:35 -07:00
Nathan Wilcox
c62edf9471 Generate manpages; commit that; improve error output in sh_log. 2017-05-19 18:05:02 -07:00
Nathan Wilcox
785244020a Commit the version changes and build. 2017-05-19 18:05:02 -07:00
Nathan Wilcox
f6b9ffefb7 Shorten the arg log line. 2017-05-19 18:05:02 -07:00
Nathan Wilcox
14b2a420d3 Switch from sh_out_logged to sh_log. 2017-05-19 17:35:20 -07:00
Nathan Wilcox
4dbb6c0b1d Modify the APPROX_RELEASE_HEIGHT. 2017-05-19 17:09:37 -07:00
Nathan Wilcox
ab55424763 Generalize buildnum patching for both clientversion.h and configure.ac. 2017-05-19 16:45:01 -07:00
Nathan Wilcox
482291582e Implement the IS_RELEASE rule for betas. 2017-05-19 16:35:44 -07:00
Nathan Wilcox
68ab915a24 Implement PathPatcher abstraction, clientversion.h rewrite, and build numbering w/ unittests. 2017-05-19 16:32:09 -07:00
Nathan Wilcox
2d8d493ff9 Exit instead of raising an unexpected exception, since it's already logged. 2017-05-19 15:27:07 -07:00
Nathan Wilcox
fad06b020b Make sure to pull the latest master. 2017-05-19 15:25:39 -07:00
Nathan Wilcox
ea5abe2ca7 Add an option to run against a different repo directory. 2017-05-19 15:15:59 -07:00
Nathan Wilcox
b43194baee Make --help output clean by not running self-test. 2017-05-19 13:09:24 -07:00
Nathan Wilcox
1ecb494896 Always run unittests prior to actual runs. 2017-05-19 13:08:26 -07:00