1 00ced238 2021-09-24 thomas README.portable
2 00ced238 2021-09-24 thomas ===============
4 00ced238 2021-09-24 thomas **NOTE: This repository is read-only and is used only to mirror the
5 00ced238 2021-09-24 thomas got-portable repository for CI purposes.**
7 00ced238 2021-09-24 thomas This is the portable version of got[1] (Game of Trees), using autotools to
8 e499844e 2022-03-03 thomas provide the library checks required for GoT's dependencies.
10 e499844e 2022-03-03 thomas The following operating systems are supported:
14 b26177ad 2022-03-03 thomas * DragonFlyBSD
18 00ced238 2021-09-24 thomas DEPENDENCIES
19 00ced238 2021-09-24 thomas ============
23 00ced238 2021-09-24 thomas * `libncurses` (for tog(1))
24 bd1cad3c 2022-04-30 thomas * `libbsd` (BSD's arc4random routines)
25 00ced238 2021-09-24 thomas * `libuuid` (for UUID generation)
26 00ced238 2021-09-24 thomas * `libz` (for Z compression)
27 00ced238 2021-09-24 thomas * `pkg-config` (for searching libraries)
28 ebc794c1 2021-10-20 thomas * `bison` (for configuration file grammar)
32 e499844e 2022-03-03 thomas * `automake`
33 e499844e 2022-03-03 thomas * `pkgconf`
34 20a7eac5 2023-03-03 thomas * `libevent` (for gotwebd)
38 e499844e 2022-03-03 thomas * `automake`
39 e499844e 2022-03-03 thomas * `libuuid`
40 e499844e 2022-03-03 thomas * `ncuresesw`
41 20a7eac5 2023-03-03 thomas * `libevent` (for gotwebd)
43 b26177ad 2022-03-03 thomas DragonFlyBSD:
45 b26177ad 2022-03-03 thomas * `automake`
46 b26177ad 2022-03-03 thomas * `pkgconf`
47 b26177ad 2022-03-03 thomas * `openssl`
48 20a7eac5 2023-03-03 thomas * `libevent` (for gotwebd)
50 e499844e 2022-03-03 thomas Darwin (MacOS):
52 e499844e 2022-03-03 thomas * `automake`
54 e499844e 2022-03-03 thomas * `pkg-config`
55 e499844e 2022-03-03 thomas * `ncurses`
56 e499844e 2022-03-03 thomas * `openssl`
57 e499844e 2022-03-03 thomas * `ossp-uuid`
58 20a7eac5 2023-03-03 thomas * `libevent` (for gotwebd)
60 00ced238 2021-09-24 thomas TESTS (REGRESS)
61 00ced238 2021-09-24 thomas ===============
63 00ced238 2021-09-24 thomas To run the test suite:
66 00ced238 2021-09-24 thomas $ make tests
69 5713faaf 2023-03-09 thomas Dependencies
70 5713faaf 2023-03-09 thomas ============
75 1317cd3a 2022-03-08 thomas NOTE: For Linux, you must have the jot(1) command which is typically in the
76 5713faaf 2023-03-09 thomas `athena-jot` package, or similar.
78 00ced238 2021-09-24 thomas NOTE: THIS ONLY WORKS AFTER `make install` DUE TO HOW PATHS TO LIBEXEC
79 00ced238 2021-09-24 thomas HELPERS ARE HARD-CODED INTO THE BINARIES.
81 00ced238 2021-09-24 thomas INSTALLATION
82 00ced238 2021-09-24 thomas ============
85 00ced238 2021-09-24 thomas $ ./autogen.sh
86 00ced238 2021-09-24 thomas $ ./configure && make
87 00ced238 2021-09-24 thomas $ sudo make install
90 00ced238 2021-09-24 thomas BRANCHES + SUBMITTING PATCHES
91 00ced238 2021-09-24 thomas =============================
93 00ced238 2021-09-24 thomas `got-portable` has two key branches:
95 00ced238 2021-09-24 thomas * `main` which tracks got upstream untainted.
96 04dafe6d 2023-03-10 thomas * `portable` which provides the portable version of GoT based from code on `main`
98 04dafe6d 2023-03-10 thomas Patches for portable code fixes should be based from the `portable` branch and
99 00ced238 2021-09-24 thomas sent to the mailing list for review [2] or sent to me directly (see CONTACT).
101 61702ba6 2022-07-19 thomas Portable-specific patches should have a shortlog in the form of:
104 61702ba6 2022-07-19 thomas portable: AREA: description
107 61702ba6 2022-07-19 thomas Where `AREA` relates to the change in question (for example, `regress`,
108 61702ba6 2022-07-19 thomas `libexec`, etc). In some cases, this can be omitted if it's a generic change.
110 61702ba6 2022-07-19 thomas This helps to delineate `-portable` changes from upstream `got`.
112 00ced238 2021-09-24 thomas The read-only Github repository also runs CI checks using Cirrus-CI on Linux
113 00ced238 2021-09-24 thomas and FreeBSD.
115 585fb430 2022-07-21 thomas SYNCING UPSTREAM CHANGES WITH PORTABLE
116 585fb430 2022-07-21 thomas ======================================
118 585fb430 2022-07-21 thomas The `-portable` GoT repository uses the following workflow:
121 585fb430 2022-07-21 thomas Github (gh) GoT (upstream)
127 585fb430 2022-07-21 thomas +--------> GoT-portable <------+
131 585fb430 2022-07-21 thomas Here, `got-portable` is a clone of the `-portable` repository, locally on
132 585fb430 2022-07-21 thomas disk. There are two remotes set up within that repository, via `git-remote`:
134 585fb430 2022-07-21 thomas * `upstream` -- which points to the official GoT repository;
135 585fb430 2022-07-21 thomas * `gh` -- which points to the mirrored `-portable` repository so that CI can
136 585fb430 2022-07-21 thomas be run for cross-platform/test purposes [3]
137 585fb430 2022-07-21 thomas * `origin` -- our cloned copy from `-portable`
139 585fb430 2022-07-21 thomas Within the `-portable` repository are two key branches (there may be other
140 585fb430 2022-07-21 thomas topic branches which represent on-going work):
142 585fb430 2022-07-21 thomas * `main` -- this is the branch that tracks (without modification) those
143 585fb430 2022-07-21 thomas changes from `upstream`. This branch is continually reset to
144 585fb430 2022-07-21 thomas `upstream/main` whenever changes occur.
146 04dafe6d 2023-03-10 thomas * `portable` -- this is the *default* branch of the `-portable` repository which
147 585fb430 2022-07-21 thomas contains portable-specific changes to make `GoT` compile across different
150 585fb430 2022-07-21 thomas When updating `-portable` from upstream changes, the following actions happen:
152 585fb430 2022-07-21 thomas 1. Changes from `upstream` are fetched. If there are no new changes, there's
153 585fb430 2022-07-21 thomas nothing else to do.
154 585fb430 2022-07-21 thomas 2. Changes from `gh` are fetch so that the result can be pushed out to `gh`.
155 585fb430 2022-07-21 thomas 3. The difference between the local copy of `main` and `origin/main` is used
156 585fb430 2022-07-21 thomas to represent the set of commits which have *NOT* yet been merged to
157 585fb430 2022-07-21 thomas `-portable`.
158 04dafe6d 2023-03-10 thomas 4. A topic-branch called `syncup` is created from the HEAD of the `portable`
159 585fb430 2022-07-21 thomas branch to hold the to-be-cherry-picked commits from step 3.
160 585fb430 2022-07-21 thomas 5. These commits are then cherry-picked to the `syncup` branch.
161 585fb430 2022-07-21 thomas 6. If there's any conflicts, they must be resolved.
162 585fb430 2022-07-21 thomas 7. Once done, a sanity build is done in-situ to check there's nothing amiss.
163 04dafe6d 2023-03-10 thomas 8. If that succeeds, the `syncup` branch is merged to `portable` and pushed to
164 585fb430 2022-07-21 thomas `gh` for verification against CI.
165 585fb430 2022-07-21 thomas 9. If that fails, fixes continue and pushed up to `gh` as required.
166 04dafe6d 2023-03-10 thomas 10. Once happy, both the `main` and `portable` branches can be merged to `origin`.
168 585fb430 2022-07-21 thomas These steps are encapsulated in a script within `-portable`. [Link](../maintscripts/sync-upstream.sh)
170 ce0dfd3b 2022-07-21 thomas RELEASING A NEW VERSION
171 ce0dfd3b 2022-07-21 thomas =======================
173 ce0dfd3b 2022-07-21 thomas Release for `-portable` try and align as close to upstream GoT as much as
174 ce0dfd3b 2022-07-21 thomas possible, even on the same day where that can happen. That being said,
175 ce0dfd3b 2022-07-21 thomas sometimes a release of `-portable` might happen outside of that cadence, where
176 ce0dfd3b 2022-07-21 thomas a `-portable`-specific issue needs addressing, for example.
178 ce0dfd3b 2022-07-21 thomas Before creating a new release, check the version of GoT as found in
179 598139dd 2022-07-22 thomas `util/got-portable-ver.sh` -- as `GOT_PORTABLE_VER`:
182 598139dd 2022-07-22 thomas GOT_PORTABLE_VER=0.75
186 ce0dfd3b 2022-07-21 thomas Here, the *to be released* version of `got-portable` will be `0.75`.
187 ce0dfd3b 2022-07-21 thomas Typically, this version is incremented directly after a release, such that
188 ce0dfd3b 2022-07-21 thomas there's no need to change this value. The only exception would be if there
189 ce0dfd3b 2022-07-21 thomas were an out-of-band release to `-portable`. In such cases, that would take
190 ce0dfd3b 2022-07-21 thomas the form:
196 529beb87 2022-09-23 thomas Where the suffix of `1`, `2`, etc., can be used to denote any sub-releases
197 ce0dfd3b 2022-07-21 thomas from the `0.75` version.
199 05345ace 2022-09-10 thomas The variable `GOT_RELEASE` needs be changed to `yes` so that the
200 05345ace 2022-09-10 thomas GOT_PORTABLE_VER is asserted correctly.
202 04dafe6d 2023-03-10 thomas Once the version is verified, the following should be run from the `portable`
203 ce0dfd3b 2022-07-21 thomas branch -- and the repository should not have any outstanding modifications to
204 ce0dfd3b 2022-07-21 thomas the source:
207 ce0dfd3b 2022-07-21 thomas make clean ; ./autogen && ./configure && make distcheck
210 ce0dfd3b 2022-07-21 thomas If this succeeds, the tarball is in the CWD, as: `got-portable-VERSION.tar.gz`
212 ce0dfd3b 2022-07-21 thomas This can then be copied to the `got-www` repository and uploaded, along with
213 ce0dfd3b 2022-07-21 thomas changing a couple of HTML pages therein to represent the new released version.
214 ce0dfd3b 2022-07-21 thomas Additionally, the CHANGELOG file can be copied to the `got-www` and committed.
216 529beb87 2022-09-23 thomas Once all of that has been done, the repository should be tagged to indicate
217 529beb87 2022-09-23 thomas the release, hence:
220 529beb87 2022-09-23 thomas git tag -a 0.75
223 529beb87 2022-09-23 thomas This can then be pushed out to `gh` and `origin`.
225 529beb87 2022-09-23 thomas After that point, the version of `GOT_PORTABLE_VER` in
226 529beb87 2022-09-23 thomas `util/got-portable-ver.sh` should be changed to the next version, and
227 529beb87 2022-09-23 thomas `GOT_RELEASE` should be setg back to `no`.
232 00ced238 2021-09-24 thomas This port is incomplete in that only got(1) and tog(1) have been ported.
233 00ced238 2021-09-24 thomas gotweb has yet to be ported.
235 00ced238 2021-09-24 thomas configure.ac should start defining AC_ENABLE arguments to allow for
236 00ced238 2021-09-24 thomas finer-grained control of where to search for includes/libraries, etc.
241 585fb430 2022-07-21 thomas Thomas Adam <thomas@xteddy.org><br />
242 00ced238 2021-09-24 thomas thomas_adam (#gameoftrees on irc.libera.chat)
244 585fb430 2022-07-21 thomas [1] https://gameoftrees.org<br />
245 585fb430 2022-07-21 thomas [2] https://lists.openbsd.org/cgi-bin/mj_wwwusr?user=&passw=&func=lists-long-full&extra=gameoftrees<br />
246 585fb430 2022-07-21 thomas [3] https://github.com/ThomasAdam/got-portable
