From c806ab4bcda6ee5bcb83f9d982abf1e45046b934 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Mon, 30 Apr 2018 16:31:22 -0700 Subject: [PATCH] doc: update build instructions Fixes #1135 Change-Id: I7e5897308594acc591c66dd6656605cdad1a7f3c --- doc/environment-vars.md | 4 ++-- website/content/download.md | 15 ++++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/doc/environment-vars.md b/doc/environment-vars.md index 8199ba5ab..df6661342 100644 --- a/doc/environment-vars.md +++ b/doc/environment-vars.md @@ -122,8 +122,8 @@ valid. `CAMLI_GOPHERJS_GOROOT` (string) : As gopherjs does not build with go tip, when make.go is run with go devel, - CAMLI_GOPHERJS_GOROOT should be set to a Go 1.9 root so that gopherjs can be - built with Go 1.9. Otherwise it defaults to $HOME/go1.9. + CAMLI_GOPHERJS_GOROOT should be set to a Go 1.10 root so that gopherjs can be + built with Go 1.10. Otherwise it defaults to $HOME/go1.10. `CAMLI_HELLO_ENABLED (bool) : Whether to start the hello world app as well. Variable used only by devcam server. diff --git a/website/content/download.md b/website/content/download.md index 7652b2fc9..6dfe4bf12 100644 --- a/website/content/download.md +++ b/website/content/download.md @@ -2,9 +2,10 @@ The latest release is [2017-05-05](docs/release/monthly/2017-05-05). -Or, the canonical git repo is: +Or, using the latest code from git: - $ git clone https://camlistore.googlesource.com/camlistore + $ cd $GOPATH/src + $ git clone https://camlistore.googlesource.com/camlistore perkeep.org ## Build @@ -14,10 +15,14 @@ Windows), skip this section. [Download and install Go](http://golang.org/doc/install) if you don't have that installed already. As of revision [2e46fca5cc](https://github.com/perkeep/perkeep/commit/2e46fca5cc1179dbd90bec49fec3870e6eca6c45), -Perkeep requires [Go 1.9 or newer](https://golang.org/dl/). +Perkeep requires [Go 1.10 or newer](https://golang.org/dl/). -Build Perkeep by running this command in the folder you downloaded or -checked out: +Build Perkeep by making sure you git cloned it to a directory named +"`perkeep.org`" and that directory is in the right place in your +`$GOPATH`. If you haven't set `$GOPATH` explicitly, then Go uses +`$HOME/go` by default, which means your `perkeep.org` directory should +be at `$HOME/go/src/perkeep.org`. Then from that `perkeep.org` +directory, run: $ go run make.go