aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLauda <lauda.m@protonmail.ch>2016-09-22 15:14:19 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2016-09-30 20:32:10 +0200
commit203e2ddad8e544803491d1e9e9ca2b6e26a15f8e (patch)
tree9c2ba87164f94153db06b11b304b5c49386b722b /doc
parent26b370a93700d81ab92b528c3194bd90234b07ce (diff)
downloadbitcoin-203e2ddad8e544803491d1e9e9ca2b6e26a15f8e.tar.xz
Mention Gitian building script in doc.
Diffstat (limited to 'doc')
-rw-r--r--doc/gitian-building.md2
-rw-r--r--doc/release-process.md4
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/gitian-building.md b/doc/gitian-building.md
index 4914d90df4..442d2d605f 100644
--- a/doc/gitian-building.md
+++ b/doc/gitian-building.md
@@ -336,6 +336,8 @@ There will be a lot of warnings printed during the build of the image. These can
Getting and building the inputs
--------------------------------
+At this point you have two options, you can either use the automated script (found in [contrib/gitian-build.sh](/contrib/gitian-build.sh)) or you could manually do everything by following this guide. If you're using the automated script, then run it with the "--setup" command. Afterwards, run it with the "--build" command (example: "contrib/gitian-building.sh -b signer 0.13.0"). Otherwise ignore this.
+
Follow the instructions in [doc/release-process.md](release-process.md#fetch-and-create-inputs-first-time-or-when-dependency-versions-change)
in the bitcoin repository under 'Fetch and create inputs' to install sources which require
manual intervention. Also optionally follow the next step: 'Seed the Gitian sources cache
diff --git a/doc/release-process.md b/doc/release-process.md
index 394b159b31..e2ad3949d6 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -17,6 +17,8 @@ Before every major release:
### First time / New builders
+If you're using the automated script (found in [contrib/gitian-build.sh](/contrib/gitian-build.sh)), then at this point you should run it with the "--setup" command. Otherwise ignore this.
+
Check out the source code in the following directory hierarchy.
cd /path/to/your/toplevel/build
@@ -60,6 +62,8 @@ Tag version (or release candidate) in git
### Setup and perform Gitian builds
+If you're using the automated script (found in [contrib/gitian-build.sh](/contrib/gitian-build.sh)), then at this point you should run it with the "--build" command. Otherwise ignore this.
+
Setup Gitian descriptors:
pushd ./bitcoin