Browse Source

documentation update

tags/v1.1.0-rc1
Shivaram Lingamneni 5 years ago
parent
commit
00c62ddabe
2 changed files with 19 additions and 14 deletions
  1. 8
    1
      DEVELOPING.md
  2. 11
    13
      README.md

+ 8
- 1
DEVELOPING.md View File

@@ -2,6 +2,13 @@
2 2
 
3 3
 This is just a bunch of tips and tricks we keep in mind while developing Oragono. If you wanna help develop as well, they might also be worth keeping in mind!
4 4
 
5
+## Golang issues
6
+
7
+You should use the [latest distribution of the Go language for your OS and architecture](https://golang.org/dl/). (If `uname -m` on your Raspberry Pi reports `armv7l`, use the `armv6l` distribution of Go; if it reports v8, you may be able to use the `arm64` distribution.)
8
+
9
+Oragono vendors all its dependencies. The vendored code is tracked via a git submodule: `vendor/` is a submodule pointing to the [oragono-vendor](https://github.com/oragono/oragono-vendor) repository. As long as you're not modifying the vendored dependencies, `make` should take care of everything for you --- but if you are, see the "vendor" section below.
10
+
11
+Because of this, Oragono is self-contained and you should not need to fetch any dependencies with `go get`. Doing so is not recommended, since it may fetch incompatible versions of the dependencies. If you're having trouble building the code, it's very likely because your clone of the repository is in the wrong place: Go is very opinionated about where you should keep your code. Take a look at the [go workspaces documentation](https://golang.org/doc/code.html) if you're having trouble.
5 12
 
6 13
 ## Branches
7 14
 
@@ -21,7 +28,7 @@ Develop branches are either used to work out implementation details in preperati
21 28
 5. Remove unused sections from the changelog, change the date/version number and write release notes.
22 29
 6. Commit the new changelog and constants change.
23 30
 7. Tag the release with `git tag v0.0.0 -m "Release v0.0.0"` (`0.0.0` replaced with the real ver number).
24
-8. Build binaries using the Makefile, upload release to Github including the changelog and binaries.
31
+8. Build binaries using `make release`, upload release to Github including the changelog and binaries.
25 32
 9. If it's a proper release (i.e. not an alpha/beta), merge the updates into the `stable` branch.
26 33
 
27 34
 Once it's built and released, you need to setup the new development version. To do so:

+ 11
- 13
README.md View File

@@ -70,21 +70,19 @@ The `stable` branch contains the latest release. You can run this for a producti
70 70
 
71 71
 #### Building
72 72
 
73
-Clone the appropriate branch. You should also run this command to set up vendored dependencies:
74
-```
75
-git submodule update --init
76
-```
73
+You'll need an [up-to-date distribution of the Go language for your OS and architecture](https://golang.org/dl/). You'll also need to set up a [Go workspace](https://golang.org/doc/code.html). Typically, this is just a directory `~/go`, with the `GOPATH` environment variable exported to its path with `export GOPATH=~/go`.
77 74
 
78
-From the root folder, you can run `make`, using [GoReleaser](https://goreleaser.com/) to generate all of our release binaries in `/dist`:
79
-```
80
-make
81
-```
82
-
83
-However, when just developing I instead just use this command to rebuild and run Oragono on the fly with the latest changes:
84
-```
85
-go run oragono.go
86
-```
75
+Clone the repository where `go` expects it to be and then run `make`, i.e.,
87 76
 
77
+```bash
78
+mkdir -p ${GOPATH}/src/github.com/oragono
79
+cd ${GOPATH}/src/github.com/oragono
80
+git clone https://github.com/oragono/oragono
81
+cd oragono
82
+# check out the appropriate branch if necessary
83
+# now, this will install a development copy of oragono at ${GOPATH}/bin/oragono:
84
+make
85
+````
88 86
 
89 87
 ## Configuration
90 88
 

Loading…
Cancel
Save