diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/build-osx.md | 8 | ||||
| -rw-r--r-- | doc/build-unix.md | 11 | ||||
| -rw-r--r-- | doc/init.md | 8 | ||||
| -rw-r--r-- | doc/release-process.md | 19 |
4 files changed, 27 insertions, 19 deletions
diff --git a/doc/build-osx.md b/doc/build-osx.md index 5eeda5b08e..dc55f8259e 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -50,7 +50,7 @@ Running this command takes you into brew's interactive mode, which allows you to $ brew install https://raw.github.com/mxcl/homebrew/master/Library/Formula/berkeley-db4.rb -–without-java ``` -These rest of these commands are run inside brew interactive mode: +The rest of these commands are run inside brew interactive mode: ``` /private/tmp/berkeley-db4-UGpd0O/db-4.8.30 $ cd .. /private/tmp/berkeley-db4-UGpd0O $ db-4.8.30/dist/configure --prefix=/usr/local/Cellar/berkeley-db4/4.8.30 --mandir=/usr/local/Cellar/berkeley-db4/4.8.30/share/man --enable-cxx @@ -61,7 +61,7 @@ These rest of these commands are run inside brew interactive mode: After exiting, you'll get a warning that the install is keg-only, which means it wasn't symlinked to `/usr/local`. You don't need it to link it to build bitcoin, but if you want to, here's how: - $ brew --force link berkeley-db4 + $ brew link --force berkeley-db4 ### Building `bitcoind` @@ -81,6 +81,10 @@ After exiting, you'll get a warning that the install is keg-only, which means it make check +4. (Optional) You can also install bitcoind to your path: + + make install + Creating a release build ------------------------ You can ignore this section if you are building `bitcoind` for your own use. diff --git a/doc/build-unix.md b/doc/build-unix.md index 8a76a8b2cd..fb5eaec431 100644 --- a/doc/build-unix.md +++ b/doc/build-unix.md @@ -15,9 +15,12 @@ the usage of the absolute path. To Build --------------------- - ./autogen.sh - ./configure - make +```bash +./autogen.sh +./configure +make +make install # optional +``` This will build bitcoin-qt as well if the dependencies are met. @@ -63,7 +66,7 @@ Build requirements: sudo apt-get install build-essential libtool autotools-dev autoconf pkg-config libssl-dev -for Ubuntu 12.04 and later: +for Ubuntu 12.04 and later or Debian 7 and later libboost-all-dev has to be installed: sudo apt-get install libboost-all-dev diff --git a/doc/init.md b/doc/init.md index 3d14025ab4..1f0559d806 100644 --- a/doc/init.md +++ b/doc/init.md @@ -4,10 +4,10 @@ Sample init scripts and service configuration for bitcoind Sample scripts and configuration files for systemd, Upstart and OpenRC can be found in the contrib/init folder. -contrib/init/bitcoind.service: systemd service unit configuration -contrib/init/bitcoind.openrc: OpenRC compatible SysV style init script -contrib/init/bitcoind.openrcconf: OpenRC conf.d file -contrib/init/bitcoind.conf: Upstart service configuration file + contrib/init/bitcoind.service: systemd service unit configuration + contrib/init/bitcoind.openrc: OpenRC compatible SysV style init script + contrib/init/bitcoind.openrcconf: OpenRC conf.d file + contrib/init/bitcoind.conf: Upstart service configuration file 1. Service User --------------------------------- diff --git a/doc/release-process.md b/doc/release-process.md index 8934be66c4..7699af90bd 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -154,6 +154,10 @@ repackage gitian builds for release as stand-alone zip/tar/installer exe zip -r bitcoin-${VERSION}-win.zip bitcoin-${VERSION}-win rm -rf bitcoin-${VERSION}-win +**Mac OS X .dmg:** + + mv Bitcoin-Qt.dmg bitcoin-${VERSION}-osx.dmg + ###Next steps: Commit your signature to gitian.sigs: @@ -178,16 +182,13 @@ Commit your signature to gitian.sigs: Note: only Gavin has the code-signing keys currently. -- Create `SHA256SUMS.asc` for builds, and PGP-sign it. This is done manually. - Include all the files to be uploaded. The file has `sha256sum` format with a - simple header at the top: - -``` -Hash: SHA256 - -0060f7d38b98113ab912d4c184000291d7f026eaf77ca5830deec15059678f54 bitcoin-x.y.z-linux.tar.gz -... +- Create `SHA256SUMS.asc` for the builds, and GPG-sign it: +```bash +sha256sum * > SHA256SUMS +gpg --digest-algo sha256 --clearsign SHA256SUMS # outputs SHA256SUMS.asc +rm SHA256SUMS ``` +(the digest algorithm is forced to sha256 to avoid confusion of the `Hash:` header that GPG adds with the SHA256 used for the files) - Upload zips and installers, as well as `SHA256SUMS.asc` from last step, to the bitcoin.org server |